[rygel] Differentiate between modules and plugins

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 979f081fcabba32f7549beb4118db1a12087ffb7
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sun May 10 22:32:25 2009 +0300

    Differentiate between modules and plugins
    
    Now that modules can load (multiple) plugins dynamically, we really need
    to start differentiating between modules and plugins. Most of this
    differentiation needs to be only exposed to PluginLoader, rest of the code
    just deals with plugins mostly. Another implication is the change in module
    interface: function that each module needs to provide is "module_init" rather
    than "load_plugin" now.
---
 src/plugins/dvb/rygel-dvb-plugin.vala             |    2 +-
 src/plugins/external/rygel-external-plugin.vala   |    2 +-
 src/plugins/folder/rygel-folder-plugin.vala       |    2 +-
 src/plugins/mediathek/rygel-mediathek-plugin.vala |    2 +-
 src/plugins/test/rygel-test-plugin.vala           |    2 +-
 src/plugins/tracker/rygel-tracker-plugin.vala     |    2 +-
 src/rygel/rygel-plugin-loader.vala                |   28 ++++++++++----------
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/plugins/dvb/rygel-dvb-plugin.vala b/src/plugins/dvb/rygel-dvb-plugin.vala
index 6220c0e..bc24c8d 100644
--- a/src/plugins/dvb/rygel-dvb-plugin.vala
+++ b/src/plugins/dvb/rygel-dvb-plugin.vala
@@ -29,7 +29,7 @@ using Gee;
 using CStuff;
 
 [ModuleInit]
