r21780 - in /desktop/unstable/totem/debian: changelog patches/02_use_gconf_audio_sink.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Oct  4 21:23:22 2009
New Revision: 21780

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21780
Log:
* debian/patches/02_use_gconf_audio_sink.patch:
  - Don't try to use PulseAudio inconditionally, use the user defined
    one from GConf instead. Closes: #548260.

Added:
    desktop/unstable/totem/debian/patches/02_use_gconf_audio_sink.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/patches/series

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=21780&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Sun Oct  4 21:23:22 2009
@@ -1,3 +1,11 @@
+totem (2.28.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/02_use_gconf_audio_sink.patch:
+    - Don't try to use PulseAudio inconditionally, use the user defined
+      one from GConf instead. Closes: #548260.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 04 Oct 2009 20:01:15 +0200
+
 totem (2.28.1-1) unstable; urgency=low
 
   * debian/control.in:

Added: desktop/unstable/totem/debian/patches/02_use_gconf_audio_sink.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/02_use_gconf_audio_sink.patch?rev=21780&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/02_use_gconf_audio_sink.patch (added)
+++ desktop/unstable/totem/debian/patches/02_use_gconf_audio_sink.patch [utf-8] Sun Oct  4 21:23:22 2009
@@ -1,0 +1,19 @@
+--- a/src/backend/bacon-video-widget-gst-0.10.c
++++ b/src/backend/bacon-video-widget-gst-0.10.c
+@@ -6183,8 +6183,6 @@
+       cb_gconf, bvw, NULL, NULL);
+ 
+   if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
+-    audio_sink = gst_element_factory_make ("pulsesink", "audio-sink");
+-    if (audio_sink == NULL) {
+       audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
+       if (audio_sink == NULL) {
+ 	g_warning ("Could not create element 'gconfaudiosink'");
+@@ -6195,7 +6193,6 @@
+ 	if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "profile"))
+ 	  g_object_set (G_OBJECT (audio_sink), "profile", 1, NULL);
+       }
+-    }
+   } else {
+     audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
+   }

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=21780&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series [utf-8] Sun Oct  4 21:23:22 2009
@@ -1,3 +1,4 @@
 01_fake_keypresses.patch
+02_use_gconf_audio_sink.patch
 70_bbc_plugin.patch
 90_autotools.patch