[rygel] media-export: Removed custom tag RYGEL_DURATION



commit ff2442cf378a846e59de9a07ef71754f37c809c6
Author: Jens Georg <mail jensge org>
Date:   Sat May 15 00:03:34 2010 +0200

    media-export: Removed custom tag RYGEL_DURATION

 .../media-export/rygel-media-export-item.vala      |    6 ++----
 .../rygel-media-export-metadata-extractor.vala     |    4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-item.vala b/src/plugins/media-export/rygel-media-export-item.vala
index 6f743dd..decd491 100644
--- a/src/plugins/media-export/rygel-media-export-item.vala
+++ b/src/plugins/media-export/rygel-media-export-item.vala
@@ -30,7 +30,6 @@ using Gst;
 public class Rygel.MediaExport.MediaExportItem : Rygel.MediaItem {
     private const string TAG_WIDTH = MetadataExtractor.TAG_RYGEL_WIDTH;
     private const string TAG_HEIGHT = MetadataExtractor.TAG_RYGEL_HEIGHT;
-    private const string TAG_DURATION = MetadataExtractor.TAG_RYGEL_DURATION;
 
     public static MediaExportItem? create_from_taglist (MediaContainer parent,
                                                   File           file,
@@ -131,9 +130,8 @@ public class Rygel.MediaExport.MediaExportItem : Rygel.MediaItem {
         tag_list.get_int (TAG_HEIGHT, out this.height);
         tag_list.get_int (MetadataExtractor.TAG_RYGEL_DEPTH,
                           out this.color_depth);
-        int64 duration;
-        tag_list.get_int64 (MetadataExtractor.TAG_RYGEL_DURATION,
-                            out duration);
+        uint64 duration;
+        tag_list.get_uint64 (TAG_DURATION, out duration);
         this.duration = (duration == -1) ? -1 : (long) (duration / 1000000000);
 
         tag_list.get_int (MetadataExtractor.TAG_RYGEL_CHANNELS,
diff --git a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
index 9978d12..10c2f52 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -42,7 +42,6 @@ private enum Gst.StreamType {
  */
 public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
     public const string TAG_RYGEL_SIZE = "rygel-size";
-    public const string TAG_RYGEL_DURATION = "rygel-duration";
     public const string TAG_RYGEL_MIME = "rygel-mime";
     public const string TAG_RYGEL_CHANNELS = "rygel-channels";
     public const string TAG_RYGEL_RATE = "rygel-rate";
@@ -127,7 +126,6 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
 
     public MetadataExtractor () {
         this.register_custom_tag (TAG_RYGEL_SIZE, typeof (int64));
-        this.register_custom_tag (TAG_RYGEL_DURATION, typeof (int64));
         this.register_custom_tag (TAG_RYGEL_MIME, typeof (string));
         this.register_custom_tag (TAG_RYGEL_CHANNELS, typeof (int));
         this.register_custom_tag (TAG_RYGEL_RATE, typeof (int));
@@ -335,7 +333,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
         Format format = Format.TIME;
         if (this.playbin.query_duration (ref format, out duration)) {
             this.tag_list.add (TagMergeMode.REPLACE,
-                               TAG_RYGEL_DURATION,
+                               TAG_DURATION,
                                duration);
         }
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]