Skip to content

Commit

Permalink
Code style review #1427
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcallegari
mcallegari committed Dec 18, 2023
1 parent d00a493 commit b99c30e
Show file tree
Hide file tree
Showing 196 changed files with 1,262 additions and 1,277 deletions.
16 changes: 8 additions & 8 deletions engine/audio/plugins/mad/audiodecoder_mad.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ bool AudioDecoderMAD::findHeader()

if (mad_header_decode(&header, &m_stream) < 0)
{
if(m_stream.error == MAD_ERROR_LOSTSYNC)
if (m_stream.error == MAD_ERROR_LOSTSYNC)
{
uint tagSize = findID3v2((uchar *)m_stream.this_frame,
(ulong) (m_stream.bufend - m_stream.this_frame));
Expand Down Expand Up @@ -360,11 +360,11 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size)
{
forever
{
if(((m_stream.error == MAD_ERROR_BUFLEN) || !m_stream.buffer) && !m_eof)
if (((m_stream.error == MAD_ERROR_BUFLEN) || !m_stream.buffer) && !m_eof)
{
m_eof = !fillBuffer();
}
if(mad_frame_decode(&m_frame, &m_stream) < 0)
if (mad_frame_decode(&m_frame, &m_stream) < 0)
{
switch((int) m_stream.error)
{
Expand All @@ -381,7 +381,7 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size)
continue;
}
case MAD_ERROR_BUFLEN:
if(m_eof)
if (m_eof)
return 0;
continue;
default:
Expand All @@ -391,7 +391,7 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size)
continue;
}
}
if(m_skip_frames)
if (m_skip_frames)
{
m_skip_frames--;
continue;
Expand All @@ -402,7 +402,7 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size)
}
void AudioDecoderMAD::seek(qint64 pos)
{
if(m_totalTime > 0)
if (m_totalTime > 0)
{
qint64 seek_pos = qint64(pos * m_input.size() / m_totalTime);
m_input.seek(seek_pos);
Expand Down Expand Up @@ -437,7 +437,7 @@ bool AudioDecoderMAD::fillBuffer()
qDebug("DecoderMAD: end of file");
return false;
}
else if(len < 0)
else if (len < 0)
{
qWarning("DecoderMAD: error");
return false;
Expand Down Expand Up @@ -546,7 +546,7 @@ qint64 AudioDecoderMAD::madOutput(char *data, qint64 size)
m_output_at = 0;
m_output_bytes = 0;

if(samples * channels * 2 > size)
if (samples * channels * 2 > size)
{
qWarning() << "DecoderMad: input buffer is too small. Required: " << (samples * channels * 2) << ", available: " << size;
samples = size / channels / 2;
Expand Down
2 changes: 1 addition & 1 deletion engine/audio/plugins/sndfile/audiodecoder_sndfile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ bool AudioDecoderSndFile::initialize(const QString &path)
m_totalTime = snd_info.frames * 1000 / m_freq;
m_bitrate = QFileInfo(m_path).size () * 8.0 / m_totalTime + 0.5;

if((snd_info.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT)
if ((snd_info.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT)
{
qDebug() << "DecoderSndFile: Float audio format";
sf_command (m_sndfile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE);
Expand Down
2 changes: 1 addition & 1 deletion engine/audio/src/audiocapture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void AudioCapture::processData()
#endif

// 5 ********* Calculate the average signal power
foreach(int barsNumber, m_fftMagnitudeMap.keys())
foreach (int barsNumber, m_fftMagnitudeMap.keys())
{
maxMagnitude = fillBandsData(barsNumber);
pwrSum = 0.;
Expand Down
38 changes: 19 additions & 19 deletions engine/audio/src/audiocapture_portaudio.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ bool AudioCapturePortAudio::initialize()
PaStreamParameters inputParameters;

err = Pa_Initialize();
if( err != paNoError )
if (err != paNoError)
return false;

QSettings settings;
Expand All @@ -64,30 +64,30 @@ bool AudioCapturePortAudio::initialize()

inputParameters.channelCount = m_channels;
inputParameters.sampleFormat = paInt16;
inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency;
inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
inputParameters.hostApiSpecificStreamInfo = NULL;

// ensure initialize() has not been called multiple times
Q_ASSERT(stream == NULL);

/* -- setup stream -- */
err = Pa_OpenStream( &stream, &inputParameters, NULL, m_sampleRate, paFramesPerBufferUnspecified,
err = Pa_OpenStream(&stream, &inputParameters, NULL, m_sampleRate, paFramesPerBufferUnspecified,
paClipOff, /* we won't output out of range samples so don't bother clipping them */
NULL, /* no callback, use blocking API */
NULL ); /* no callback, so no callback userData */
if( err != paNoError )
NULL); /* no callback, so no callback userData */
if (err != paNoError)
{
qWarning("Cannot open audio input stream (%s)\n", Pa_GetErrorText(err));
Pa_Terminate();
return false;
}

/* -- start capture -- */
err = Pa_StartStream( stream );
if( err != paNoError )
err = Pa_StartStream(stream);
if (err != paNoError)
{
qWarning("Cannot start stream capture (%s)\n", Pa_GetErrorText(err));
Pa_CloseStream( stream );
Pa_CloseStream(stream);
stream = NULL;
Pa_Terminate();
return false;
Expand All @@ -103,19 +103,19 @@ void AudioCapturePortAudio::uninitialize()
PaError err;

/* -- Now we stop the stream -- */
err = Pa_StopStream( stream );
if( err != paNoError )
qDebug() << "PortAudio error: " << Pa_GetErrorText( err );
err = Pa_StopStream(stream);
if (err != paNoError)
qDebug() << "PortAudio error: " << Pa_GetErrorText(err);

/* -- don't forget to cleanup! -- */
err = Pa_CloseStream( stream );
if( err != paNoError )
qDebug() << "PortAudio error: " << Pa_GetErrorText( err );
err = Pa_CloseStream(stream);
if (err != paNoError)
qDebug() << "PortAudio error: " << Pa_GetErrorText(err);
stream = NULL;

err = Pa_Terminate();
if( err != paNoError )
qDebug() << "PortAudio error: " << Pa_GetErrorText( err );
if (err != paNoError)
qDebug() << "PortAudio error: " << Pa_GetErrorText(err);
}

qint64 AudioCapturePortAudio::latency()
Expand All @@ -135,10 +135,10 @@ bool AudioCapturePortAudio::readAudio(int maxSize)
{
Q_ASSERT(stream != NULL);

int err = Pa_ReadStream( stream, m_audioBuffer, maxSize );
if( err )
int err = Pa_ReadStream(stream, m_audioBuffer, maxSize);
if (err)
{
qWarning("read from audio interface failed (%s)\n", Pa_GetErrorText (err));
qWarning("read from audio interface failed (%s)\n", Pa_GetErrorText(err));
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion engine/audio/src/audiocapture_wavein.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ bool AudioCaptureWaveIn::readAudio(int maxSize)
return false;
}

while ( (waveHeaders[m_currentBufferIndex].dwFlags & WHDR_DONE) == 0)
while ((waveHeaders[m_currentBufferIndex].dwFlags & WHDR_DONE) == 0)
usleep(100);

memcpy(m_audioBuffer, m_internalBuffers[m_currentBufferIndex], maxSize * 2);
Expand Down
8 changes: 4 additions & 4 deletions engine/audio/src/audioplugincache.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "qlcfile.h"

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#if defined( __APPLE__) || defined(Q_OS_MAC)
#if defined(__APPLE__) || defined(Q_OS_MAC)
#include "audiorenderer_portaudio.h"
#elif defined(WIN32) || defined(Q_OS_WIN)
#include "audiorenderer_waveout.h"
Expand All @@ -55,7 +55,7 @@ void AudioPluginCache::load(const QDir &dir)
qDebug() << Q_FUNC_INFO << dir.path();

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#if defined( __APPLE__) || defined(Q_OS_MAC)
#if defined(__APPLE__) || defined(Q_OS_MAC)
m_audioDevicesList = AudioRendererPortAudio::getDevicesInfo();
#elif defined(WIN32) || defined(Q_OS_WIN)
m_audioDevicesList = AudioRendererWaveOut::getDevicesInfo();
Expand Down Expand Up @@ -103,7 +103,7 @@ void AudioPluginCache::load(const QDir &dir)
QStringList AudioPluginCache::getSupportedFormats()
{
QStringList caps;
foreach(QString path, m_pluginsMap.values())
foreach (QString path, m_pluginsMap.values())
{
QPluginLoader loader(path, this);
AudioDecoder* ptr = qobject_cast<AudioDecoder*> (loader.instance());
Expand All @@ -124,7 +124,7 @@ AudioDecoder *AudioPluginCache::getDecoderForFile(const QString &filename)
if (fn.exists() == false)
return NULL;

foreach(QString path, m_pluginsMap.values())
foreach (QString path, m_pluginsMap.values())
{
QPluginLoader loader(path, this);
AudioDecoder* ptr = qobject_cast<AudioDecoder*> (loader.instance());
Expand Down
26 changes: 13 additions & 13 deletions engine/audio/src/audiorenderer_alsa.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ QList<AudioDeviceInfo> AudioRendererAlsa::getDevicesInfo()
QList<AudioDeviceInfo> devList;
int cardIdx = -1;

while( snd_card_next( &cardIdx ) == 0 && cardIdx >= 0 )
while (snd_card_next(&cardIdx) == 0 && cardIdx >= 0)
{
snd_ctl_t *cardHandle;
snd_ctl_card_info_t *cardInfo;
Expand Down Expand Up @@ -249,31 +249,31 @@ QList<AudioDeviceInfo> AudioRendererAlsa::getDevicesInfo()

qDebug() << "[getDevicesInfo] Card" << cardIdx << "=" << snd_ctl_card_info_get_name(cardInfo);

while( snd_ctl_pcm_next_device( cardHandle, &devIdx ) == 0 && devIdx >= 0 )
while (snd_ctl_pcm_next_device(cardHandle, &devIdx) == 0 && devIdx >= 0)
{
snd_pcm_info_t *pcmInfo;
int tmpCaps = 0;

snd_pcm_info_alloca( &pcmInfo );
snd_pcm_info_alloca(&pcmInfo);

snprintf( str, sizeof (str), "plughw:%d,%d", cardIdx, devIdx );
snprintf(str, sizeof (str), "plughw:%d,%d", cardIdx, devIdx);

/* Obtain info about this particular device */
snd_pcm_info_set_device( pcmInfo, devIdx );
snd_pcm_info_set_subdevice( pcmInfo, 0 );
snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_CAPTURE );
if( snd_ctl_pcm_info( cardHandle, pcmInfo ) >= 0 )
snd_pcm_info_set_device(pcmInfo, devIdx);
snd_pcm_info_set_subdevice(pcmInfo, 0);
snd_pcm_info_set_stream(pcmInfo, SND_PCM_STREAM_CAPTURE);
if (snd_ctl_pcm_info(cardHandle, pcmInfo) >= 0)
tmpCaps |= AUDIO_CAP_INPUT;

snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_PLAYBACK );
if( snd_ctl_pcm_info( cardHandle, pcmInfo ) >= 0 )
snd_pcm_info_set_stream(pcmInfo, SND_PCM_STREAM_PLAYBACK);
if (snd_ctl_pcm_info(cardHandle, pcmInfo) >= 0)
tmpCaps |= AUDIO_CAP_OUTPUT;

if (tmpCaps != 0)
{
AudioDeviceInfo info;
info.deviceName = QString(snd_ctl_card_info_get_name(cardInfo)) + " - " +
QString (snd_pcm_info_get_name( pcmInfo ));
QString(snd_pcm_info_get_name(pcmInfo));
info.privateName = QString(str);
info.capabilities = tmpCaps;
devList.append(info);
Expand All @@ -297,7 +297,7 @@ qint64 AudioRendererAlsa::writeAudio(unsigned char *data, qint64 maxSize)
if (pcm_handle == NULL || m_prebuf == NULL)
return 0;

if((maxSize = qMin(maxSize, m_prebuf_size - m_prebuf_fill)) > 0)
if ((maxSize = qMin(maxSize, m_prebuf_size - m_prebuf_fill)) > 0)
{
memmove(m_prebuf + m_prebuf_fill, data, maxSize);
m_prebuf_fill += maxSize;
Expand Down Expand Up @@ -325,7 +325,7 @@ qint64 AudioRendererAlsa::writeAudio(unsigned char *data, qint64 maxSize)
long AudioRendererAlsa::alsa_write(unsigned char *data, long size)
{
long m = snd_pcm_avail_update(pcm_handle);
if(m >= 0 && m < size)
if (m >= 0 && m < size)
{
snd_pcm_wait(pcm_handle, 500);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion engine/audio/src/audiorenderer_coreaudio.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ qint64 AudioRendererCoreAudio::latency()

qint64 AudioRendererCoreAudio::writeAudio(unsigned char *data, qint64 maxSize)
{
if(m_buffersFilled == AUDIO_BUFFERS_NUM)
if (m_buffersFilled == AUDIO_BUFFERS_NUM)
return 0;

qint64 size = maxSize;
Expand Down
Loading

0 comments on commit b99c30e

Please sign in to comment.