summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 19:27:51 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-30 14:32:10 +0100
commit5980bc41cf55073e63236467466a59577d406937 (patch)
tree9be7ed8c7adc8ec4fbe8b860feebd7961ac453d0 /src/multimedia/audio
parentb690a4d90282d2cae5d7a10739d726594d036dde (diff)
whitespace fixes
remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'src/multimedia/audio')
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp4
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp24
-rw-r--r--src/multimedia/audio/qaudioinput_win32_p.cpp12
-rw-r--r--src/multimedia/audio/qaudiooutput_alsa_p.cpp4
-rw-r--r--src/multimedia/audio/qaudiooutput_win32_p.cpp32
5 files changed, 38 insertions, 38 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index d2a4eea3a..bc992029a 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -166,11 +166,11 @@ bool QAudioDeviceInfoInternal::open()
QString shortName = device.mid(device.indexOf(QLatin1String("="),0)+1);
- while(snd_card_get_name(idx,&name) == 0) {
+ while (snd_card_get_name(idx,&name) == 0) {
if(dev.contains(QLatin1String(name)))
break;
idx++;
- }
+ }
dev = QString(QLatin1String("hw:%1,0")).arg(idx);
#endif
}
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index e9503d4c3..548a0e9eb 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -344,7 +344,7 @@ void QAudioDeviceInfoInternal::updateLists()
|| (fmt & WAVE_FORMAT_96S08)
) {
sizez.append(8);
- }
+ }
if ((fmt & WAVE_FORMAT_1M16)
|| (fmt & WAVE_FORMAT_1S16)
|| (fmt & WAVE_FORMAT_2M16)
@@ -357,51 +357,51 @@ void QAudioDeviceInfoInternal::updateLists()
|| (fmt & WAVE_FORMAT_96S16)
) {
sizez.append(16);
- }
+ }
if ((fmt & WAVE_FORMAT_1M08)
|| (fmt & WAVE_FORMAT_1S08)
|| (fmt & WAVE_FORMAT_1M16)
|| (fmt & WAVE_FORMAT_1S16)) {
sampleRatez.append(11025);
- }
+ }
if ((fmt & WAVE_FORMAT_2M08)
|| (fmt & WAVE_FORMAT_2S08)
|| (fmt & WAVE_FORMAT_2M16)
|| (fmt & WAVE_FORMAT_2S16)) {
sampleRatez.append(22050);
- }
+ }
if ((fmt & WAVE_FORMAT_4M08)
|| (fmt & WAVE_FORMAT_4S08)
|| (fmt & WAVE_FORMAT_4M16)
|| (fmt & WAVE_FORMAT_4S16)) {
sampleRatez.append(44100);
- }
+ }
if ((fmt & WAVE_FORMAT_48M08)
|| (fmt & WAVE_FORMAT_48S08)
|| (fmt & WAVE_FORMAT_48M16)
|| (fmt & WAVE_FORMAT_48S16)) {
sampleRatez.append(48000);
- }
+ }
if ((fmt & WAVE_FORMAT_96M08)
|| (fmt & WAVE_FORMAT_96S08)
|| (fmt & WAVE_FORMAT_96M16)
|| (fmt & WAVE_FORMAT_96S16)) {
sampleRatez.append(96000);
}
- channelz.append(1);
- channelz.append(2);
+ channelz.append(1);
+ channelz.append(2);
if (mode == QAudio::AudioOutput) {
channelz.append(4);
channelz.append(6);
channelz.append(8);
}
- byteOrderz.append(QAudioFormat::LittleEndian);
+ byteOrderz.append(QAudioFormat::LittleEndian);
- typez.append(QAudioFormat::SignedInt);
- typez.append(QAudioFormat::UnSignedInt);
+ typez.append(QAudioFormat::SignedInt);
+ typez.append(QAudioFormat::UnSignedInt);
- codecz.append(QLatin1String("audio/pcm"));
+ codecz.append(QLatin1String("audio/pcm"));
}
if (sampleRatez.count() > 0)
sampleRatez.prepend(8000);
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 6db34adf3..47818f285 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -505,7 +505,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
deviceState = QAudio::ActiveState;
emit stateChanged(deviceState);
}
- resuming = false;
+ resuming = false;
}
} else {
l = qMin<qint64>(len, waveBlocks[header].dwBytesRecorded - waveBlockOffset);
@@ -523,7 +523,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
deviceState = QAudio::ActiveState;
emit stateChanged(deviceState);
}
- resuming = false;
+ resuming = false;
}
} else {
//no data, not ready yet, next time
@@ -583,7 +583,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
mutex.unlock();
}
- written+=l;
+ written+=l;
}
#ifdef DEBUG_AUDIO
qDebug()<<"read in len="<<written;
@@ -611,7 +611,7 @@ void QAudioInputPrivate::resume()
mutex.unlock();
header = 0;
- resuming = true;
+ resuming = true;
waveBlockOffset = 0;
waveInStart(hWaveIn);
QTimer::singleShot(20,this,SLOT(feedback()));
@@ -689,8 +689,8 @@ bool QAudioInputPrivate::deviceReady()
read(0, buffer_size);
} else {
// emits readyRead() so user will call read() on QIODevice to get some audio data
- InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
- a->trigger();
+ InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
+ a->trigger();
}
if(intervalTime && (timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) {
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 3a779f322..c1eeaec4f 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -343,11 +343,11 @@ bool QAudioOutputPrivate::open()
QString shortName = QLatin1String(m_device.mid(m_device.indexOf('=',0)+1).constData());
- while(snd_card_get_name(idx,&name) == 0) {
+ while (snd_card_get_name(idx,&name) == 0) {
if(qstrncmp(shortName.toLocal8Bit().constData(),name,shortName.length()) == 0)
break;
idx++;
- }
+ }
dev = QString(QLatin1String("hw:%1,0")).arg(idx);
#endif
}
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 286cecba7..dbc46fb80 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -153,7 +153,7 @@ void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
case WOM_DONE:
if(qAudio->finished || qAudio->buffer_size == 0 || qAudio->period_size == 0) {
return;
- }
+ }
qAudio->waveFreeBlockCount++;
if(qAudio->waveFreeBlockCount >= qAudio->buffer_size/qAudio->period_size)
qAudio->waveFreeBlockCount = qAudio->buffer_size/qAudio->period_size;
@@ -590,28 +590,28 @@ bool QAudioOutputPrivate::deviceReady()
#endif
bool startup = false;
if(totalTimeValue == 0)
- startup = true;
+ startup = true;
- bool full=false;
+ bool full=false;
mutex.lock();
- if(waveFreeBlockCount==0) full = true;
+ if (waveFreeBlockCount==0) full = true;
mutex.unlock();
- if (full){
+ if (full) {
#ifdef DEBUG_AUDIO
qDebug() << "Skipping data as unable to write";
#endif
- if((timeStamp.elapsed() + elapsedTimeOffset) > intervalTime ) {
+ if ((timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) {
emit notify();
- elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
- timeStamp.restart();
- }
- return true;
- }
+ elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
+ timeStamp.restart();
+ }
+ return true;
+ }
if(startup)
- waveOutPause(hWaveOut);
+ waveOutPause(hWaveOut);
int input = period_size*chunks;
int l = audioSource->read(audioBuffer,input);
if(l > 0) {
@@ -626,8 +626,8 @@ bool QAudioOutputPrivate::deviceReady()
// Didn't write all data
audioSource->seek(audioSource->pos()-(l-out));
}
- if(startup)
- waveOutRestart(hWaveOut);
+ if (startup)
+ waveOutRestart(hWaveOut);
} else if(l == 0) {
bytesAvailable = bytesFree();
@@ -654,7 +654,7 @@ bool QAudioOutputPrivate::deviceReady()
int buffered;
mutex.lock();
- buffered = waveFreeBlockCount;
+ buffered = waveFreeBlockCount;
mutex.unlock();
if (buffered >= buffer_size/period_size && deviceState == QAudio::ActiveState) {
@@ -670,7 +670,7 @@ bool QAudioOutputPrivate::deviceReady()
if(intervalTime && (timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) {
emit notify();
- elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
+ elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
timeStamp.restart();
}