repositories
/
deb_shairplay.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[deb_shairplay.git]
/
AirTV-Qt
/
audiooutput.cpp
diff --git
a/AirTV-Qt/audiooutput.cpp
b/AirTV-Qt/audiooutput.cpp
index 5b4bc2f8682f7dc944cd7f335be50afec9c999e5..e2e2d4835f16ad1e36d22546defebe9cb86b31e0 100644
(file)
--- a/
AirTV-Qt/audiooutput.cpp
+++ b/
AirTV-Qt/audiooutput.cpp
@@
-96,11
+96,11
@@
void AudioOutput::setVolume(float volume)
m_volume = volume;
}
m_volume = volume;
}
-void AudioOutput::output(const
char *data, int datalen
)
+void AudioOutput::output(const
QByteArray & data
)
{
if (m_output && m_output->state() != QAudio::StoppedState) {
// Append input data to the end of buffer
{
if (m_output && m_output->state() != QAudio::StoppedState) {
// Append input data to the end of buffer
- m_buffer.append(data
, datalen
);
+ m_buffer.append(data);
// Check if our buffer has grown too large
if (m_buffer.length() > 2*BUFFER_SIZE) {
// Check if our buffer has grown too large
if (m_buffer.length() > 2*BUFFER_SIZE) {