rpms/totem/F-11 0001-Set-the-PA-stream-volume-from-Totem.patch, 1.2, 1.3 totem.spec, 1.246, 1.247

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31809

Modified Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch totem.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-7
- Update pulsesink patch to use bicubic volumes (#512090)


0001-Set-the-PA-stream-volume-from-Totem.patch:
 configure.in                              |    2 
 src/backend/bacon-video-widget-gst-0.10.c |   93 +++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 21 deletions(-)

Index: 0001-Set-the-PA-stream-volume-from-Totem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/0001-Set-the-PA-stream-volume-from-Totem.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-Set-the-PA-stream-volume-from-Totem.patch	15 Sep 2009 12:23:19 -0000	1.2
+++ 0001-Set-the-PA-stream-volume-from-Totem.patch	19 Oct 2009 15:23:37 -0000	1.3
@@ -1,6 +1,6 @@
-From 6bd2e600030cfd3b19a4612a79eb8fcf07d878b5 Mon Sep 17 00:00:00 2001
+From 8d4d326c9bcfca643782ead1f5f7ced58485b62d Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
-Date: Tue, 18 Aug 2009 17:11:18 +0100
+Date: Mon, 19 Oct 2009 16:21:42 +0100
 Subject: [PATCH] Set the PA stream volume from Totem
 
 ...instead of having a separate one.
@@ -8,12 +8,27 @@ Subject: [PATCH] Set the PA stream volum
 - avoid setting the volume when pulsesink isn't in a state where it has
 a stream
 - don't set the volume on the stream on startup when using pulsesink
+- use bicubic volumes in the interface
 ---
- src/backend/bacon-video-widget-gst-0.10.c |   95 +++++++++++++++++++++++------
- 1 files changed, 76 insertions(+), 19 deletions(-)
+ configure.in                              |    2 +-
+ src/backend/bacon-video-widget-gst-0.10.c |   92 +++++++++++++++++++++++------
+ 2 files changed, 74 insertions(+), 20 deletions(-)
 
+diff --git a/configure.in b/configure.in
+index d3d4142..587a878 100644
+--- a/configure.in
++++ b/configure.in
+@@ -62,7 +62,7 @@ dnl release versions.
+ XINE_REQS=1.1.7
+ GST_MAJORMINOR=0.10
+ GST_REQS=0.10.12
+-GSTPLUG_REQS=0.10.12
++GSTPLUG_REQS=0.10.25
+ 
+ AC_ARG_ENABLE(xine,
+ 	AC_HELP_STRING([--enable-xine], [use xine instead of GStreamer for the backend]),
 diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
-index e43e068..066b2f3 100644
+index e43e068..da5203f 100644
 --- a/src/backend/bacon-video-widget-gst-0.10.c
 +++ b/src/backend/bacon-video-widget-gst-0.10.c
 @@ -163,7 +163,9 @@ struct BaconVideoWidgetPrivate
@@ -65,7 +80,7 @@ index e43e068..066b2f3 100644
  }
  
  void
-@@ -3142,11 +3150,32 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+@@ -3142,11 +3150,29 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
    g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
    g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
  
@@ -85,11 +100,8 @@ index e43e068..066b2f3 100644
 +      gst_element_get_state (bvw->priv->pulse_audio_sink, &cur_state, NULL, 0);
 +      if (cur_state == GST_STATE_READY || cur_state == GST_STATE_PLAYING)
 +      {
-+	gdouble new_vol;
 +	g_object_set (bvw->priv->pulse_audio_sink, "volume",
 +		      (gdouble) volume, NULL);
-+
-+        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
 +      }
 +    } else {
 +      g_object_set (bvw->priv->play, "volume",
@@ -100,7 +112,7 @@ index e43e068..066b2f3 100644
      g_object_notify (G_OBJECT (bvw), "volume");
    }
  }
-@@ -3154,14 +3183,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+@@ -3154,14 +3180,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
  double
  bacon_video_widget_get_volume (BaconVideoWidget * bvw)
  {
@@ -116,7 +128,7 @@ index e43e068..066b2f3 100644
  }
  
  void
-@@ -4940,6 +4965,27 @@ got_new_video_sink_bin_element (GstBin *video_sink, GstElement *element,
+@@ -4940,6 +4962,27 @@ got_new_video_sink_bin_element (GstBin *video_sink, GstElement *element,
    g_mutex_unlock (bvw->priv->lock);
  }
  
@@ -144,7 +156,7 @@ index e43e068..066b2f3 100644
  GtkWidget *
  bacon_video_widget_new (int width, int height,
                          BvwUseType type, GError ** err)
-@@ -5005,15 +5051,18 @@ bacon_video_widget_new (int width, int height,
+@@ -5005,15 +5048,18 @@ bacon_video_widget_new (int width, int height,
        cb_gconf, bvw, NULL, NULL);
  
    if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
@@ -171,7 +183,7 @@ index e43e068..066b2f3 100644
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5160,9 +5209,17 @@ bacon_video_widget_new (int width, int height,
+@@ -5160,9 +5206,17 @@ bacon_video_widget_new (int width, int height,
        /* make fakesink sync to the clock like a real sink */
        g_object_set (audio_sink, "sync", TRUE, NULL);
        GST_DEBUG ("audio sink doesn't work, using fakesink instead");
@@ -191,5 +203,5 @@ index e43e068..066b2f3 100644
      g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
                   _("Could not find the audio output. "
 -- 
-1.6.2.5
+1.6.5.rc2
 


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- totem.spec	2 Oct 2009 23:26:25 -0000	1.246
+++ totem.spec	19 Oct 2009 15:23:37 -0000	1.247
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -487,6 +487,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-7
+- Update pulsesink patch to use bicubic volumes (#512090)
+
 * Sat Oct 03 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-6
 - Fix YouTube plugin URLs (#521725)