packages: pykaraoke/pykaraoke-mid_charset.patch - updated for 0.7.1

[lisu]

Author: lisu                         Date: Thu Aug 27 14:20:08 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.7.1

---- Files affected:
packages/pykaraoke:
   pykaraoke-mid_charset.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/pykaraoke/pykaraoke-mid_charset.patch
diff -u packages/pykaraoke/pykaraoke-mid_charset.patch:1.1 packages/pykaraoke/pykaraoke-mid_charset.patch:1.2
--- packages/pykaraoke/pykaraoke-mid_charset.patch:1.1	Fri Sep 29 21:59:08 2006
+++ packages/pykaraoke/pykaraoke-mid_charset.patch	Thu Aug 27 16:20:03 2009
@@ -1,14 +1,13 @@
-diff -dur -x '*~' pykaraoke-0.5.orig/pykdb.py pykaraoke-0.5/pykdb.py
---- pykaraoke-0.5.orig/pykdb.py	2006-07-11 20:59:15.000000000 +0200
-+++ pykaraoke-0.5/pykdb.py	2006-09-29 21:51:09.000000000 +0200
-@@ -166,7 +166,9 @@
-         if ext.lower() == ".cdg":
-             constructor = player = pycdg.cdgPlayer
-         elif (ext.lower() == ".kar") or (ext.lower() == ".mid"):
--            constructor = player = pykar.midPlayer
-+            def midPlayerFactory(song, errorNotifyCallback, doneCallback):
-+                return pykar.midPlayer(song, errorNotifyCallback, doneCallback, Charset = globalSongDB.Settings.DefaultCharset)
-+            constructor = player = midPlayerFactory
-         elif (ext.lower() == ".mpg") or (ext.lower() == ".mpeg"):
-             constructor = player = pympg.mpgPlayer
-         # TODO basic mp3/ogg player
+--- pykaraoke-0.7.1/pykdb.py~	2009-08-26 20:41:44.000000000 +0200
++++ pykaraoke-0.7.1/pykdb.py	2009-08-27 16:11:59.000000000 +0200
+@@ -340,7 +340,9 @@
+         if self.Type == self.T_CDG:
+             constructor = pycdg.cdgPlayer
+         elif self.Type == self.T_KAR:
+-            constructor = pykar.midPlayer
++	    def midPlayerFactory(song, errorNotifyCallback, doneCallback):
++		return pykar.midPlayer(song, errorNotifyCallback, doneCallback, Charset = globalSongDB.Settings.DefaultCharset)
++	    constructor = midPlayerFactory	
+         elif self.Type == self.T_MPG:
+             if self.MpgType == 'mpg' and settings.MpgNative and pympg.movie:
+                 # Mpg files can be played internally.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pykaraoke/pykaraoke-mid_charset.patch?r1=1.1&r2=1.2&f=u