[Xfce4-commits] <parole:master> Fix for bug 9562, parole skipping ogg files in playlist.

[Sean Davis]

Updating branch refs/heads/master
         to f77d7f7febf30d6658e7368c4ed2849c4f7cfa96 (commit)
       from 981aeded1b6d876f0817da2d14a7579ebf46d96d (commit)

commit f77d7f7febf30d6658e7368c4ed2849c4f7cfa96
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Nov 29 15:38:19 2012 -0500

    Fix for bug 9562, parole skipping ogg files in playlist.

 src/parole-player.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index f28aa72..3cd7d26 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1401,13 +1401,20 @@ parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, Parole
     {
 	parole_player_stopped (player);
     }
-    else if ( state == PAROLE_STATE_PLAYBACK_FINISHED || state == PAROLE_STATE_ABOUT_TO_FINISH)
+    /* PAROLE_STATE_ABOUT_TO_FINISH is used for continuous playback of audio CDs */
+    else if ( state == PAROLE_STATE_ABOUT_TO_FINISH )
     {
 #ifdef DEBUG
-	if (state == PAROLE_STATE_PLAYBACK_FINISHED )
-	    TRACE ("***Playback finished***");
-	else
-	    TRACE ("***Playback about to finish***");
+    TRACE ("***Playback about to finish***");
+#endif
+    if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ||
+        player->priv->current_media_type == PAROLE_MEDIA_TYPE_CDDA )
+        parole_player_play_next (player, TRUE);
+    }
+    else if ( state == PAROLE_STATE_PLAYBACK_FINISHED )
+    {
+#ifdef DEBUG
+    TRACE ("***Playback finished***");
 #endif
 	parole_player_play_next (player, TRUE);
     }