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

Fixed internal AudioOutput state machine.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-18 08:40:56 +02:00
parent 86facdeb14
commit 1e900f87a0
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libtomahawk/audio/AudioOutput.cpp
View File

@@ -275,7 +275,7 @@ AudioOutput::setCurrentSource( MediaStream* stream )
libvlc_media_add_option_flag(m_vlcMedia, imemSeek, libvlc_media_option_trusted); libvlc_media_add_option_flag(m_vlcMedia, imemSeek, libvlc_media_option_trusted);
} }
setState( Stopped ); // setState( Stopped );
} }
@@ -353,18 +353,17 @@ AudioOutput::setTotalTime( qint64 time )
void void
AudioOutput::play() AudioOutput::play()
{ {
tDebug() << Q_FUNC_INFO; tDebug() << Q_FUNC_INFO << state();
if ( libvlc_media_player_is_playing( m_vlcPlayer ) ) if ( state() == Paused )
{ {
libvlc_media_player_set_pause( m_vlcPlayer, 0 ); libvlc_media_player_set_pause( m_vlcPlayer, 0 );
} }
else else
{ {
setState( Loading );
libvlc_media_player_play( m_vlcPlayer ); libvlc_media_player_play( m_vlcPlayer );
} }
setState( Playing );
} }
@@ -374,7 +373,7 @@ AudioOutput::pause()
tDebug() << Q_FUNC_INFO; tDebug() << Q_FUNC_INFO;
libvlc_media_player_set_pause( m_vlcPlayer, 1 ); libvlc_media_player_set_pause( m_vlcPlayer, 1 );
setState( Paused ); // setState( Paused );
} }
@@ -494,12 +493,11 @@ AudioOutput::onVlcEvent( const libvlc_event_t* event )
case libvlc_MediaPlayerLengthChanged: case libvlc_MediaPlayerLengthChanged:
// tDebug() << Q_FUNC_INFO << " : length changed : " << event->u.media_player_length_changed.new_length; // tDebug() << Q_FUNC_INFO << " : length changed : " << event->u.media_player_length_changed.new_length;
break; break;
case libvlc_MediaPlayerNothingSpecial:
case libvlc_MediaPlayerOpening:
case libvlc_MediaPlayerBuffering:
case libvlc_MediaPlayerPlaying: case libvlc_MediaPlayerPlaying:
setState( Playing );
break;
case libvlc_MediaPlayerPaused: case libvlc_MediaPlayerPaused:
case libvlc_MediaPlayerStopped: setState( Paused );
break; break;
case libvlc_MediaPlayerEndReached: case libvlc_MediaPlayerEndReached:
setState( Stopped ); setState( Stopped );
@@ -509,6 +507,10 @@ AudioOutput::onVlcEvent( const libvlc_event_t* event )
// Don't call stop() here - it will deadlock libvlc // Don't call stop() here - it will deadlock libvlc
setState( Error ); setState( Error );
break; break;
case libvlc_MediaPlayerNothingSpecial:
case libvlc_MediaPlayerOpening:
case libvlc_MediaPlayerBuffering:
case libvlc_MediaPlayerStopped:
case libvlc_MediaPlayerVout: case libvlc_MediaPlayerVout:
case libvlc_MediaPlayerMediaChanged: case libvlc_MediaPlayerMediaChanged:
case libvlc_MediaPlayerForward: case libvlc_MediaPlayerForward: