r2952 - trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src

[abraxa at sita.openmoko.org]

Author: abraxa
Date: 2007-09-11 11:25:22 +0200 (Tue, 11 Sep 2007)
New Revision: 2952

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/editor_page.c
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playlist_page.c
Log:
Fix doubled unref of the alsa sink (the playbin already does that)
Prevent file chooser path from being empty
Fix playlist list icon
Fix playlist editor list icon



Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/editor_page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/editor_page.c	2007-09-11 09:04:17 UTC (rev 2951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/editor_page.c	2007-09-11 09:25:22 UTC (rev 2952)
@@ -220,7 +220,7 @@
 	GtkTreeViewColumn *column;
 	GdkPixbuf *track_icon;
 
-	track_icon = pixbuf_new_from_file("ico-tracktype-general.png");
+	track_icon = pixbuf_new_from_file("ico-tracktype-generic.png");
 
 	// Create data model
 	omp_editor_page_list_store = gtk_list_store_new(COLUMN_COUNT,

Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c	2007-09-11 09:04:17 UTC (rev 2951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.c	2007-09-11 09:25:22 UTC (rev 2952)
@@ -171,7 +171,7 @@
 	omp_session->volume = 100;
 	omp_session->fade_speed = 5000;
 	g_snprintf(omp_session->file_chooser_path, sizeof(omp_session->file_chooser_path),
-		"%s", "/media/card/");
+		"%s", OMP_DEFAULT_FILE_CHOOSER_PATH);
 }
 
 /**
@@ -401,5 +401,11 @@
 {
 	g_return_val_if_fail(omp_session, NULL);
 
+	if (omp_session->file_chooser_path[0] == 0)
+	{
+		g_snprintf(omp_session->file_chooser_path, sizeof(omp_session->file_chooser_path),
+			"%s", OMP_DEFAULT_FILE_CHOOSER_PATH);
+	}
+
 	return g_strdup((gchar *)&omp_session->file_chooser_path);
 }

Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h	2007-09-11 09:04:17 UTC (rev 2951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/persistent.h	2007-09-11 09:25:22 UTC (rev 2952)
@@ -35,6 +35,8 @@
 
 #define OMP_EVENT_SESSION_FILE_CHOOSER_PATH_CHANGED "session_file_chooser_path_changed"
 
+#define OMP_DEFAULT_FILE_CHOOSER_PATH "/media/card/"
+
 /// Application configuration data
 /// @note Default values are taken from omp_default_config
 /// @note Update that struct as well if you make changes here!

Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c	2007-09-11 09:04:17 UTC (rev 2951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playback.c	2007-09-11 09:25:22 UTC (rev 2952)
@@ -157,8 +157,6 @@
 
 	gst_element_set_state(omp_gst_playbin, GST_STATE_NULL);
 	gst_object_unref(GST_OBJECT(omp_gst_playbin));
-
-	gst_object_unref(GST_OBJECT(omp_gst_audiosink));
 }
 
 /**

Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playlist_page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playlist_page.c	2007-09-11 09:04:17 UTC (rev 2951)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/playlist_page.c	2007-09-11 09:25:22 UTC (rev 2952)
@@ -269,6 +269,7 @@
 	GtkTreeSelection *select;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
+	GdkPixbuf *list_icon;
 
 	// Create and populate data model
 	omp_playlist_page_list_store = gtk_list_store_new(COLUMN_COUNT,
@@ -288,8 +289,9 @@
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(select), GTK_SELECTION_SINGLE);
 
 	// Set up columns
+	list_icon = pixbuf_new_from_file("ico-playlists.png");
 	renderer = gtk_cell_renderer_pixbuf_new();
-	g_object_set(G_OBJECT(renderer), "stock-id", MOKO_STOCK_VIEW, NULL);
+	g_object_set(G_OBJECT(renderer), "pixbuf", list_icon, NULL);
 	column = gtk_tree_view_column_new_with_attributes("", renderer, NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);