mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tweetsip

Browse Source
This commit is contained in:
Jeff Mitchell
2011-02-12 22:54:12 -05:00
parent f62d2dacab 9238dcccaa
commit dd1002178d
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/playlist/dynamic/DynamicModel.cpp
View File

@@ -77,9 +77,10 @@ DynamicModel::newTrackGenerated( const Tomahawk::query_ptr& query )
} }
void void
DynamicModel::stopOnDemand() DynamicModel::stopOnDemand( bool stopPlaying )
{ {
m_onDemandRunning = false; m_onDemandRunning = false;
if( stopPlaying )
AudioEngine::instance()->stop(); AudioEngine::instance()->stop();
disconnect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) ); disconnect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) );

2
src/libtomahawk/playlist/dynamic/DynamicModel.h
View File

@@ -37,7 +37,7 @@ public:
virtual ~DynamicModel(); virtual ~DynamicModel();
void startOnDemand(); void startOnDemand();
void stopOnDemand(); void stopOnDemand( bool stopPlaying = true );
void changeStation(); void changeStation();
void loadPlaylist( const dynplaylist_ptr& playlist ); void loadPlaylist( const dynplaylist_ptr& playlist );

21
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@@ -65,7 +65,7 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
m_layout->addWidget( m_view, 1 ); m_layout->addWidget( m_view, 1 );
connect( m_model, SIGNAL( collapseFromTo( int, int ) ), m_view, SLOT( collapseEntries( int, int ) ) ); connect( m_model, SIGNAL( collapseFromTo( int, int ) ), m_view, SLOT( collapseEntries( int, int ) ) );
connect( m_model, SIGNAL( trackGenerationFailure( QString ) ), m_view, SLOT( showMessage( QString ) ) ); connect( m_model, SIGNAL( trackGenerationFailure( QString ) ), this, SLOT( stationFailed( QString ) ) );
m_setup = new DynamicSetupWidget( playlist, this ); m_setup = new DynamicSetupWidget( playlist, this );
@@ -227,6 +227,17 @@ DynamicWidget::generate( int num )
} }
} }
void
DynamicWidget::stationFailed( const QString& msg )
{
m_view->showMessage( msg );
if( m_runningOnDemand ) {
stopStation( false );
}
}
void void
DynamicWidget::pausePressed() DynamicWidget::pausePressed()
{ {
@@ -249,13 +260,14 @@ DynamicWidget::playPressed()
void void
DynamicWidget::stopStation() DynamicWidget::stopStation( bool stopPlaying )
{ {
m_model->stopOnDemand(); m_model->stopOnDemand( stopPlaying );
m_runningOnDemand = false; m_runningOnDemand = false;
// TODO until i add a qwidget interface // TODO until i add a qwidget interface
QMetaObject::invokeMethod( m_steering, "fadeOut", Qt::DirectConnection ); QMetaObject::invokeMethod( m_steering, "fadeOut", Qt::DirectConnection );
m_setup->fadeIn();
} }
void void
@@ -333,9 +345,6 @@ void
DynamicWidget::generatorError( const QString& title, const QString& content ) DynamicWidget::generatorError( const QString& title, const QString& content )
{ {
m_view->showMessageTimeout( title, content ); m_view->showMessageTimeout( title, content );
if( m_runningOnDemand )
stopStation();
} }
void void

3
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h
View File

@@ -77,10 +77,11 @@ public slots:
void playlistTypeChanged(QString); void playlistTypeChanged(QString);
void startStation(); void startStation();
void stopStation(); void stopStation( bool stopPlaying = true );
void playPressed(); void playPressed();
void pausePressed(); void pausePressed();
void stationFailed( const QString& );
private slots: private slots:
void generate( int = -1 ); void generate( int = -1 );