build,media-export: Require & adapt to gupnp-dlna 0.5

diff --git a/configure.ac b/configure.ac
index 54bc2a3..d95cc3e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_FUNC_MMAP
 VALA_REQUIRED=0.11.2
 GUPNP_REQUIRED=0.13.4
 GUPNP_AV_REQUIRED=0.7.0
-GUPNP_DLNA_REQUIRED=0.3.0
+GUPNP_DLNA_REQUIRED=0.5.0
 GUPNP_VALA_REQUIRED=0.7.0
 GSTREAMER_REQUIRED=0.10.23
 GSTREAMER_TAG_REQUIRED=0.10.28
@@ -88,7 +88,7 @@ if test x$enable_vala = xyes ; then
                          gupnp-av-1.0
                          gupnp-dlna-1.0
                          gstreamer-0.10
-                         gstreamer-discoverer-gupnp-dlna-0.10
+                         gstreamer-pbutils-0.10
                          gio-2.0
                          gee-1.0
                          posix])

diff --git a/src/plugins/media-export/rygel-media-export-item.vala b/src/plugins/media-export/rygel-media-export-item.vala
index 77cf642..fb5aad8 100644 (file)
--- a/src/plugins/media-export/rygel-media-export-item.vala
+++ b/src/plugins/media-export/rygel-media-export-item.vala
@@ -60,49 +60,37 @@ namespace Rygel.MediaExport.ItemFactory {
                                                uint64                mtime) {
         MediaItem item;
         string id = MediaCache.get_id (file);
-        unowned StreamAudioInformation audio_info = null;
-        unowned StreamVideoInformation video_info = null;
+        GLib.List<DiscovererAudioInfo> audio_streams;
+        GLib.List<DiscovererVideoInfo> video_streams;
 
-        foreach (unowned StreamInformation stream_info in
-                 dlna_info.info.stream_list) {
-            if (audio_info == null &&
-                stream_info.streamtype == Gst.StreamType.AUDIO) {
-                audio_info = (StreamAudioInformation) stream_info;
-            } else if (video_info == null &&
-                       (stream_info.streamtype == Gst.StreamType.VIDEO ||
-                        stream_info.streamtype == Gst.StreamType.IMAGE)) {
-                video_info = (StreamVideoInformation) stream_info;
-            }
-        }
+        audio_streams = dlna_info.info.get_audio_streams ();
+        video_streams = dlna_info.info.get_video_streams ();
 
-        if (video_info != null) {
-            if (audio_info == null &&
-                video_info.streamtype == Gst.StreamType.IMAGE) {
-                item = new PhotoItem (id, parent, "");
-                return fill_photo_item (item as PhotoItem,
-                                        file,
-                                        dlna_info,
-                                        video_info,
-                                        mime,
-                                        size,
-                                        mtime);
-            } else {
-                item = new VideoItem (id, parent, "");
-                return fill_video_item (item as VideoItem,
-                                      file,
-                                      dlna_info,
-                                      video_info,
-                                      audio_info,
-                                      mime,
-                                      size,
-                                      mtime);
-            }
-        } else if (audio_info != null) {
+        if (audio_streams == null && video_streams.data.is_image()) {
+            item = new PhotoItem (id, parent, "");
+            return fill_photo_item (item as PhotoItem,
+                                    file,
+                                    dlna_info,
+                                    video_streams.data,
+                                    mime,
+                                    size,
+                                    mtime);
+        } else if (audio_streams != null && video_streams != null) {
+            item = new VideoItem (id, parent, "");
+            return fill_video_item (item as VideoItem,
+                                    file,
+                                    dlna_info,
+                                    video_streams.data,
+                                    audio_streams.data,
+                                    mime,
+                                    size,
+                                    mtime);
+        } else if (audio_streams != null) {
             item = new MusicItem (id, parent, "");
             return fill_music_item (item as MusicItem,
                                     file,
                                     dlna_info,
-                                    audio_info,
+                                    audio_streams.data,
                                     mime,
                                     size,
                                     mtime);
@@ -111,97 +99,75 @@ namespace Rygel.MediaExport.ItemFactory {
         }
     }
 
-    private static void fill_audio_item (AudioItem               item,
-                                         DLNAInformation         dlna_info,
-                                         StreamAudioInformation? audio_info) {
-        if (dlna_info.info.duration > 0) {
-            item.duration = dlna_info.info.duration / Gst.SECOND;
+    private static void fill_audio_item (AudioItem            item,
+                                         DLNAInformation      dlna_info,
+                                         DiscovererAudioInfo? audio_info) {
+        if (dlna_info.info.get_duration () > 0) {
+            item.duration = dlna_info.info.get_duration () / Gst.SECOND;
         } else {
             item.duration = -1;
         }
 
-
-         if (audio_info != null) {
-            if (audio_info.tags != null) {
-                 uint tmp;
-                audio_info.tags.get_uint (TAG_BITRATE, out tmp);
+        if (audio_info != null) {
+            if (audio_info.get_tags () != null) {
+                uint tmp;
+                audio_info.get_tags ().get_uint (TAG_BITRATE, out tmp);
                 item.bitrate = (int) tmp / 8;
             }
-            item.channels = (int) audio_info.channels;
-            item.sample_freq = (int) audio_info.sample_rate;
+            item.channels = (int) audio_info.get_channels ();
+            item.sample_freq = (int) audio_info.get_sample_rate ();
         }
     }
 
 
-    private static MediaItem fill_video_item (VideoItem               item,
-                                       File                    file,
-                                       DLNAInformation         dlna_info,
-                                       StreamVideoInformation  video_info,
-                                       StreamAudioInformation? audio_info,
-                                       string                  mime,
-                                       uint64                  size,
-                                       uint64                  mtime) {
+    private static MediaItem fill_video_item (VideoItem            item,
+                                                File                 file,
+                                              DLNAInformation      dlna_info,
+                                              DiscovererVideoInfo  video_info,
+                                              DiscovererAudioInfo? audio_info,
+                                              string               mime,
+                                              uint64               size,
+                                              uint64               mtime) {
         fill_audio_item (item as AudioItem, dlna_info, audio_info);
         fill_media_item (item, file, dlna_info, mime, size, mtime);
 
-        item.width = (int) video_info.width;
-        item.height = (int) video_info.height;
-        item.color_depth = (int) video_info.depth;
-
-        if (audio_info != null) {
-            item.channels = (int) audio_info.channels;
-            item.sample_freq = (int) audio_info.sample_rate;
-            if (audio_info.tags != null) {
-                uint tmp;
-
-                audio_info.tags.get_uint (TAG_BITRATE, out tmp);
-                item.bitrate = (int) tmp / 8;
-            }
-        }
+        item.width = (int) video_info.get_width ();
+        item.height = (int) video_info.get_height ();
+        item.color_depth = (int) video_info.get_depth ();
 
         return item;
     }
 
-    private static MediaItem fill_photo_item (PhotoItem              item,
-                                       File                   file,
-                                       DLNAInformation        dlna_info,
-                                       StreamVideoInformation video_info,
-                                       string                 mime,
-                                       uint64                 size,
-                                       uint64                 mtime) {
-        fill_media_item (item,
-                         file,
-                         dlna_info,
-                         mime,
-                         size,
-                         mtime);
+    private static MediaItem fill_photo_item (PhotoItem           item,
+                                              File                file,
+                                              DLNAInformation     dlna_info,
+                                              DiscovererVideoInfo video_info,
+                                              string              mime,
+                                              uint64              size,
+                                              uint64              mtime) {
+        fill_media_item (item, file, dlna_info, mime, size, mtime);
 
-        item.width = (int) video_info.width;
-        item.height = (int) video_info.height;
-        item.color_depth = (int) video_info.depth;
+        item.width = (int) video_info.get_width ();
+        item.height = (int) video_info.get_height ();
+        item.color_depth = (int) video_info.get_depth ();
 
         return item;
     }
 
-    private static MediaItem fill_music_item (MusicItem              item,
-                                       File                   file,
-                                       DLNAInformation        dlna_info,
-                                       StreamAudioInformation? audio_info,
-                                       string                 mime,
-                                       uint64                 size,
-                                       uint64                 mtime) {
+    private static MediaItem fill_music_item (MusicItem            item,
+                                              File                 file,
+                                              DLNAInformation      dlna_info,
+                                              DiscovererAudioInfo? audio_info,
+                                              string               mime,
+                                              uint64               size,
+                                              uint64               mtime) {
         fill_audio_item (item as AudioItem, dlna_info, audio_info);
-        fill_media_item (item,
-                         file,
-                         dlna_info,
-                         mime,
-                         size,
-                         mtime);
+        fill_media_item (item, file, dlna_info, mime, size, mtime);
 
         if (audio_info != null) {
-            if (audio_info.tags != null) {
+            if (audio_info.get_tags () != null) {
                 unowned Gst.Buffer buffer;
-                audio_info.tags.get_buffer (TAG_IMAGE, out buffer);
+                audio_info.get_tags ().get_buffer (TAG_IMAGE, out buffer);
                 if (buffer != null) {
                     var structure = buffer.caps.get_structure (0);
                     int image_type;
@@ -225,12 +191,12 @@ namespace Rygel.MediaExport.ItemFactory {
                     }
                 }
             }
-            dlna_info.info.tags.get_string (TAG_ARTIST, out item.artist);
-            dlna_info.info.tags.get_string (TAG_ALBUM, out item.album);
-            dlna_info.info.tags.get_string (TAG_GENRE, out item.genre);
+            dlna_info.info.get_tags ().get_string (TAG_ARTIST, out item.artist);
+            dlna_info.info.get_tags ().get_string (TAG_ALBUM, out item.album);
+            dlna_info.info.get_tags ().get_string (TAG_GENRE, out item.genre);
 
             uint tmp;
-            dlna_info.info.tags.get_uint (TAG_TRACK_NUMBER, out tmp);
+            dlna_info.info.get_tags() .get_uint (TAG_TRACK_NUMBER, out tmp);
             item.track_number = (int) tmp;
         }
 
@@ -238,23 +204,23 @@ namespace Rygel.MediaExport.ItemFactory {
     }
 
     private static void fill_media_item (MediaItem       item,
-                                       File                   file,
+                                  File                   file,
                                   DLNAInformation dlna_info,
                                   string           mime,
                                   uint64           size,
                                   uint64           mtime) {
         string title = null;
 
-        if (dlna_info.info.tags == null ||
-            !dlna_info.info.tags.get_string (TAG_TITLE, out title)) {
+        if (dlna_info.info.get_tags () == null ||
+            !dlna_info.info.get_tags ().get_string (TAG_TITLE, out title)) {
             title = file.get_basename ();
         }
 
         item.title = title;
 
-        if (dlna_info.info.tags != null) {
+        if (dlna_info.info.get_tags () != null) {
             GLib.Date? date;
-            if (dlna_info.info.tags.get_date (TAG_DATE, out date)) {
+            if (dlna_info.info.get_tags ().get_date (TAG_DATE, out date)) {
                 char[] datestr = new char[30];
                 date.strftime (datestr, "%F");
                 item.date = (string) datestr;

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 92a3c1d..991d990 100644 (file)
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -96,18 +96,19 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
 
     private void on_done (GUPnP.DLNAInformation dlna,
                           GLib.Error            err) {
-        assert (this.file_hash.has_key (dlna.info.uri));
+        assert (this.file_hash.has_key (dlna.info.get_uri ()));
 
-        var file = this.file_hash.get (dlna.info.uri);
+        var file = this.file_hash.get (dlna.info.get_uri ());
 
-        this.file_hash.unset (dlna.info.uri);
+        this.file_hash.unset (dlna.info.get_uri ());
 
-        if ((dlna.info.result & Gst.DiscovererResult.TIMEOUT) != 0) {
+        if ((dlna.info.get_result () & Gst.DiscovererResult.TIMEOUT) != 0) {
             debug ("Extraction timed out on %s", file.get_uri ());
 
             // set dlna to null to extract basic file information
             dlna = null;
-        } else if ((dlna.info.result & Gst.DiscovererResult.ERROR) != 0) {
+        } else if ((dlna.info.get_result () &
+                    Gst.DiscovererResult.ERROR) != 0) {
             this.error (file, err);
 
             return;