Changeset 2113

Timestamp:

2006-02-27 23:46:33 (3 years ago)

Author:

scott

Message:

Fixed incompatibilities with the merged annodex plugins in gstreamer.

Files:

• annoamp/trunk/annoamp.py (modified) (2 diffs)
• annoamp/trunk/anxplayer.py (modified) (5 diffs)

annoamp/trunk/annoamp.py

@@ -157 +157 @@
-    else:
-        tree_selection.select_path(playlist.get_path(playlist.iter_nth_child(playlist.iter_nth_child(None,current),chapter)))
-
+ription
-        if desc != None:
-
+ription
-        else:
-            xml.get_widget("description").set_text("No Description")
@@ -167 +167 @@
-        else:
-            xml.get_widget("link").set_label('No Link.')
-src
+uri
-        if img_src != None:
-            try:

annoamp/trunk/anxplayer.py

@@ -1 +1 @@
-#!/usr/bin/env python
-
-
+-2006
+     
-#
-#This program is free software; you can redistribute it and/or
@@ -98 +98 @@
-
-    def bus_call (self, bus, message):
-#
+
-        if message.type == gst.MESSAGE_TAG:
-            self.debug("Tag!")
@@ -158 +158 @@
-                if message.type == gst.MESSAGE_EOS:
-                    #song is over
+                    self.debug("We've come to the end of a file.")
-                    self.chapter_info_list[self.file_to_index_map[filename]] = chapter_info
-                    self.add_file_callback(filename, playlist_info)
@@ -176 +177 @@
-                            pass
-                        elif type(tag).__name__ == '__main__.GstCmmlTagClip':
-                            #FIXME remove 1000000s gst.SECOND should be enough.
-                            playlist_str = format_time(int(tag.props.start_time/gst.SECOND))
-
-
+ription
+ription
-                            else:
-                                playlist_str += " - " + tag.props.id
@@ -193 +193 @@
-            result = fake.set_state(gst.STATE_PLAYING)
-        else:
+            self.chapter_info_list.append([])
-            self.add_file_callback(filename, [])
-            return