[SCM] morituri/master: * morituri/common/encode.py: Collect all tags by replacing from newer tag messages. Gets more than bitrate from flacs now.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 90bb3a7371518c42ff76e49aef9f4964ad2b1e8e
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Thu Dec 6 17:18:32 2012 +0000

    	* morituri/common/encode.py:
    	  Collect all tags by replacing from newer tag messages.
    	  Gets more than bitrate from flacs now.

diff --git a/ChangeLog b/ChangeLog
index 7ec0402..02a046b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-12-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/encode.py:
+	  Collect all tags by replacing from newer tag messages.
+	  Gets more than bitrate from flacs now.
+
+2012-12-06  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/rip/debug.py:
 	  Add rip debug tag to debug reading tags.
 
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index 5b0967a..fe29bf2 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -331,7 +331,12 @@ class TagReadTask(ctask.GstPipelineTask):
 
     def bus_tag_cb(self, bus, message):
         taglist = message.parse_tag()
-        self.taglist = taglist
+        self.debug('tag_cb, %d tags' % len(taglist.keys()))
+        if not self.taglist:
+            self.taglist = taglist
+        else:
+            import gst
+            self.taglist = self.taglist.merge(taglist, gst.TAG_MERGE_REPLACE)
 
 
 class TagWriteTask(ctask.LoggableTask):

-- 
morituri packaging