[rygel/wip/new-gupnp-dlna: 18/18] WIP



commit c56cd2dcab9e90c7d292f66825000c5443aa62b9
Author: Jens Georg <jensg openismus com>
Date:   Tue Dec 18 14:55:21 2012 +0100

    WIP

 .../rygel-media-export-metadata-extractor.vala     |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
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 1a0d6c5..14f5e46 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -47,7 +47,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
     public signal void error (File file, Error err);
 
     private Discoverer discoverer;
-    private ProfileGuesser guesser;
+    //private ProfileGuesser guesser;
 
     /**
      * We export a GLib.File-based API but GstDiscoverer works with URIs, so
@@ -81,7 +81,6 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
                 this.discoverer.discovered.connect (on_done);
                 this.discoverer.start ();
                 this.discoverer.discover_uri_async (uri);
-                this.guesser = new GUPnPDLNA.ProfileGuesser (true, true);
             } catch (Error error) {
                 this.on_done (null, error);
             }
@@ -91,7 +90,6 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
     }
 
     private void on_done (DiscovererInfo? info, GLib.Error err) {
-        this.discoverer = null;
         var file = this.file_hash.get (info.get_uri ());
         if (file == null) {
             warning ("File %s already handled, ignoring event",
@@ -117,21 +115,28 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
             return;
         }
 
+/*        this.guesser = new GUPnPDLNA.ProfileGuesser (true, true);
         this.guesser.done.connect ((uri, dlna, error)  => {
+            this.guesser = null;
             if (error != null) {
                 this.error (file, err);
 
                 return;
-            }
+            } */
+
+        Idle.add ( () => {
+            this.discoverer = null;
+            this.extract_basic_information (file, info, null);
 
-            this.extract_basic_information (file, info, dlna);
+            return false;
         });
+/*        });
         try {
             this.guesser.guess_profile_async (info.get_uri (),
                                               this.timeout * 1000);
         } catch (Error error) {
             warning ("Failed to guess DLNA profile: %s", error.message);
-        }
+        } */
     }
 
     private void extract_basic_information



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