-public void load_plugin (PluginLoader loader) {
+public void module_init (PluginLoader loader) {
     Plugin plugin = new Plugin ("DVB", "Digital TV");
 
     // We only implement a ContentDirectory service
diff --git a/src/plugins/external/rygel-external-plugin.vala b/src/plugins/external/rygel-external-plugin.vala
index e90a1e2..f5d9ac4 100644
--- a/src/plugins/external/rygel-external-plugin.vala
+++ b/src/plugins/external/rygel-external-plugin.vala
@@ -35,7 +35,7 @@ private const string OBJECT_IFACE = "org.Rygel.MediaObject1";
 private const string SERVICE_PREFIX = "org.Rygel.MediaServer1.";
 
 [ModuleInit]
-public void load_plugin (PluginLoader loader) {
+public void module_init (PluginLoader loader) {
     try {
         DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
 
diff --git a/src/plugins/folder/rygel-folder-plugin.vala b/src/plugins/folder/rygel-folder-plugin.vala
index d11a75d..0c871bf 100644
--- a/src/plugins/folder/rygel-folder-plugin.vala
+++ b/src/plugins/folder/rygel-folder-plugin.vala
@@ -35,7 +35,7 @@ using GLib;
  * * no monitoring
  */
 [ModuleInit]
-public void load_plugin (PluginLoader loader) {
+public void module_init (PluginLoader loader) {
     Plugin plugin = new Plugin ("Folder", "%n's media");
 
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
diff --git a/src/plugins/mediathek/rygel-mediathek-plugin.vala b/src/plugins/mediathek/rygel-mediathek-plugin.vala
index d989876..73b33cc 100644
--- a/src/plugins/mediathek/rygel-mediathek-plugin.vala
+++ b/src/plugins/mediathek/rygel-mediathek-plugin.vala
@@ -24,7 +24,7 @@ using Rygel;
 using GUPnP;
 
 [ModuleInit]
-public void load_plugin (PluginLoader loader) {
+public void module_init (PluginLoader loader) {
     Plugin plugin = new Plugin ("ZDFMediathek", "ZDF Mediathek");
 
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
diff --git a/src/plugins/test/rygel-test-plugin.vala b/src/plugins/test/rygel-test-plugin.vala
index f79dcc6..6b17f52 100644
--- a/src/plugins/test/rygel-test-plugin.vala
+++ b/src/plugins/test/rygel-test-plugin.vala
@@ -27,7 +27,7 @@ using Gee;
 using CStuff;
 
 [ModuleInit]
-public void load_plugin (PluginLoader loader) {
+public void module_init (PluginLoader loader) {
     Plugin plugin = new Plugin ("Test", "Test Streams");
 
     // We only implement a ContentDirectory service
diff --git a/src/plugins/tracker/rygel-tracker-plugin.vala b/src/plugins/tracker/rygel-tracker-plugin.vala
index c818a2e..d563598 100644
--- a/src/plugins/tracker/rygel-tracker-plugin.vala
+++ b/src/plugins/tracker/rygel-tracker-plugin.vala
@@ -25,7 +25,7 @@ using Gee;
 using CStuff;
 
 [ModuleInit]
-public void load_plugin (PluginLoader loader) {
+public void module_init (PluginLoader loader) {
     Plugin plugin = new Plugin ("Tracker", "%n's media");
 
     // We only implement a ContentDirectory service
diff --git a/src/rygel/rygel-plugin-loader.vala b/src/rygel/rygel-plugin-loader.vala
index 065363c..ca2a3df 100644
--- a/src/rygel/rygel-plugin-loader.vala
+++ b/src/rygel/rygel-plugin-loader.vala
@@ -31,7 +31,7 @@ using GUPnP;
  * add_plugin method.
  */
 public class Rygel.PluginLoader : Object {
-    private delegate void LoadPluginFunc (PluginLoader loader);
+    private delegate void ModuleInitFunc (PluginLoader loader);
 
     // Signals
     public signal void plugin_available (Plugin plugin);
@@ -43,14 +43,14 @@ public class Rygel.PluginLoader : Object {
         File dir = File.new_for_path (BuildConfig.PLUGIN_DIR);
         assert (dir != null && is_dir (dir));
 
-        this.load_plugins_from_dir (dir);
+        this.load_modules_from_dir (dir);
     }
 
     public void add_plugin (Plugin plugin) {
         this.plugin_available (plugin);
     }
 
-    private void load_plugins_from_dir (File dir) {
+    private void load_modules_from_dir (File dir) {
         string attributes = FILE_ATTRIBUTE_STANDARD_NAME + "," +
                             FILE_ATTRIBUTE_STANDARD_TYPE + "," +
                             FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
@@ -110,29 +110,29 @@ public class Rygel.PluginLoader : Object {
 
             if (file_type == FileType.DIRECTORY) {
                 // Recurse into directories
-                this.load_plugins_from_dir (file);
+                this.load_modules_from_dir (file);
             } else if (mime == "application/x-sharedlib") {
-                // Seems like we found a plugin
-                this.load_plugin_from_file (file_path);
+                // Seems like we found a module
+                this.load_module_from_file (file_path);
             }
         }
     }
 
-    private void load_plugin_from_file (string file_path) {
+    private void load_module_from_file (string file_path) {
         Module module = Module.open (file_path, ModuleFlags.BIND_LOCAL);
         if (module == null) {
-            debug ("Failed to load plugin from path: '%s'\n", file_path);
+            debug ("Failed to load module from path: '%s'\n", file_path);
 
             return;
         }
 
         void* function;
 
-        module.symbol("load_plugin", out function);
+        module.symbol("module_init", out function);
 
-        LoadPluginFunc load_plugin = (LoadPluginFunc) function;
-        if (load_plugin == null) {
-            warning ("Failed to load plugin from path: '%s'\n", file_path);
+        ModuleInitFunc module_init = (ModuleInitFunc) function;
+        if (module_init == null) {
+            warning ("Failed to load module from path: '%s'\n", file_path);
 
             return;
         }
@@ -140,9 +140,9 @@ public class Rygel.PluginLoader : Object {
         // We don't want our modules to ever unload
         module.make_resident ();
 
-        load_plugin (this);
+        module_init (this);
 
-        debug ("Loaded plugin source: '%s'\n", module.name());
+        debug ("Loaded module source: '%s'\n", module.name());
     }
 
     private static bool is_dir (File file) {