mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

* Make AudioContols directly connect to AudioEngine's repeat & shuffle signals.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-01-03 20:00:13 +01:00
parent 7fa21a38e5
commit 719b9738d8
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/AudioControls.cpp
View File

@@ -140,6 +140,8 @@ AudioControls::AudioControls( QWidget* parent )
connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) ); connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) );
connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) ); connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) );
connect( AudioEngine::instance(), SIGNAL( controlStateChanged() ), SLOT( onControlStateChanged() ) ); connect( AudioEngine::instance(), SIGNAL( controlStateChanged() ), SLOT( onControlStateChanged() ) );
connect( AudioEngine::instance(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ), SLOT( onRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
connect( AudioEngine::instance(), SIGNAL( shuffleModeChanged( bool ) ), SLOT( onShuffleModeChanged( bool ) ) );
ui->buttonAreaLayout->setSpacing( 0 ); ui->buttonAreaLayout->setSpacing( 0 );
ui->stackedLayout->setSpacing( 0 ); ui->stackedLayout->setSpacing( 0 );
@@ -560,21 +562,21 @@ AudioControls::onRepeatClicked()
case PlaylistModes::NoRepeat: case PlaylistModes::NoRepeat:
{ {
// switch to RepeatOne // switch to RepeatOne
ViewManager::instance()->setRepeatMode( PlaylistModes::RepeatOne ); AudioEngine::instance()->setRepeatMode( PlaylistModes::RepeatOne );
} }
break; break;
case PlaylistModes::RepeatOne: case PlaylistModes::RepeatOne:
{ {
// switch to RepeatAll // switch to RepeatAll
ViewManager::instance()->setRepeatMode( PlaylistModes::RepeatAll ); AudioEngine::instance()->setRepeatMode( PlaylistModes::RepeatAll );
} }
break; break;
case PlaylistModes::RepeatAll: case PlaylistModes::RepeatAll:
{ {
// switch to NoRepeat // switch to NoRepeat
ViewManager::instance()->setRepeatMode( PlaylistModes::NoRepeat ); AudioEngine::instance()->setRepeatMode( PlaylistModes::NoRepeat );
} }
break; break;
@@ -611,7 +613,7 @@ AudioControls::onShuffleModeChanged( bool enabled )
void void
AudioControls::onShuffleClicked() AudioControls::onShuffleClicked()
{ {
ViewManager::instance()->setShuffled( m_shuffled ^ true ); AudioEngine::instance()->setShuffled( m_shuffled ^ true );
} }

7
src/TomahawkWindow.cpp
View File

@@ -497,6 +497,7 @@ TomahawkWindow::setupWindowsButtons()
#endif #endif
} }
HICON HICON
TomahawkWindow::thumbIcon(TomahawkUtils::ImageType type) TomahawkWindow::thumbIcon(TomahawkUtils::ImageType type)
{ {
@@ -514,12 +515,6 @@ TomahawkWindow::thumbIcon(TomahawkUtils::ImageType type)
void void
TomahawkWindow::setupSignals() TomahawkWindow::setupSignals()
{ {
// <From PlaylistManager>
connect( ViewManager::instance(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
m_audioControls, SLOT( onRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
connect( ViewManager::instance(), SIGNAL( shuffleModeChanged( bool ) ),
m_audioControls, SLOT( onShuffleModeChanged( bool ) ) );
// <From AudioEngine> // <From AudioEngine>
connect( AudioEngine::instance(), SIGNAL( error( AudioEngine::AudioErrorCode ) ), SLOT( onAudioEngineError( AudioEngine::AudioErrorCode ) ) ); connect( AudioEngine::instance(), SIGNAL( error( AudioEngine::AudioErrorCode ) ), SLOT( onAudioEngineError( AudioEngine::AudioErrorCode ) ) );
connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ), SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) ); connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ), SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) );