File goobox-gstreamer-0-10.patch of Package goobox

Overview Repositories Revisions Requests Users Attributes Meta

File goobox-gstreamer-0-10.patch of Package goobox (Revision 26283cfba94a48b7c46ea548e81bccc8)

Currently displaying revision 26283cfba94a48b7c46ea548e81bccc8 , Show latest

? src/goobox.txt
? src/sj.txt
Index: configure.in
===================================================================
RCS file: /cvs/gnome/goobox/configure.in,v
retrieving revision 1.54
diff -u -r1.54 configure.in
--- configure.in	24 Jan 2006 04:19:26 -0000	1.54
+++ configure.in	9 Apr 2006 05:30:59 -0000
@@ -25,7 +25,7 @@
 LIBBONOBO_REQUIRED=2.6.0
 GNOME_VFS_REQUIRED=2.6.0
 LIBGLADE_REQUIRED=2.4.0
-GSTREAMER_REQUIRED=0.8.11
+GSTREAMER_REQUIRED=0.10.4
 LIBNOTIFY_REQUIRED=0.2.1
 
 AC_SUBST(GLIB_REQUIRED)
@@ -51,12 +51,11 @@
 	gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED	\
 	gnome-vfs-module-2.0			\
 	libglade-2.0 >= $LIBGLADE_REQUIRED	\
-	gstreamer-0.8 >= $GSTREAMER_REQUIRED	\
-	gstreamer-libs-0.8			\
-	gstreamer-play-0.8			\
-	gstreamer-gconf-0.8)
+	gstreamer-0.10 >= $GSTREAMER_REQUIRED	\
+	gstreamer-base-0.10)
 AC_SUBST(GOO_CFLAGS)
 AC_SUBST(GOO_LIBS)
+GOO_LIBS="$GOO_LIBS -lgstinterfaces-0.10"
 
 dnl
 dnl GTK+ version
Index: src/dlg-ripper.c
===================================================================
RCS file: /cvs/gnome/goobox/src/dlg-ripper.c,v
retrieving revision 1.21
diff -u -r1.21 dlg-ripper.c
--- src/dlg-ripper.c	9 Nov 2005 21:02:43 -0000	1.21
+++ src/dlg-ripper.c	9 Apr 2006 05:31:00 -0000
@@ -78,9 +78,10 @@
 	char          *ext;
 	GooCdrom      *cdrom;
 
-	GstElement    *rip_thread;
+	GstElement    *rip_pipeline;
 	GstElement    *source;
 	GstElement    *encoder;
+	GstElement    *queue;
 	GstElement    *sink;
 	GstPad        *source_pad;
 	GstFormat      track_format, sector_format;
@@ -128,9 +129,9 @@
 	if (data->ripping && (data->current_file != NULL))
 		gnome_vfs_unlink (data->current_file);
 
-	if (data->rip_thread != NULL) {
-		gst_element_set_state (data->rip_thread, GST_STATE_NULL);
-		gst_object_unref (GST_OBJECT (data->rip_thread));
+	if (data->rip_pipeline != NULL) {
+		gst_element_set_state (data->rip_pipeline, GST_STATE_NULL);
+		gst_object_unref (GST_OBJECT (data->rip_pipeline));
 	}
 
 	if (data->timer != NULL)
@@ -152,32 +153,6 @@
 }
 
 
-static void rip_current_track (DialogData *data);
-
-
-static gboolean
-rip_next_track (gpointer callback_data)
-{
-	DialogData *data = callback_data;
-	TrackInfo  *track;
-
-	g_free (data->current_file);
-	data->current_file = NULL;
-
-	gst_element_set_state (data->encoder, GST_STATE_NULL);
-	gst_element_set_state (data->rip_thread, GST_STATE_NULL);
-
-	track = data->current_track->data;
-	data->prev_tracks_sectors += track->sectors;
-
-	data->current_track_n++;
-	data->current_track = data->current_track->next;
-	rip_current_track (data);
-
-	return FALSE;
-}
-
-
 static char *
 time_pretty_print (double s)
 {
@@ -221,25 +196,32 @@
 	return FALSE;
 }
 
+static void rip_current_track (DialogData *data);
 
 static void
