rpms/totem/devel totem-use-pulsesink-volume.patch,1.4,1.5

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529

Modified Files:
	totem-use-pulsesink-volume.patch 
Log Message:
Fix patcheroo


totem-use-pulsesink-volume.patch:

Index: totem-use-pulsesink-volume.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem-use-pulsesink-volume.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- totem-use-pulsesink-volume.patch	2 Apr 2009 16:53:57 -0000	1.4
+++ totem-use-pulsesink-volume.patch	2 Apr 2009 17:08:02 -0000	1.5
@@ -43,7 +43,7 @@
  }
  
  void
-@@ -3145,8 +3152,25 @@
+@@ -3145,8 +3152,24 @@
    if (bacon_video_widget_can_set_volume (bvw) != FALSE)
    {
      volume = CLAMP (volume, 0.0, 1.0);
@@ -58,7 +58,6 @@
 +	gdouble new_vol;
 +	g_object_set (bvw->priv->pulse_audio_sink, "volume",
 +		      (gdouble) volume, NULL);
-+	got_set = TRUE;
 +
 +        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
 +      }
@@ -71,7 +70,12 @@
      g_object_notify (G_OBJECT (bvw), "volume");
    }
  }
-@@ -3159,9 +3183,7 @@
+@@ -3154,14 +3177,10 @@
+ double
+ bacon_video_widget_get_volume (BaconVideoWidget * bvw)
+ {
+-  double vol;
+-
    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
    g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
  
@@ -82,7 +86,7 @@
  }
  
  void
-@@ -4935,6 +4957,27 @@
+@@ -4935,6 +4954,27 @@
    g_mutex_unlock (bvw->priv->lock);
  }
  
@@ -110,7 +114,7 @@
  GtkWidget *
  bacon_video_widget_new (int width, int height,
                          BvwUseType type, GError ** err)
-@@ -5000,15 +5043,18 @@
+@@ -5000,15 +5040,18 @@
        cb_gconf, bvw, NULL, NULL);
  
    if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
@@ -137,7 +141,7 @@
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5155,9 +5201,19 @@
+@@ -5155,9 +5198,19 @@
        /* 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");