[rygel] media-export: Move extractor to harvester

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 7040b30ac3a1a38036db27bf8be1b4abdf0e3a98
Author: Jens Georg <mail jensge org>
Date:   Fri Aug 13 23:17:41 2010 +0300

    media-export: Move extractor to harvester

 .../media-export/rygel-media-export-harvester.vala |    9 ++-------
 .../rygel-media-export-root-container.vala         |    4 +---
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-harvester.vala b/src/plugins/media-export/rygel-media-export-harvester.vala
index e775710..62c540c 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -31,14 +31,9 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
 
     /**
      * Create a new instance of the meta-data extraction manager.
-     *
-     * @param extractor instance of MetadataExtractor used for meta-data
-     *                  extraction by this task
-     * @param monitor intance of a RecursiveFileMonitor which is used to keep
-     *                track of the file changes
      */
-    public Harvester (MetadataExtractor extractor) {
-        this.extractor = extractor;
+    public Harvester () {
+        this.extractor = new MetadataExtractor ();
         this.monitor = new RecursiveFileMonitor (null);
         if (this.monitor != null) {
             this.monitor.changed.connect (this.on_file_changed);
diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala
index 4b50150..0920a4b 100644
--- a/src/plugins/media-export/rygel-media-export-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-root-container.vala
@@ -25,7 +25,6 @@ using GUPnP;
  * Represents the root container.
  */
 public class Rygel.MediaExport.RootContainer : Rygel.MediaExport.DBContainer {
-    private MetadataExtractor extractor;
     private DBusService service;
     private Harvester harvester;
 
@@ -264,8 +263,7 @@ public class Rygel.MediaExport.RootContainer : Rygel.MediaExport.DBContainer {
 
         base (db, "0", "MediaExportRoot");
 
-        this.extractor = new MetadataExtractor ();
-        this.harvester = new Harvester (this.extractor);
+        this.harvester = new Harvester ();
 
         try {
             this.service = new DBusService (this);