Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0eee974564166871f7cb35a3c8ae36191195a424)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0eee974564166871f7cb35a3c8ae36191195a424)
  • Date: Wed, 6 Oct 2010 18:29:33 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

audio-players/sound-juicer/HISTORY | 4 +
audio-players/sound-juicer/PRE_BUILD | 5 +
audio-players/sound-juicer/play.patch | 98
++++++++++++++++++++++++++++++++++
3 files changed, 107 insertions(+)

New commits:
commit 0eee974564166871f7cb35a3c8ae36191195a424
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sound-juicer: Fix duplicate entry from unistd.h
From
http://git.gnome.org/browse/sound-juicer/commit/?id=0adaffaea1028f5ef90f6aff675b9c81fbfb6a54

diff --git a/audio-players/sound-juicer/HISTORY
b/audio-players/sound-juicer/HISTORY
index f2c8295..74c93ea 100644
--- a/audio-players/sound-juicer/HISTORY
+++ b/audio-players/sound-juicer/HISTORY
@@ -1,3 +1,7 @@
+2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply play.patch
+ * play.patch: Fix duplicate entry from unistd.h
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.28.2

diff --git a/audio-players/sound-juicer/PRE_BUILD
b/audio-players/sound-juicer/PRE_BUILD
new file mode 100755
index 0000000..9d22739
--- /dev/null
+++ b/audio-players/sound-juicer/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+message "${MESSAGE_COLOR}Applying duplicate play() from unistd.h
patch...${DEFAULT_COLOR}" &&
+patch "$SOURCE_DIRECTORY"/src/sj-play.c \
+ "$SPELL_DIRECTORY"/play.patch
diff --git a/audio-players/sound-juicer/play.patch
b/audio-players/sound-juicer/play.patch
new file mode 100644
index 0000000..c3f3b61
--- /dev/null
+++ b/audio-players/sound-juicer/play.patch
@@ -0,0 +1,98 @@
+#
+# From
http://git.gnome.org/browse/sound-juicer/commit/?id=0adaffaea1028f5ef90f6aff675b9c81fbfb6a54
+#
+diff --git a/src/sj-play.c b/src/sj-play.c
+index 25aeba0..a0e19f3 100644
+--- a/src/sj-play.c
++++ b/src/sj-play.c
+@@ -84,7 +84,7 @@ select_track (void)
+ * Start playing.
+ */
+ static void
+-play (void)
++_play (void)
+ {
+ gst_element_set_state (pipeline, GST_STATE_PLAYING);
+
+@@ -96,7 +96,7 @@ play (void)
+ * Pause
+ */
+ static void
+-pause (void)
++_pause (void)
+ {
+ gst_element_set_state (pipeline, GST_STATE_PAUSED);
+ }
+@@ -105,7 +105,7 @@ pause (void)
+ * Stop and reset UI.
+ */
+ static void
+-stop (void)
++_stop (void)
+ {
+ if (pipeline != NULL)
+ gst_element_set_state (pipeline, GST_STATE_NULL);
+@@ -173,7 +173,7 @@ cb_hop_track (GstBus *bus, GstMessage *message, gpointer
user_data)
+ }
+
+ if (next_track >= tracks) {
+- stop ();
++ _stop ();
+ seek_to_track = 0;
+ } else {
+ seek_to_track = next_track;
+@@ -200,7 +200,7 @@ cb_error (GstBus *bus, GstMessage *message, gpointer
user_data)
+ /* There may be other (more generic) error messages on the bus; set
pipeline
+ * to NULL state so these messages are flushed from the bus and we don't
get
+ * called again for those */
+- stop ();
++ _stop ();
+ }
+
+ static gchar *
+@@ -427,7 +427,7 @@ setup (GError **err)
+ void
+ stop_playback (void)
+ {
+- stop ();
++ _stop ();
+ }
+
+ /*
+@@ -440,12 +440,12 @@ on_play_activate (GtkWidget *button, gpointer
user_data)
+ GError *err = NULL;
+
+ if (is_playing ()) {
+- pause ();
++ _pause ();
+ gtk_list_store_set (track_store, &current_iter,
+ COLUMN_STATE, STATE_PAUSED, -1);
+ } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED &&
+ current_track == seek_to_track) {
+- play ();
++ _play ();
+ gtk_list_store_set (track_store, &current_iter,
+ COLUMN_STATE, STATE_PLAYING, -1);
+ } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED &&
+@@ -528,7 +528,7 @@ on_previous_track_activate(GtkWidget *button, gpointer
data)
+ }
+
+ if (prev_track < 0) {
+- stop ();
++ _stop ();
+ seek_to_track = 0;
+ } else {
+ seek_to_track = prev_track;
+@@ -550,10 +550,10 @@ set_gst_ui_and_play (void)
+ &current_iter, COLUMN_TITLE, &title, -1);
+ sj_main_set_title (title);
+ g_free (title);
+- play ();
++ _play ();
+ } else {
+ g_warning (G_STRLOC ": failed to select track");
+- stop ();
++ _stop ();
+ }
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0eee974564166871f7cb35a3c8ae36191195a424), Eric Sandall, 10/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page