GNOME.org
 

[grilo] Rename grl_plugin_registry_get_instance()

commit 5739cb2ea4b434f6a86d9f784583994c82b871dc
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon Jul 19 15:01:51 2010 +0200

    Rename grl_plugin_registry_get_instance()
    
    grl_plugin_registry_get_default() is a more common name.

 bindings/vala/grilo-0.1.vapi              |    2 +-
 bindings/vala/grilo-0.1/grilo-0.1.gi      |    2 +-
 doc/reference/quick-start-using-grilo.xml |    8 ++++----
 src/data/grl-media.c                      |    6 +++---
 src/grilo.c                               |    2 +-
 src/grl-metadata-source.c                 |    4 ++--
 src/grl-multiple.c                        |    2 +-
 src/grl-plugin-registry.c                 |    4 ++--
 src/grl-plugin-registry.h                 |    2 +-
 src/tests/registry.c                      |    4 ++--
 tools/grilo-inspect/grl-inspect.c         |    2 +-
 tools/grilo-test-ui/main.c                |   18 +++++++++---------
 tools/js/testGrilo.js                     |    2 +-
 tools/vala/grilo-test.vala                |    2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/bindings/vala/grilo-0.1.vapi b/bindings/vala/grilo-0.1.vapi
index 567d56a..3734611 100644
--- a/bindings/vala/grilo-0.1.vapi
+++ b/bindings/vala/grilo-0.1.vapi
@@ -251,7 +251,7 @@ namespace Grl {
 	[CCode (cheader_filename = "grilo.h")]
 	public class PluginRegistry : GLib.Object {
 		public void add_config (Grl.Config config);
-		public static unowned Grl.PluginRegistry get_instance ();
+		public static unowned Grl.PluginRegistry get_default ();
 		[CCode (array_length = false)]
 		public unowned Grl.MediaPlugin[] get_sources (bool ranked);
 		public unowned Grl.MediaPlugin get_sources_by_operations (Grl.SupportedOps ops, bool ranked);
diff --git a/bindings/vala/grilo-0.1/grilo-0.1.gi b/bindings/vala/grilo-0.1/grilo-0.1.gi
index 08f1ead..8251025 100644
--- a/bindings/vala/grilo-0.1/grilo-0.1.gi
+++ b/bindings/vala/grilo-0.1/grilo-0.1.gi
@@ -748,7 +748,7 @@
 					<parameter name="config" type="GrlConfig*"/>
 				</parameters>
 			</method>
-			<method name="get_instance" symbol="grl_plugin_registry_get_instance">
+			<method name="get_default" symbol="grl_plugin_registry_get_default">
 				<return-type type="GrlPluginRegistry*"/>
 			</method>
 			<method name="get_sources" symbol="grl_plugin_registry_get_sources">
diff --git a/doc/reference/quick-start-using-grilo.xml b/doc/reference/quick-start-using-grilo.xml
index f98f715..86f354c 100644
--- a/doc/reference/quick-start-using-grilo.xml
+++ b/doc/reference/quick-start-using-grilo.xml
@@ -81,7 +81,7 @@ load_plugins (void)
 {
   GrlPluginRegistry *registry;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
 
   /* These callback will be invoked when media providers
      are loaded/unloaded */
@@ -230,7 +230,7 @@ load_plugins (void)
 {
   GrlPluginRegistry *registry;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   g_signal_connect (registry, "source-added",
 		    G_CALLBACK (source_added_cb), NULL);
   if (!grl_plugin_registry_load_all (registry)) {
@@ -339,7 +339,7 @@ load_plugins (void)
 {
   GrlPluginRegistry *registry;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   g_signal_connect (registry, "source-added",
 		    G_CALLBACK (source_added_cb), NULL);
   if (!grl_plugin_registry_load_all (registry)) {
@@ -541,7 +541,7 @@ static void
 load_plugins (void)
 {
   GrlPluginRegistry *registry;
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   g_signal_connect (registry, "source-added",
 		    G_CALLBACK (source_added_cb), NULL);
   if (!grl_plugin_registry_load_all (registry)) {
diff --git a/src/data/grl-media.c b/src/data/grl-media.c
index 636a503..66d060c 100644
--- a/src/data/grl-media.c
+++ b/src/data/grl-media.c
@@ -163,7 +163,7 @@ grl_media_serialize_extended (GrlMedia *media,
   /* Check serialization type */
   switch (serial_type) {
   case GRL_MEDIA_SERIALIZE_FULL:
-    registry = grl_plugin_registry_get_instance ();
+    registry = grl_plugin_registry_get_default ();
     keylist = grl_plugin_registry_get_metadata_keys (registry);
     serial_media = grl_media_serialize_extended (media,
                                                  GRL_MEDIA_SERIALIZE_PARTIAL,
@@ -201,7 +201,7 @@ grl_media_serialize_extended (GrlMedia *media,
     /* Include all properties */
     if (serial_type == GRL_MEDIA_SERIALIZE_PARTIAL) {
       g_string_append_c (serial, '?');
-      registry = grl_plugin_registry_get_instance ();
+      registry = grl_plugin_registry_get_default ();
 
       va_start (va_serial, serial_type);
       keylist = va_arg (va_serial, GList *);
@@ -329,7 +329,7 @@ grl_media_unserialize (const gchar *serial)
   query = g_match_info_fetch (match_info, 4);
   g_match_info_free (match_info);
   if (query) {
-    registry = grl_plugin_registry_get_instance ();
+    registry = grl_plugin_registry_get_default ();
     query_regex = g_regex_new ("([^=&]+)=([^=&]*)", 0, 0, NULL);
     g_regex_match (query_regex, query, 0, &match_info);
     while (g_match_info_matches (match_info)) {
diff --git a/src/grilo.c b/src/grilo.c
index 1db31c2..9c23cf3 100644
--- a/src/grilo.c
+++ b/src/grilo.c
@@ -60,7 +60,7 @@ grl_init (gint *argc,
   }
 
   /* Register default metadata keys */
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   grl_metadata_key_setup_system_keys (registry);
 
   /* Register GrlMedia in glib typesystem */
diff --git a/src/grl-metadata-source.c b/src/grl-metadata-source.c
index 622d4fd..8a50b45 100644
--- a/src/grl-metadata-source.c
+++ b/src/grl-metadata-source.c
@@ -462,7 +462,7 @@ analyze_keys_to_write (GrlMetadataSource *source,
   }
 
   /* Check if other sources can write the missing keys */
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   source_list =
     grl_plugin_registry_get_sources_by_operations (registry,
                                                    GRL_OP_SET_METADATA,
@@ -923,7 +923,7 @@ grl_metadata_source_setup_full_resolution_mode (GrlMetadataSource *source,
   GList *iter;
   GrlPluginRegistry *registry;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   source_list = grl_plugin_registry_get_sources_by_operations (registry,
                                                                GRL_OP_RESOLVE,
                                                                TRUE);
diff --git a/src/grl-multiple.c b/src/grl-multiple.c
index dffa6a8..39d2ec2 100644
--- a/src/grl-multiple.c
+++ b/src/grl-multiple.c
@@ -476,7 +476,7 @@ grl_multiple_search (const GList *sources,
   /* If no sources have been provided then get the list of all
      searchable sources from the registry */
   if (!sources) {
-    registry = grl_plugin_registry_get_instance ();
+    registry = grl_plugin_registry_get_default ();
     sources_array =
       grl_plugin_registry_get_sources_by_operations (registry,
 						     GRL_OP_SEARCH,
diff --git a/src/grl-plugin-registry.c b/src/grl-plugin-registry.c
index 8278f71..fbfb8a3 100644
--- a/src/grl-plugin-registry.c
+++ b/src/grl-plugin-registry.c
@@ -276,7 +276,7 @@ get_info_from_plugin_xml (const gchar *xml_path)
 /* ================ API ================ */
 
 /**
- * grl_plugin_registry_get_instance:
+ * grl_plugin_registry_get_default:
  *
  * As the registry is designed to work as a singleton, this
  * method is in charge of creating the only instance or
@@ -287,7 +287,7 @@ get_info_from_plugin_xml (const gchar *xml_path)
  * It is NOT MT-safe
  */
 GrlPluginRegistry *
-grl_plugin_registry_get_instance (void)
+grl_plugin_registry_get_default (void)
 {
   static GrlPluginRegistry *registry = NULL;
 
diff --git a/src/grl-plugin-registry.h b/src/grl-plugin-registry.h
index 964d370..bce8cc2 100644
--- a/src/grl-plugin-registry.h
+++ b/src/grl-plugin-registry.h
@@ -182,7 +182,7 @@ G_BEGIN_DECLS
 
 GType grl_plugin_registry_get_type (void);
 
-GrlPluginRegistry *grl_plugin_registry_get_instance (void);
+GrlPluginRegistry *grl_plugin_registry_get_default (void);
 
 void grl_plugin_registry_add_directory (GrlPluginRegistry *registry,
                                         const gchar *path);
diff --git a/src/tests/registry.c b/src/tests/registry.c
index f76f607..09f5a23 100644
--- a/src/tests/registry.c
+++ b/src/tests/registry.c
@@ -51,7 +51,7 @@ registry_init (void)
 {
   GrlPluginRegistry *registry;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   g_assert (registry);
 }
 
@@ -65,7 +65,7 @@ registry_load (void)
   g_test_log_set_fatal_handler (registry_load_error_handler, NULL);
 #endif
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   res = grl_plugin_registry_load_all (registry);
   g_assert_cmpint (res, ==, TRUE);
 }
diff --git a/tools/grilo-inspect/grl-inspect.c b/tools/grilo-inspect/grl-inspect.c
index ae79095..e1e722f 100644
--- a/tools/grilo-inspect/grl-inspect.c
+++ b/tools/grilo-inspect/grl-inspect.c
@@ -192,7 +192,7 @@ main (int argc, char *argv[])
   grl_init (&argc, &argv);
   grl_log_init ("*:-");
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   mainloop = g_main_loop_new (NULL, FALSE);
 
   grl_plugin_registry_load_all (registry);
diff --git a/tools/grilo-test-ui/main.c b/tools/grilo-test-ui/main.c
index 01eaffd..e9f63cd 100644
--- a/tools/grilo-test-ui/main.c
+++ b/tools/grilo-test-ui/main.c
@@ -287,7 +287,7 @@ metadata_keys (void)
   static GList *keys = NULL;
 
   if (!keys) {
-    registry = grl_plugin_registry_get_instance ();
+    registry = grl_plugin_registry_get_default ();
     keys = grl_plugin_registry_get_metadata_keys (registry);
   }
 
@@ -426,7 +426,7 @@ metadata_cb (GrlMediaSource *source,
   }
 
   if (media) {
-    registry = grl_plugin_registry_get_instance ();
+    registry = grl_plugin_registry_get_default ();
     keys = grl_data_get_keys (GRL_DATA (media));
     i = keys;
     while (i) {
@@ -1125,7 +1125,7 @@ query_combo_setup (void)
   gtk_combo_box_set_model (GTK_COMBO_BOX (view->query_combo),
 			   view->query_combo_model);
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   sources = grl_plugin_registry_get_sources_by_operations (registry,
                                                            GRL_OP_QUERY,
                                                            FALSE);
@@ -1161,7 +1161,7 @@ search_combo_setup (void)
   gtk_combo_box_set_model (GTK_COMBO_BOX (view->search_combo),
 			   view->search_combo_model);
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   sources = grl_plugin_registry_get_sources_by_operations (registry,
                                                            GRL_OP_SEARCH,
                                                            FALSE);
@@ -1308,7 +1308,7 @@ set_flickr_config (void)
   GrlPluginRegistry *registry;
   gchar *token;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
 
   config = grl_config_new ("grl-flickr", NULL);
   grl_config_set_api_key (config, FLICKR_KEY);
@@ -1344,7 +1344,7 @@ set_youtube_config (void)
   config = grl_config_new ("grl-youtube", NULL);
   grl_config_set_api_key (config, YOUTUBE_KEY);
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   grl_plugin_registry_add_config (registry, config);
 }
 
@@ -1358,7 +1358,7 @@ set_vimeo_config (void)
   grl_config_set_api_key (config, VIMEO_KEY);
   grl_config_set_api_secret (config, VIMEO_SECRET);
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   grl_plugin_registry_add_config (registry, config);
 }
 
@@ -1593,7 +1593,7 @@ show_plugins ()
   GtkTreeIter iter;
   GrlPluginRegistry *registry;
 
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
 
   clear_panes ();
 
@@ -1707,7 +1707,7 @@ static void
 load_plugins (void)
 {
   GrlPluginRegistry *registry;
-  registry = grl_plugin_registry_get_instance ();
+  registry = grl_plugin_registry_get_default ();
   g_signal_connect (registry, "source-added",
 		    G_CALLBACK (source_added_cb), NULL);
   g_signal_connect (registry, "source-removed",
diff --git a/tools/js/testGrilo.js b/tools/js/testGrilo.js
index 44d1b50..5aaa29f 100644
--- a/tools/js/testGrilo.js
+++ b/tools/js/testGrilo.js
@@ -17,7 +17,7 @@ function SimplePlayList () {
 SimplePlayList.prototype = {
     _init: function () {
         Grl.log_init ("*:-");
-        let registry = Grl.PluginRegistry.get_instance ();
+        let registry = Grl.PluginRegistry.get_default ();
 
         let sources = [];
         this.sources = sources;
diff --git a/tools/vala/grilo-test.vala b/tools/vala/grilo-test.vala
index 59eb585..6e0bc7f 100644
--- a/tools/vala/grilo-test.vala
+++ b/tools/vala/grilo-test.vala
@@ -7,7 +7,7 @@ public class SimplePlaylist : Object {
 
 	construct {
 		Grl.log_init ("*:-");
-		var registry = Grl.PluginRegistry.get_instance ();
+		var registry = Grl.PluginRegistry.get_default ();
 
 		registry.source_added.connect (source_added_cb);
 		registry.source_removed.connect (source_removed_cb);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]