-encoder_eos_cb (GstBin     *bin, 
-		DialogData *data)
+encoder_eos_cb (GstBus *bus, GstMessage *message, DialogData *data)
 {
-	if (data->update_handle != 0) {
-		g_source_remove (data->update_handle);
-		data->update_handle = 0;
-	}
-	g_idle_add (rip_next_track, data);
-}
+	TrackInfo  *track;
+
+	g_free (data->current_file);
+	data->current_file = NULL;
+
+	gst_element_set_state (data->encoder, GST_STATE_NULL);
+	gst_element_set_state (data->rip_pipeline, GST_STATE_NULL);
 
+	track = data->current_track->data;
+	data->prev_tracks_sectors += track->sectors;
+
+	data->current_track_n++;
+	data->current_track = data->current_track->next;
+	rip_current_track (data);
+}
 
 static gboolean
 update_progress_cb (gpointer callback_data)
 {
 	DialogData  *data = callback_data;
 	TrackInfo   *track = data->current_track->data;
-	gint64       from_sector;
 	gint64       sector = 0;
 	gboolean     ret;
 
@@ -248,12 +230,10 @@
 		data->update_handle = 0;
 	}
 	
-	ret = gst_pad_query (data->source_pad, GST_QUERY_POSITION, &data->sector_format, &sector);
-	if (!ret)
+	if (!gst_element_query_position (data->source, &data->sector_format, &sector))
 		return FALSE;
-	
-	from_sector = track->from_sector - TOC_OFFSET;
-	data->current_track_sectors = sector - from_sector;
+
+	data->current_track_sectors = sector;
 	g_idle_add (update_ui, data);
 
 	data->update_handle = g_timeout_add (UPDATE_DELAY, update_progress_cb, data);
@@ -261,25 +241,16 @@
 	return FALSE;
 }
 
