From b2d4cfd9ef3b3fd3614dba67300fcc8ed56b03e4 Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Thu, 17 Jan 2013 13:40:38 +0100
Subject: [PATCH] media-export: Make some vfuncs protected.

---
 doc/reference/librygel-server/gtkdoc/implementing-server-plugins.xml | 2 +-
 src/plugins/media-export/rygel-media-export-harvesting-task.vala     | 2 +-
 src/plugins/media-export/rygel-media-export-media-cache.vala         | 2 +-
 .../media-export/rygel-media-export-trackable-db-container.vala      | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/reference/librygel-server/gtkdoc/implementing-server-plugins.xml b/doc/reference/librygel-server/gtkdoc/implementing-server-plugins.xml
index bd90bc3..baa3203 100644
--- a/doc/reference/librygel-server/gtkdoc/implementing-server-plugins.xml
+++ b/doc/reference/librygel-server/gtkdoc/implementing-server-plugins.xml
@@ -82,7 +82,7 @@ implemented in Vala.
 
 <para>The <classname>RygelMediaExportPlugin</classname> class, derived from <link linkend="RygelMediaServerPlugin">RygelMediaServerPlugin</link>, simply instantiates its <classname>RygelMediaExportRootContainer</classname> class, derived from <link linkend="RygelMediaContainer">RygelMediaContainer</link>, providing it to the base class as the root container.</para>
 
-<para>The <classname>RygelMediaExportRootContainer</classname> creates an instance of its RygelMediaExportMediaCache, which uses SQLite to maintain a cache of the media files that it finds on the file system.</para>
+<para>The <classname>RygelMediaExportRootContainer</classname> creates an instance of a RygelMediaExportMediaCache class and a RygelMediaExportHarvester class. The harvester finds files on the filesystem, and stores them in the media cache, which uses SQLite to keep trak of them.</para>
 <!-- TODO: Simplify the class hierarchy in the example. -->
 
 </section>
diff --git a/src/plugins/media-export/rygel-media-export-harvesting-task.vala b/src/plugins/media-export/rygel-media-export-harvesting-task.vala
index c3c8c52..91c584b 100644
--- a/src/plugins/media-export/rygel-media-export-harvesting-task.vala
+++ b/src/plugins/media-export/rygel-media-export-harvesting-task.vala
@@ -324,7 +324,7 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine,
 
         if (item != null) {
             item.parent_ref = this.containers.peek_head ();
-            // This is only necessary to generate the poper <objAdd LastChange
+            // This is only necessary to generate the proper <objAdd LastChange
             // entry
             if (entry.known) {
                 (item as UpdatableObject).commit.begin ();
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala b/src/plugins/media-export/rygel-media-export-media-cache.vala
index aeb7615..4a12ae0 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -43,7 +43,7 @@ internal struct Rygel.MediaExport.ExistsCacheEntry {
 }
 
 /**
- * Persistent storage of media objects
+ * Persistent storage of media objects.
  *
  * MediaExportDB is a sqlite3 backed persistent storage of media objects.
  */
diff --git a/src/plugins/media-export/rygel-media-export-trackable-db-container.vala b/src/plugins/media-export/rygel-media-export-trackable-db-container.vala
index b5d705c..f8ca5bf 100644
--- a/src/plugins/media-export/rygel-media-export-trackable-db-container.vala
+++ b/src/plugins/media-export/rygel-media-export-trackable-db-container.vala
@@ -27,7 +27,8 @@ public class Rygel.MediaExport.TrackableDbContainer : TrackableContainer,
         base (id, title);
     }
 
-    public async void add_child (MediaObject object) {
+    // TrackableContainer virtual function implementations:
+    protected async void add_child (MediaObject object) {
         try {
             if (object is MediaItem) {
                 this.media_db.save_item (object as MediaItem);
@@ -41,7 +42,7 @@ public class Rygel.MediaExport.TrackableDbContainer : TrackableContainer,
         }
     }
 
-    public async void remove_child (MediaObject object) {
+    protected async void remove_child (MediaObject object) {
         try {
             this.media_db.remove_object (object);
         } catch (Error error) {
-- 
2.7.4