[Xfce4-commits] <parole:master> Fix for loading audio cd on startup.

[Sean Davis]

Updating branch refs/heads/master
         to 9be8795af18adeebfd1c35c6ead1d2e61bb55958 (commit)
       from b2148d040facc3a3470523af18707537adf26ae7 (commit)

commit 9be8795af18adeebfd1c35c6ead1d2e61bb55958
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Jan 5 03:45:53 2013 -0500

    Fix for loading audio cd on startup.

 src/gst/parole-gst.c |    2 --
 src/parole-player.c  |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 1f9b0fd..6e27725 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1755,7 +1755,6 @@ parole_gst_button_press_event (GtkWidget *widget, GdkEventButton *ev)
     {
 	nav = GST_NAVIGATION (gst->priv->video_sink);
 	gst_navigation_send_mouse_event (nav, "mouse-button-press", ev->button, ev->x, ev->y);
-	//ret = TRUE;
     }
     
     if (GTK_WIDGET_CLASS (parole_gst_parent_class)->button_press_event)
@@ -1818,7 +1817,6 @@ parole_gst_change_dvd_chapter (ParoleGst *gst, gint level)
 {
     GstFormat format;
 
-    // FIXME: Do we really need to get the nick each time?
     format = gst_format_get_by_nick ("chapter");
     
     parole_gst_seek_by_format (gst, format, level);
diff --git a/src/parole-player.c b/src/parole-player.c
index 5192223..9770255 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1063,8 +1063,8 @@ parole_player_disc_selected_cb (ParoleDisc *disc, const gchar *uri, const gchar
         parole_media_list_clear_list (player->priv->list);
         TRACE("END CLEAR PLAYLIST");
     }
-    else
-    parole_media_list_set_playlist_view(player->priv->list, PAROLE_MEDIA_LIST_PLAYLIST_VIEW_DISC);
+    else if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
+        parole_media_list_set_playlist_view(player->priv->list, PAROLE_MEDIA_LIST_PLAYLIST_VIEW_DISC);
 }
 
 static void