-
-static void
-create_pipeline (DialogData *data)
+static void create_encoder (DialogData *data) 
 {
 	float       ogg_quality;
 	int         flac_compression;
 	int         mp3_quality;
 	GParamSpec *pspec;
 
-	data->rip_thread = gst_thread_new ("rip_thread");
-		
-	data->source = gst_element_factory_make ("cdparanoia", "cdparanoia");
-	g_object_set (G_OBJECT (data->source), 
-		      "device", data->location,
-		      NULL);
-
 	switch (data->format) {
-	case GOO_FILE_FORMAT_OGG:	
-		data->encoder = gst_element_factory_make (OGG_ENCODER, "encoder");
+	case GOO_FILE_FORMAT_OGG:
+		data->encoder = gst_parse_bin_from_description ("audioconvert ! audio/x-raw-float,rate=44100,channels=2 ! vorbisenc name=enc quality=0.5 ! oggmux", TRUE, NULL);
 		data->ext = "ogg";
 		ogg_quality = eel_gconf_get_float (PREF_ENCODER_OGG_QUALITY, DEFAULT_OGG_QUALITY) + 0.05;
 		g_object_set (data->encoder,
@@ -288,7 +259,7 @@
 		break;
 
 	case GOO_FILE_FORMAT_FLAC:
-		data->encoder = gst_element_factory_make (FLAC_ENCODER, "encoder");
+		data->encoder =  gst_parse_bin_from_description ("audioconvert ! audio/x-raw-int,rate=44100,channels=2 ! flacenc name=enc", TRUE, NULL);
 		data->ext = "flac";
 		flac_compression = eel_gconf_get_integer (PREF_ENCODER_FLAC_COMPRESSION, DEFAULT_FLAC_COMPRESSION);
 		g_object_set (data->encoder,
@@ -297,7 +268,7 @@
 		break;
 
 	case GOO_FILE_FORMAT_MP3:
-		data->encoder = gst_element_factory_make (MP3_ENCODER, "encoder");
+		data->encoder = gst_parse_bin_from_description ("audioconvert ! audio/x-raw-int,rate=22050,channels=1 ! lame name=enc", TRUE, NULL);
 		data->ext = "mp3";
 		mp3_quality = eel_gconf_get_integer (PREF_ENCODER_MP3_QUALITY, DEFAULT_MP3_QUALITY);
 		pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (data->encoder), "vbr_quality");
@@ -314,19 +285,40 @@
 		break;
 
 	case GOO_FILE_FORMAT_WAVE:
-		data->encoder = gst_element_factory_make (WAVE_ENCODER, "encoder");
+		data->encoder = gst_parse_bin_from_description ("audioconvert ! audio/x-raw-int,rate=22050,channels=1 ! wavenc name=enc", TRUE, NULL);
 		data->ext = "wav";
 		break;
 	}
-	g_signal_connect (data->encoder, 
-			  "eos", 
-			  G_CALLBACK (encoder_eos_cb), 
-			  data);
+}
+
+static void
+create_pipeline (DialogData *data)
+{
+	GstBus *bus;
+	
+	data->rip_pipeline = gst_pipeline_new ("rip_pipeline");
+		
+	data->source = gst_element_factory_make ("cdparanoiasrc", "cdparanoia");
+	g_object_set (G_OBJECT (data->source), 
+		      "device", data->location,
+		      NULL);
+	g_object_set (G_OBJECT (data->source), "read-speed", G_MAXINT, NULL);
+
+	data->queue = gst_element_factory_make ("queue", "queue");
+	/* Nice big buffers... */
+	g_object_set (data->queue, "max-size-time", 120 * GST_SECOND, NULL);
+
+	create_encoder (data);
+	
+	bus = gst_element_get_bus (data->rip_pipeline);
+	gst_bus_add_signal_watch (bus);
+	
+	g_signal_connect (bus, "message::eos", G_CALLBACK (encoder_eos_cb), data);
 
 	data->sink = gst_element_factory_make ("gnomevfssink", "filesink");
 
-	gst_bin_add_many (GST_BIN (data->rip_thread), data->source, data->encoder, data->sink, NULL);
-	gst_element_link_many (data->source, data->encoder, data->sink, NULL);
+	gst_bin_add_many (GST_BIN (data->rip_pipeline), data->source, data->queue, data->encoder, data->sink, NULL);
+	gst_element_link_many (data->source, data->queue, data->encoder, data->sink, NULL);
 
 	data->track_format = gst_format_get_by_nick ("track");
 	data->sector_format = gst_format_get_by_nick ("sector");
@@ -445,7 +437,7 @@
 		char   buffer[BUFFER_SIZE];
 		int    n = 0;
 
-		strcpy (buffer, "[playlist]\n");
+		strcpy (buffer, "[play]\n");
 		gnome_vfs_write (handle,
 				 buffer,
 				 strlen (buffer),
@@ -581,48 +573,42 @@
 	/* Set song tags. */
 
 	if (GST_IS_TAG_SETTER (data->encoder)) {
-		gst_tag_setter_add (GST_TAG_SETTER (data->encoder),   
-				    GST_TAG_MERGE_REPLACE,
-				    GST_TAG_TITLE, track->title,
-				    GST_TAG_ARTIST, data->artist,
-				    GST_TAG_ALBUM, data->album,
-				    GST_TAG_TRACK_NUMBER, (guint) track->number + 1,
-				    GST_TAG_TRACK_COUNT, (guint) data->total_tracks,
-				    GST_TAG_DURATION, (guint64) track->length * GST_SECOND, 
-				    GST_TAG_COMMENT, _("Ripped with Goobox"),
-				    GST_TAG_ENCODER, PACKAGE_NAME,
-				    GST_TAG_ENCODER_VERSION, PACKAGE_VERSION,
-				    NULL);
+		gst_tag_setter_add_tags (GST_TAG_SETTER (data->encoder),   
+					 GST_TAG_MERGE_REPLACE,
+					 GST_TAG_TITLE, track->title,
+					 GST_TAG_ARTIST, data->artist,
+					 GST_TAG_ALBUM, data->album,
+					 GST_TAG_TRACK_NUMBER, (guint) track->number + 1,
+					 GST_TAG_TRACK_COUNT, (guint) data->total_tracks,
+					 GST_TAG_DURATION, (guint64) track->length * GST_SECOND, 
+					 GST_TAG_COMMENT, _("Ripped with Goobox"),
+					 GST_TAG_ENCODER, PACKAGE_NAME,
+					 GST_TAG_ENCODER_VERSION, PACKAGE_VERSION,
+					 NULL);
 		if (data->genre != NULL)
-			gst_tag_setter_add (GST_TAG_SETTER (data->encoder),   
-					    GST_TAG_MERGE_REPLACE,
-					    GST_TAG_GENRE, data->genre,
-					    NULL);
+			gst_tag_setter_add_tags (GST_TAG_SETTER (data->encoder),   
+						 GST_TAG_MERGE_REPLACE,
+						 GST_TAG_GENRE, data->genre,
+						 NULL);
 		if (data->year != 0) {
 			GDate *d = g_date_new_dmy (1, 1, data->year);
-			gst_tag_setter_add (GST_TAG_SETTER (data->encoder),   
-					    GST_TAG_MERGE_REPLACE,
-					    GST_TAG_DATE,  g_date_get_julian (d),
-					    NULL);
+			gst_tag_setter_add_tags (GST_TAG_SETTER (data->encoder),   
+						 GST_TAG_MERGE_REPLACE,
+						 GST_TAG_DATE,  g_date_get_julian (d),
+						 NULL);
 			g_date_free (d);
 		}
 	}
 		
 	/* Seek to track. */
+	g_object_set (G_OBJECT (data->source), "track", track->number + 1, NULL);
 
-	gst_element_set_state (data->rip_thread, GST_STATE_PAUSED);
-	event = gst_event_new_segment_seek (data->track_format | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, track->number, track->number + 1);
-	if (!gst_pad_send_event (data->source_pad, event)) {
-		g_warning ("seek failed");
-		return;
-	}
+	gst_element_set_state (data->rip_pipeline, GST_STATE_PAUSED);
+	gst_element_set_state (data->rip_pipeline, GST_STATE_PLAYING);
 
 	/* Start ripping. */
-
 	data->current_track_sectors = 0;
 	data->update_handle = g_timeout_add (UPDATE_DELAY, update_progress_cb, data);
-
-	gst_element_set_state (data->rip_thread, GST_STATE_PLAYING);
 }
 
 
Index: src/goo-player-cd.c
===================================================================
RCS file: /cvs/gnome/goobox/src/goo-player-cd.c,v
retrieving revision 1.18
diff -u -r1.18 goo-player-cd.c
--- src/goo-player-cd.c	9 Nov 2005 09:07:32 -0000	1.18
+++ src/goo-player-cd.c	9 Apr 2006 05:31:00 -0000
@@ -25,9 +25,8 @@
 #include <string.h>
 #include <gnome.h>
 #include <gst/gst.h>
-#include <gst/gconf/gconf.h>
-#include <gst/play/play.h>
-#include <gst/mixer/mixer.h>
+#include <gst/interfaces/mixer.h>
+#include <gst/cdda/gstcddabasesrc.h>
 
 #include "goo-player-cd.h"
 #include "goo-cdrom.h"
@@ -46,7 +45,7 @@
 
 struct _GooPlayerCDPrivateData {
 	GooCdrom        *cdrom;
-	GstElement      *play_thread;
+	GstElement      *play_pipeline;
 	GstElement      *source;
 	GstPad          *source_pad;
 	GstElement      *volume;
@@ -169,10 +168,10 @@
 
 	goo_cdrom_unlock_tray (priv->cdrom);
 
-	if (priv->play_thread != NULL) {
-		gst_element_set_state (priv->play_thread, GST_STATE_NULL);
-		gst_object_unref (GST_OBJECT (priv->play_thread));
-		priv->play_thread = NULL;
+	if (priv->play_pipeline != NULL) {
+		gst_element_set_state (priv->play_pipeline, GST_STATE_NULL);
+		gst_object_unref (GST_OBJECT (priv->play_pipeline));
+		priv->play_pipeline = NULL;
 	}
 
 	if (priv->update_progress_id != 0) {
@@ -188,32 +187,30 @@
 		add_state_polling (player);
 }
 
-
-static gboolean
-player_done_cb (gpointer callback_data)
+static void
+player_eos_cb (GstBus *bus, GstMessage *message, gpointer data)
 {
-	GooPlayer *player = GOO_PLAYER (callback_data);
-	action_done (player, GOO_PLAYER_ACTION_PLAY);
-	return FALSE;
+	action_done (GOO_PLAYER (data), GOO_PLAYER_ACTION_PLAY);
 }
 
-
 static void
-player_eos_cb (GstBin   *bin, 
-	       gpointer  data)
+player_tag_cb (GstBus *bus, GstMessage *message, gpointer data)
 {
-	GooPlayerCD *player_cd = data;
+ 	GooPlayerCD *player_cd = data;
 	GooPlayerCDPrivateData *priv = player_cd->priv;
+	GstTagList *new_tags;
+	char *tag;
+	
+        gst_message_parse_tag (message, &new_tags);
+	if (gst_tag_list_get_string (new_tags, GST_TAG_CDDA_CDDB_DISCID, &tag)) {
+		g_free (priv->discid);
+		priv->discid = tag;
 
-	if (priv->update_progress_id != 0) {
-		g_source_remove (priv->update_progress_id);
-		priv->update_progress_id = 0;
+		debug (DEBUG_INFO, "DISC ID: %s\n", priv->discid);
 	}
-
-	g_idle_add (player_done_cb, data);
+	gst_tag_list_free (new_tags);
 }
 
-
 static gboolean
 update_progress_cb (gpointer callback_data)
 {
@@ -229,8 +226,7 @@
 		priv->update_progress_id = 0;
 	}
 	
-	ret = gst_pad_query (priv->source_pad, GST_QUERY_POSITION, &priv->sector_format, &sector);
-	if (!ret)
+	if (!gst_element_query_position (priv->source, &priv->sector_format, &sector))
 		return FALSE;
 
 	fraction = ((double) sector) / (double) priv->current_track->sectors;
@@ -249,19 +245,17 @@
 create_pipeline (GooPlayerCD *player)
 {
 	GooPlayerCDPrivateData *priv = player->priv;
-	GstElement *sink, *queue, *audio_thread;
-
+	GstElement *out, *queue;
+	GstBus *bus;
+	
 	destroy_pipeline (player, FALSE);
 	remove_state_polling (player);
 
 	goo_cdrom_lock_tray (priv->cdrom);
 
-	priv->play_thread = gst_thread_new ("play_thread");
+	priv->play_pipeline = gst_pipeline_new ("play_pipeline");
 		
-	priv->source = gst_element_factory_make ("cdparanoia", "cdparanoia");
-	/*g_object_set (G_OBJECT (priv->source), 
-		      "paranoia-mode", 0, 
-		      NULL); FIXME*/
+	priv->source = gst_element_factory_make ("cdparanoiasrc", "cdparanoia");
 	debug (DEBUG_INFO, "DEVICE: %s\n", goo_cdrom_get_device (priv->cdrom));
 	g_object_set (G_OBJECT (priv->source), 
 		      "device", goo_cdrom_get_device (priv->cdrom), 
@@ -276,21 +270,20 @@
 		      NULL);
 	*/
 
-	sink = gst_gconf_get_default_audio_sink ();
-	audio_thread = gst_thread_new ("a_decoder_thread");
+	out = gst_element_factory_make ("gconfaudiosink", "out");
 
-	gst_bin_add_many (GST_BIN (audio_thread), sink, NULL);
-	gst_bin_add_many (GST_BIN (priv->play_thread), priv->source, priv->volume, queue, audio_thread, NULL);
-	gst_element_link_many (priv->source, priv->volume, queue, sink, NULL);
+	gst_bin_add_many (GST_BIN (priv->play_pipeline), priv->source, priv->volume, queue, out, NULL);
+	gst_element_link_many (priv->source, priv->volume, queue, out, NULL);
 
 	priv->track_format = gst_format_get_by_nick ("track");
 	priv->sector_format = gst_format_get_by_nick ("sector");
 	priv->source_pad = gst_element_get_pad (priv->source, "src");
 	
-	g_signal_connect (priv->source,
-			  "eos", 
-			  G_CALLBACK (player_eos_cb), 
-			  player);
+	bus = gst_element_get_bus (priv->play_pipeline);
+	gst_bus_add_signal_watch (bus);
+	
+	g_signal_connect (bus, "message::eos", G_CALLBACK (player_eos_cb), player);
+	g_signal_connect (bus, "message::tag", G_CALLBACK (player_tag_cb), player);
 }
 
 
@@ -348,7 +341,7 @@
 	/**/
 
 	g_mutex_lock (priv->yes_or_no);
-	done = priv->thread == NULL;
+	done = (priv->thread == NULL && priv->discid != NULL);
 	exiting = priv->exiting;
         g_mutex_unlock (priv->yes_or_no);
 
@@ -368,7 +361,7 @@
 	/**/
 
 	goo_player_set_is_busy (player, FALSE);
-	gst_element_set_state (priv->play_thread, GST_STATE_NULL);
+	gst_element_set_state (priv->play_pipeline, GST_STATE_NULL);
 	goo_player_set_state (player, GOO_PLAYER_STATE_STOPPED, TRUE);
 	action_done (player, GOO_PLAYER_ACTION_LIST);
 	destroy_pipeline (player_cd, TRUE);
@@ -409,24 +402,28 @@
 	gint                    i;
 	gint64                  from_sector = 0, total_sectors;
 
-	gst_element_set_state (priv->play_thread, GST_STATE_PAUSED);
+	gst_element_set_state (priv->play_pipeline, GST_STATE_PAUSED);
 
 	/**/
 
-	gst_pad_query (priv->source_pad, GST_QUERY_TOTAL, &(priv->track_format), &(priv->n_tracks));
+	gst_element_query_duration (priv->source, &(priv->track_format), &(priv->n_tracks));
 
 	debug (DEBUG_INFO, "TOTAL TRACKS: %" G_GINT64_FORMAT "\n", priv->n_tracks);
 
-	gst_pad_query (priv->source_pad, GST_QUERY_SEGMENT_END, &(priv->sector_format), &total_sectors);
+	/* Temporarily set the mode to continuous so we get the sector
+	 * for the CD not the track */
+	g_object_set (G_OBJECT (priv->source), "mode", 1, NULL);
+	gst_element_query_duration (priv->source, &(priv->sector_format), &total_sectors);
 	total_sectors += TOC_OFFSET;
+	g_object_set (G_OBJECT (priv->source), "mode", 0, NULL);
 	
 	debug (DEBUG_INFO, "TOTAL SECTORS: %" G_GINT64_FORMAT "\n", total_sectors);
 	
-	gst_pad_convert (priv->source_pad, 
-			 priv->sector_format, 
-			 total_sectors, 
-			 &time_format, 
-			 &(priv->total_time));
+	gst_element_query_convert (priv->source, 
+				   priv->sector_format, 
+				   total_sectors, 
+				   &time_format, 
+				   &(priv->total_time));
 
 	debug (DEBUG_INFO, "TOTAL TIME: %" G_GINT64_FORMAT "\n", priv->total_time);
 
@@ -434,14 +431,14 @@
 		gint64 to_sector;
 
 		if (i < priv->n_tracks) {
-			gst_pad_convert (priv->source_pad, 
-					 priv->track_format, 
-					 i, 
-					 &priv->sector_format, 
-					 &to_sector);
+			gst_element_query_convert (priv->source, 
+						   priv->track_format, 
+						   i, 
+						   &priv->sector_format, 
+						   &to_sector);
 			to_sector += TOC_OFFSET;
 			debug (DEBUG_INFO, "TRACK %d: %" G_GINT64_FORMAT "\n", i, to_sector);
-		} else 
+		} else
 			to_sector = total_sectors;
 		
 		if (i > 0) {
@@ -454,10 +451,6 @@
 	}
 	priv->tracks = g_list_reverse (priv->tracks);
 
-	g_free (priv->discid);
-	g_object_get (priv->source, "discid", &(priv->discid), NULL);
-	debug (DEBUG_INFO, "DISC ID: %s\n", priv->discid);
-
 	g_mutex_lock (priv->yes_or_no);
 	priv->thread = NULL;
 	g_mutex_unlock (priv->yes_or_no);
@@ -513,7 +506,7 @@
 
 	goo_player_stop (player);
 	create_pipeline (player_cd);
-	gst_element_set_state (priv->play_thread, GST_STATE_PAUSED);
+	gst_element_set_state (priv->play_pipeline, GST_STATE_PAUSED);
 
 	/* seek to track */
 
@@ -527,9 +520,7 @@
 
 	g_return_if_fail (priv->current_track != NULL);
 
-	event = gst_event_new_segment_seek (priv->track_format | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, track_n, track_n + 1);
-	if (!gst_pad_send_event (priv->source_pad, event))
-		g_warning ("seek failed");
+	gst_element_seek (priv->play_pipeline, 1.0, priv->track_format, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, track_n, GST_SEEK_TYPE_NONE, -1);
 
 	action_done (player, GOO_PLAYER_ACTION_SEEK_SONG);
 	goo_player_play (player);
@@ -573,22 +564,15 @@
 {
 	GooPlayerCD *player_cd = GOO_PLAYER_CD (player);
 	GooPlayerCDPrivateData *priv = player_cd->priv;
-	gint64       to_sector, last_sector;
 	GstEvent    *event;
 
 	if (goo_player_get_is_busy (player))
 		return;
 
-	if (priv->play_thread == NULL)
+	if (priv->play_pipeline == NULL)
 		return;
 
-	last_sector = priv->current_track->to_sector - priv->current_track->from_sector;
-	to_sector = (gint64) SECTORS_PER_SEC * seconds;
-	to_sector = MIN (to_sector, last_sector - 1);
-
-	event = gst_event_new_seek (priv->sector_format | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, to_sector);
-	if (!gst_pad_send_event (priv->source_pad, event))
-		g_warning ("seek failed");
+	gst_element_seek (priv->play_pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, seconds * GST_SECOND, GST_SEEK_TYPE_NONE, -1);
 }
 
 
@@ -607,7 +591,7 @@
 		return;
 	}
 
-	if (! ((priv->play_thread != NULL)
+	if (! ((priv->play_pipeline != NULL)
 	       && ((goo_player_get_state (player) == GOO_PLAYER_STATE_PAUSED)
 		   || (goo_player_get_state (player) == GOO_PLAYER_STATE_SEEKING))))
 		create_pipeline (player_cd);
@@ -615,7 +599,7 @@
 	vol = goo_player_get_volume (player);
 	gst_mixer_set_volume (GST_MIXER (priv->volume), NULL, &vol);
 
-	gst_element_set_state (priv->play_thread, GST_STATE_PLAYING);
+	gst_element_set_state (priv->play_pipeline, GST_STATE_PLAYING);
 	goo_player_set_state (player, GOO_PLAYER_STATE_PLAYING, TRUE);
 
 	priv->update_progress_id = g_timeout_add (PROGRESS_DELAY, update_progress_cb, player);
@@ -631,10 +615,10 @@
 	if (goo_player_get_is_busy (player))
 		return;
 
-	if (priv->play_thread == NULL)
+	if (priv->play_pipeline == NULL)
 		return;
 
-	gst_element_set_state (priv->play_thread, GST_STATE_PAUSED);
+	gst_element_set_state (priv->play_pipeline, GST_STATE_PAUSED);
 	goo_player_set_state (GOO_PLAYER (player), GOO_PLAYER_STATE_PAUSED, TRUE);
 	action_done (player, GOO_PLAYER_ACTION_PAUSE);
 }
@@ -649,7 +633,7 @@
 	if (goo_player_get_is_busy (player))
 		return;
 
-	if (priv->play_thread == NULL)
+	if (priv->play_pipeline == NULL)
 		return;
 
 	destroy_pipeline (player_cd, TRUE);
@@ -864,6 +848,7 @@
 
 	if (priv->discid == NULL)
 		return;
+
 	if (strcmp (query->discid, priv->discid) != 0)
 		return;
 
Index: src/goo-window.c
===================================================================
RCS file: /cvs/gnome/goobox/src/goo-window.c,v
retrieving revision 1.52
diff -u -r1.52 goo-window.c
--- src/goo-window.c	18 Nov 2005 20:24:55 -0000	1.52
+++ src/goo-window.c	9 Apr 2006 05:31:00 -0000
@@ -28,8 +28,6 @@
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <gst/gst.h>
-#include <gst/gconf/gconf.h>
-#include <gst/play/play.h>
 
 #include "actions.h"
 #include "dlg-cover-chooser.h"
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/goobox/src/main.c,v
retrieving revision 1.15
diff -u -r1.15 main.c
--- src/main.c	5 Jan 2006 16:01:12 -0000	1.15
+++ src/main.c	9 Apr 2006 05:31:00 -0000
@@ -245,7 +245,7 @@
 	GstElement *cdparanoia;
 	gboolean    result;
 
-	cdparanoia = gst_element_factory_make ("cdparanoia", "cdreader");
+	cdparanoia = gst_element_factory_make ("cdparanoiasrc", "cdreader");
 	result = (cdparanoia != NULL);
 	if (cdparanoia != NULL) 
 		gst_object_unref (GST_OBJECT (cdparanoia));

Places

File goobox-gstreamer-0-10.patch of Package goobox (Revision 26283cfba94a48b7c46ea548e81bccc8)

Places