← Back to branch summary

~ubuntu-branches/ubuntu/karmic/quodlibet/karmic

« back to all changes in this revision

Viewing changes to debian/patches/40-use-music-profile.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2009-05-11 11:43:56 UTC
  • mfrom: (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090511114356-2s0j11l10rbzpm6w
Tags: 2.0-3ubuntu1
https://launchpad.net/bugs/373827
https://launchpad.net/bugs/357351
* Merge from debian unstable (LP: #373827), remaining changes:
  - debian/patches/60-popen2-deprecated.patch
  - debian/quodlibet-ext.install: support python 2.6
* debian/patches/fix-context-crashes.patch:
  - Don't crash when context clicking on columns.  LP: #357351

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/40-use-music-profile.patch
1
 
diff -Nur -x '*.orig' -x '*~' quodlibet-2.0/quodlibet/player/gstbe.py quodlibet-2.0.new/quodlibet/player/gstbe.py
2
 
--- quodlibet-2.0/quodlibet/player/gstbe.py     2008-09-14 05:19:55.000000000 +0200
3
 
+++ quodlibet-2.0.new/quodlibet/player/gstbe.py 2009-01-30 23:55:12.000000000 +0100
4
 
@@ -26,7 +26,7 @@
5
 
     * If it fails, fall back to autoaudiosink.
6
 
     * If that fails, complain loudly."""
7
 
 
8
 
-    if pipeline == "gconf": pipeline = "gconfaudiosink"
9
 
+    if pipeline == "gconf": pipeline = "gconfaudiosink profile=music"
10
 
     try: pipe = gst.parse_launch(pipeline)
11
 
     except gobject.GError, err:
12
 
         if pipeline != "autoaudiosink":
13
 
@@ -223,7 +223,7 @@
14
 
     return gst.element_make_from_uri(gst.URI_SRC, uri, '') is not None
15
 
 
16
 
 def init(librarian):
17
 
-    pipeline = config.get("player", "gst_pipeline") or "gconfaudiosink"
18
 
+    pipeline = config.get("player", "gst_pipeline") or "gconfaudiosink profile=music"
19
 
     gst.debug_set_default_threshold(gst.LEVEL_ERROR)
20
 
     if gst.element_make_from_uri(
21
 
         gst.URI_SRC,