[rygel/wip/dvd: 47/56] WIP

[Jens Georg <jensgeorg src gnome org>]

commit aedafca31a2f742db62563b3c54a7dfa629e591a
Author: Jens Georg <mail jensge org>
Date:   Wed Sep 9 15:38:49 2015 +0200

    WIP

 src/media-engines/gstreamer/rygel-gst-utils.vala   |    2 +-
 src/plugins/media-export/Makefile.am               |    3 ++-
 .../rygel-media-export-dvd-parser.vala             |    5 +----
 .../media-export/rygel-media-export-extract.vala   |    3 ++-
 .../rygel-media-export-info-serializer.vala        |    2 +-
 .../rygel-media-export-item-factory.vala           |    6 ++++++
 6 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/src/media-engines/gstreamer/rygel-gst-utils.vala 
b/src/media-engines/gstreamer/rygel-gst-utils.vala
index 20b7302..9934195 100644
--- a/src/media-engines/gstreamer/rygel-gst-utils.vala
+++ b/src/media-engines/gstreamer/rygel-gst-utils.vala
@@ -70,7 +70,7 @@ internal abstract class Rygel.GstUtils {
             }
 
             if (src.get_class ().find_property ("tcp-timeout") != null) {
-                // For rtspsrc since some RTSP sources takes a while to start
+   // For rtspsrc since some RTSP sources takes a while to start
                 // transmitting
                 src.tcp_timeout = (int64) 60000000;
             }
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 37c720e..101e4cc 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -59,7 +59,8 @@ librygel_media_export_la_SOURCES = \
        rygel-media-export-photo-item.vala \
        rygel-media-export-playlist-item.vala \
        rygel-media-export-trackable-db-container.vala \
-       rygel-media-export-updatable-object.vala
+       rygel-media-export-updatable-object.vala \
+       rygel-media-export-dvd-container.vala
 
 librygel_media_export_la_VALAFLAGS = \
        --enable-experimental \
diff --git a/src/plugins/media-export/rygel-media-export-dvd-parser.vala 
b/src/plugins/media-export/rygel-media-export-dvd-parser.vala
index 522c9cd..76f8ec8 100644
--- a/src/plugins/media-export/rygel-media-export-dvd-parser.vala
+++ b/src/plugins/media-export/rygel-media-export-dvd-parser.vala
@@ -48,10 +48,7 @@ internal class Rygel.DVDParser : GLib.Object {
     }
 
     public async void run () throws Error {
-        var doc = yield this.get_information ();
-        if (doc != null) {
-            doc->children;
-        }
+        yield this.get_information ();
     }
 
     public async Xml.Doc* get_information () throws Error {
diff --git a/src/plugins/media-export/rygel-media-export-extract.vala 
b/src/plugins/media-export/rygel-media-export-extract.vala
index 0410bac..5964d99 100644
--- a/src/plugins/media-export/rygel-media-export-extract.vala
+++ b/src/plugins/media-export/rygel-media-export-extract.vala
@@ -33,7 +33,8 @@ const string UPNP_CLASS_PHOTO = "object.item.imageItem.photo";
 const string UPNP_CLASS_MUSIC = "object.item.audioItem.musicTrack";
 const string UPNP_CLASS_VIDEO = "object.item.videoItem";
 const string UPNP_CLASS_PLAYLIST = "object.item.playlistItem";
-const string UPNP_CLASS_PLAYLIST_CONTAINER = "object.container.playlistContainer";
+const string UPNP_CLASS_PLAYLIST_CONTAINER_DVD =
+                                      "object.container.playlistContainer.DVD";
 
 const string STATUS_LINE_TEMPLATE = "RESULT|%s|%" + size_t.FORMAT + "|%s\n";
 const string ERROR_LINE_TEMPLATE = "ERROR|%s|%d|%s\n";
diff --git a/src/plugins/media-export/rygel-media-export-info-serializer.vala 
b/src/plugins/media-export/rygel-media-export-info-serializer.vala
index b24a556..c8cb786 100644
--- a/src/plugins/media-export/rygel-media-export-info-serializer.vala
+++ b/src/plugins/media-export/rygel-media-export-info-serializer.vala
@@ -88,7 +88,7 @@ internal class Rygel.InfoSerializer : GLib.Object {
             } else if (mime.has_suffix ("/xml")) { // application/xml or text/xml
                 upnp_class = UPNP_CLASS_PLAYLIST;
             } else if (mime == "application/x-cd-image") {
-                upnp_class = UPNP_CLASS_PLAYLIST_CONTAINER;
+                upnp_class = UPNP_CLASS_PLAYLIST_CONTAINER_DVD;
             } else {
                 debug ("Unsupported content-type %s, skipping %s…",
                        mime,
diff --git a/src/plugins/media-export/rygel-media-export-item-factory.vala 
b/src/plugins/media-export/rygel-media-export-item-factory.vala
index 0939787..4da3e16 100644
--- a/src/plugins/media-export/rygel-media-export-item-factory.vala
+++ b/src/plugins/media-export/rygel-media-export-item-factory.vala
@@ -151,6 +151,8 @@ namespace Rygel.MediaExport.ItemFactory {
         }
 
         MediaFileItem item = null;
+        warning ("upnp_class.get_string () ==================== %s",
+                upnp_class.get_string ());
         switch (upnp_class.get_string ()) {
             case Rygel.PhotoItem.UPNP_CLASS:
                 item = new PhotoItem (id, parent, "");
@@ -164,6 +166,10 @@ namespace Rygel.MediaExport.ItemFactory {
             case Rygel.PlaylistItem.UPNP_CLASS:
                 item = ItemFactory.create_playlist_item (file, parent, "");
                 break;
+            case Rygel.MediaContainer.PLAYLIST + ".DVD":
+                warning ("=> Fkjdhkdsjhfkjdshdskjf ");
+                return null;
+                break;
             default:
                 return null;
         }