From 470f30c0e3a598452cd12f16ba364ce11f97a8f0 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 16 Jul 2013 11:34:05 +0200 Subject: [PATCH] Style cleanup --- src/libtomahawk/audio/AudioEngine.cpp | 49 ++++++++++++++------------- src/libtomahawk/audio/AudioEngine.h | 4 +-- src/libtomahawk/audio/AudioEngine_p.h | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index 9c0edc5de..b42f757fd 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -162,34 +162,34 @@ AudioEnginePrivate::onStateChanged( Phonon::State newState, Phonon::State oldSta void AudioEnginePrivate::onAudioDataArrived( QMap > data ) { - QMap< AudioEngine::AudioChannel, QVector > result; + QMap< AudioEngine::AudioChannel, QVector< qint16 > > result; - if(data.contains(Phonon::AudioDataOutput::LeftChannel)) + if( data.contains( Phonon::AudioDataOutput::LeftChannel ) ) { - result[AudioEngine::LeftChannel] = QVector(data[Phonon::AudioDataOutput::LeftChannel]); + result[ AudioEngine::LeftChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::LeftChannel ] ); } - if(data.contains(Phonon::AudioDataOutput::LeftSurroundChannel)) - { - result[AudioEngine::LeftChannel] = QVector(data[Phonon::AudioDataOutput::LeftSurroundChannel]); - } - if(data.contains(Phonon::AudioDataOutput::RightChannel)) + if( data.contains( Phonon::AudioDataOutput::LeftSurroundChannel ) ) { - result[AudioEngine::RightChannel]= QVector(data[Phonon::AudioDataOutput::RightChannel]); + result[ AudioEngine::LeftChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::LeftSurroundChannel ] ); } - if(data.contains(Phonon::AudioDataOutput::RightSurroundChannel)) + if( data.contains( Phonon::AudioDataOutput::RightChannel ) ) { - result[AudioEngine::LeftChannel] = QVector(data[Phonon::AudioDataOutput::RightSurroundChannel]); + result[ AudioEngine::RightChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::RightChannel ] ); } - if(data.contains(Phonon::AudioDataOutput::CenterChannel)) + if( data.contains( Phonon::AudioDataOutput::RightSurroundChannel ) ) { - result[AudioEngine::LeftChannel] = QVector(data[Phonon::AudioDataOutput::CenterChannel]); + result[ AudioEngine::LeftChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::RightSurroundChannel ] ); } - if(data.contains(Phonon::AudioDataOutput::SubwooferChannel)) + if( data.contains( Phonon::AudioDataOutput::CenterChannel ) ) { - result[AudioEngine::LeftChannel] = QVector(data[Phonon::AudioDataOutput::SubwooferChannel]); + result[ AudioEngine::LeftChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::CenterChannel ] ); + } + if( data.contains( Phonon::AudioDataOutput::SubwooferChannel ) ) + { + result[ AudioEngine::LeftChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::SubwooferChannel ] ); } - s_instance->audioDataArrived(result); + s_instance->audioDataArrived( result ); } @@ -225,7 +225,7 @@ AudioEngine::AudioEngine() d->mediaObject = new Phonon::MediaObject( this ); d->audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, this ); - d->audioDataOutput = new Phonon::AudioDataOutput(this); + d->audioDataOutput = new Phonon::AudioDataOutput( this ); d->audioPath = Phonon::createPath( d->mediaObject, d->audioOutput ); @@ -247,6 +247,7 @@ AudioEngine::AudioEngine() initEqualizer(); } + AudioEngine::~AudioEngine() { tDebug() << Q_FUNC_INFO; @@ -359,11 +360,11 @@ AudioEngine::stop( AudioErrorCode errorCode ) bool AudioEngine::activateDataOutput() { - Q_D(AudioEngine); + Q_D( AudioEngine ); - d->audioDataPath = Phonon::createPath(d->mediaObject, d->audioDataOutput); - connect(d->audioDataOutput, SIGNAL( dataReady(QMap >) ), - d_func(), SLOT(onAudioDataArrived(QMap >))); + d->audioDataPath = Phonon::createPath( d->mediaObject, d->audioDataOutput ); + connect( d->audioDataOutput, SIGNAL( dataReady( QMap< Phonon::AudioDataOutput::Channel, QVector< qint16 > > ) ), + d_func(), SLOT( onAudioDataArrived( QMap< Phonon::AudioDataOutput::Channel, QVector< qint16 > > ) ) ); return d->audioDataPath.isValid(); @@ -372,14 +373,14 @@ bool AudioEngine::activateDataOutput() bool AudioEngine::deactivateDataOutput() { - Q_D(AudioEngine); + Q_D( AudioEngine ); return d->audioDataPath.disconnect(); } -void AudioEngine::audioDataArrived(QMap< AudioEngine::AudioChannel, QVector< qint16 > >& data) +void AudioEngine::audioDataArrived( QMap< AudioEngine::AudioChannel, QVector< qint16 > >& data ) { - emit audioDataReady(data); + emit audioDataReady( data ); } diff --git a/src/libtomahawk/audio/AudioEngine.h b/src/libtomahawk/audio/AudioEngine.h index 25c08d58b..888bd45be 100644 --- a/src/libtomahawk/audio/AudioEngine.h +++ b/src/libtomahawk/audio/AudioEngine.h @@ -153,10 +153,10 @@ private: void checkStateQueue(); void queueState( AudioState state ); void setState( AudioState state ); - void setCurrentTrackPlaylist( const Tomahawk::playlistinterface_ptr& playlist );\ + void setCurrentTrackPlaylist( const Tomahawk::playlistinterface_ptr& playlist ); void initEqualizer(); - void audioDataArrived( QMap< AudioEngine::AudioChannel, QVector >& data ); + void audioDataArrived( QMap< AudioEngine::AudioChannel, QVector< qint16 > >& data ); Q_DECLARE_PRIVATE( AudioEngine ); diff --git a/src/libtomahawk/audio/AudioEngine_p.h b/src/libtomahawk/audio/AudioEngine_p.h index b9167f1f6..064279616 100644 --- a/src/libtomahawk/audio/AudioEngine_p.h +++ b/src/libtomahawk/audio/AudioEngine_p.h @@ -29,7 +29,7 @@ public: public slots: void onStateChanged( Phonon::State newState, Phonon::State oldState ); - void onAudioDataArrived( QMap< Phonon::AudioDataOutput::Channel, QVector > data ); + void onAudioDataArrived( QMap< Phonon::AudioDataOutput::Channel, QVector< qint16 > > data ); private: QSharedPointer input;