mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

Style cleanup

Browse Source
This commit is contained in:
Dominik Schmidt
2013-07-16 11:34:05 +02:00
parent 042beadff7
commit 470f30c0e3
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -162,34 +162,34 @@ AudioEnginePrivate::onStateChanged( Phonon::State newState, Phonon::State oldSta
void void
AudioEnginePrivate::onAudioDataArrived( QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > data ) AudioEnginePrivate::onAudioDataArrived( QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > data )
{ {
QMap< AudioEngine::AudioChannel, QVector<qint16> > result; QMap< AudioEngine::AudioChannel, QVector< qint16 > > result;
if(data.contains(Phonon::AudioDataOutput::LeftChannel)) if( data.contains( Phonon::AudioDataOutput::LeftChannel ) )
{ {
result[AudioEngine::LeftChannel] = QVector<qint16>(data[Phonon::AudioDataOutput::LeftChannel]); result[ AudioEngine::LeftChannel ] = QVector< qint16 >( data[ Phonon::AudioDataOutput::LeftChannel ] );
} }
if(data.contains(Phonon::AudioDataOutput::LeftSurroundChannel)) if( data.contains( Phonon::AudioDataOutput::LeftSurroundChannel ) )
{
result[AudioEngine::LeftChannel] = QVector<qint16>(data[Phonon::AudioDataOutput::LeftSurroundChannel]);
}
if(data.contains(Phonon::AudioDataOutput::RightChannel))
{ {
result[AudioEngine::RightChannel]= QVector<qint16>(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<qint16>(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<qint16>(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<qint16>(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->mediaObject = new Phonon::MediaObject( this );
d->audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, 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 ); d->audioPath = Phonon::createPath( d->mediaObject, d->audioOutput );
@@ -247,6 +247,7 @@ AudioEngine::AudioEngine()
initEqualizer(); initEqualizer();
} }
AudioEngine::~AudioEngine() AudioEngine::~AudioEngine()
{ {
tDebug() << Q_FUNC_INFO; tDebug() << Q_FUNC_INFO;
@@ -359,11 +360,11 @@ AudioEngine::stop( AudioErrorCode errorCode )
bool AudioEngine::activateDataOutput() bool AudioEngine::activateDataOutput()
{ {
Q_D(AudioEngine); Q_D( AudioEngine );
d->audioDataPath = Phonon::createPath(d->mediaObject, d->audioDataOutput); d->audioDataPath = Phonon::createPath( d->mediaObject, d->audioDataOutput );
connect(d->audioDataOutput, SIGNAL( dataReady(QMap<Phonon::AudioDataOutput::Channel,QVector<qint16> >) ), connect( d->audioDataOutput, SIGNAL( dataReady( QMap< Phonon::AudioDataOutput::Channel, QVector< qint16 > > ) ),
d_func(), SLOT(onAudioDataArrived(QMap<Phonon::AudioDataOutput::Channel,QVector<qint16> >))); d_func(), SLOT( onAudioDataArrived( QMap< Phonon::AudioDataOutput::Channel, QVector< qint16 > > ) ) );
return d->audioDataPath.isValid(); return d->audioDataPath.isValid();
@@ -372,14 +373,14 @@ bool AudioEngine::activateDataOutput()
bool AudioEngine::deactivateDataOutput() bool AudioEngine::deactivateDataOutput()
{ {
Q_D(AudioEngine); Q_D( AudioEngine );
return d->audioDataPath.disconnect(); 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 );
} }

4
src/libtomahawk/audio/AudioEngine.h
View File

@@ -153,10 +153,10 @@ private:
void checkStateQueue(); void checkStateQueue();
void queueState( AudioState state ); void queueState( AudioState state );
void setState( AudioState state ); void setState( AudioState state );
void setCurrentTrackPlaylist( const Tomahawk::playlistinterface_ptr& playlist );\ void setCurrentTrackPlaylist( const Tomahawk::playlistinterface_ptr& playlist );
void initEqualizer(); void initEqualizer();
void audioDataArrived( QMap< AudioEngine::AudioChannel, QVector<qint16> >& data ); void audioDataArrived( QMap< AudioEngine::AudioChannel, QVector< qint16 > >& data );
Q_DECLARE_PRIVATE( AudioEngine ); Q_DECLARE_PRIVATE( AudioEngine );

2
src/libtomahawk/audio/AudioEngine_p.h
View File

@@ -29,7 +29,7 @@ public:
public slots: public slots:
void onStateChanged( Phonon::State newState, Phonon::State oldState ); void onStateChanged( Phonon::State newState, Phonon::State oldState );
void onAudioDataArrived( QMap< Phonon::AudioDataOutput::Channel, QVector<qint16> > data ); void onAudioDataArrived( QMap< Phonon::AudioDataOutput::Channel, QVector< qint16 > > data );
private: private:
QSharedPointer<QIODevice> input; QSharedPointer<QIODevice> input;