[grilo-plugins] all: Rename PluginRegistry to Registry
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] all: Rename PluginRegistry to Registry
- Date: Mon, 6 Aug 2012 16:52:21 +0000 (UTC)
commit 83d4c66eafc3e1ebf604c9b90b9e304969f5cb17
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Mon Jul 23 10:28:41 2012 +0000
all: Rename PluginRegistry to Registry
src/media/apple-trailers/grl-apple-trailers.c | 12 +-
src/media/bliptv/grl-bliptv.c | 12 +-
src/media/bookmarks/grl-bookmarks.c | 14 +-
src/media/filesystem/grl-filesystem.c | 12 +-
src/media/flickr/grl-flickr.c | 26 ++--
src/media/jamendo/grl-jamendo.c | 12 +-
src/media/optical-media/grl-optical-media.c | 12 +-
src/media/podcasts/grl-podcasts.c | 10 +-
src/media/shoutcast/grl-shoutcast.c | 12 +-
src/media/tracker/grl-tracker-source-api.c | 20 ++--
src/media/tracker/grl-tracker-source-notif.c | 4 +-
src/media/tracker/grl-tracker-source.c | 14 +-
src/media/tracker/grl-tracker-utils.c | 20 ++--
src/media/tracker/grl-tracker.c | 4 +-
src/media/upnp/grl-upnp.c | 42 ++++----
src/media/vimeo/grl-vimeo.c | 12 +-
src/media/youtube/grl-youtube.c | 12 +-
src/metadata/fake-metadata/grl-fake-metadata.c | 12 +-
src/metadata/gravatar/grl-gravatar.c | 32 +++---
src/metadata/lastfm-albumart/grl-lastfm-albumart.c | 12 +-
src/metadata/local-metadata/grl-local-metadata.c | 12 +-
src/metadata/metadata-store/grl-metadata-store.c | 12 +-
test/main.c | 116 ++++++++++----------
test/test_local_metadata.c | 10 +-
24 files changed, 228 insertions(+), 228 deletions(-)
---
diff --git a/src/media/apple-trailers/grl-apple-trailers.c b/src/media/apple-trailers/grl-apple-trailers.c
index facd0f6..5f82b36 100644
--- a/src/media/apple-trailers/grl-apple-trailers.c
+++ b/src/media/apple-trailers/grl-apple-trailers.c
@@ -82,7 +82,7 @@ struct _GrlAppleTrailersSourcePriv {
static GrlAppleTrailersSource *grl_apple_trailers_source_new (gboolean hd,
gboolean xlarge);
-gboolean grl_apple_trailers_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_apple_trailers_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -100,7 +100,7 @@ static GrlCaps *grl_apple_trailers_source_get_caps (GrlSource *source,
/* =================== Apple Trailers Plugin =============== */
gboolean
-grl_apple_trailers_plugin_init (GrlPluginRegistry *registry,
+grl_apple_trailers_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -139,10 +139,10 @@ grl_apple_trailers_plugin_init (GrlPluginRegistry *registry,
}
source = grl_apple_trailers_source_new (hd, xlarge);
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/media/bliptv/grl-bliptv.c b/src/media/bliptv/grl-bliptv.c
index fb59d09..202c396 100644
--- a/src/media/bliptv/grl-bliptv.c
+++ b/src/media/bliptv/grl-bliptv.c
@@ -87,7 +87,7 @@ static void bliptv_setup_mapping (void);
static GrlBliptvSource *grl_bliptv_source_new (void);
-gboolean grl_bliptv_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_bliptv_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -108,7 +108,7 @@ static void grl_bliptv_source_cancel (GrlSource *source,
/**/
gboolean
-grl_bliptv_plugin_init (GrlPluginRegistry *registry,
+grl_bliptv_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -117,10 +117,10 @@ grl_bliptv_plugin_init (GrlPluginRegistry *registry,
bliptv_setup_mapping ();
GrlBliptvSource *source = grl_bliptv_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/media/bookmarks/grl-bookmarks.c b/src/media/bookmarks/grl-bookmarks.c
index e1f954d..5563563 100644
--- a/src/media/bookmarks/grl-bookmarks.c
+++ b/src/media/bookmarks/grl-bookmarks.c
@@ -186,7 +186,7 @@ static GrlCaps * grl_bookmarks_source_get_caps (GrlSource *source,
/* =================== Bookmarks Plugin =============== */
static gboolean
- grl_bookmarks_plugin_init (GrlPluginRegistry *registry,
+ grl_bookmarks_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -201,13 +201,13 @@ static GrlCaps * grl_bookmarks_source_get_caps (GrlSource *source,
G_TYPE_DATE_TIME,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE),
GRL_BOOKMARKS_KEY_BOOKMARK_TIME =
- grl_plugin_registry_register_metadata_key (registry, spec, NULL);
+ grl_registry_register_metadata_key (registry, spec, NULL);
/* If key was not registered, could be that it is already registered. If so,
check if type is the expected one, and reuse it */
if (GRL_BOOKMARKS_KEY_BOOKMARK_TIME == GRL_METADATA_KEY_INVALID) {
g_param_spec_unref (spec);
GRL_BOOKMARKS_KEY_BOOKMARK_TIME =
- grl_plugin_registry_lookup_metadata_key (registry, "bookmark-date");
+ grl_registry_lookup_metadata_key (registry, "bookmark-date");
if (grl_metadata_key_get_type (GRL_BOOKMARKS_KEY_BOOKMARK_TIME)
!= G_TYPE_DATE_TIME) {
GRL_BOOKMARKS_KEY_BOOKMARK_TIME = GRL_METADATA_KEY_INVALID;
@@ -215,10 +215,10 @@ static GrlCaps * grl_bookmarks_source_get_caps (GrlSource *source,
}
GrlBookmarksSource *source = grl_bookmarks_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/media/filesystem/grl-filesystem.c b/src/media/filesystem/grl-filesystem.c
index 7c69ca1..3ea5d4d 100644
--- a/src/media/filesystem/grl-filesystem.c
+++ b/src/media/filesystem/grl-filesystem.c
@@ -119,7 +119,7 @@ static GrlFilesystemSource *grl_filesystem_source_new (void);
static void grl_filesystem_source_finalize (GObject *object);
-gboolean grl_filesystem_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_filesystem_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -154,7 +154,7 @@ static gboolean grl_filesystem_source_notify_change_stop (GrlSource *source,
/* =================== Filesystem Plugin =============== */
gboolean
-grl_filesystem_plugin_init (GrlPluginRegistry *registry,
+grl_filesystem_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -182,10 +182,10 @@ grl_filesystem_plugin_init (GrlPluginRegistry *registry,
source->priv->chosen_paths = chosen_paths;
source->priv->max_search_depth = max_search_depth;
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/media/flickr/grl-flickr.c b/src/media/flickr/grl-flickr.c
index a95ec0e..44030c2 100644
--- a/src/media/flickr/grl-flickr.c
+++ b/src/media/flickr/grl-flickr.c
@@ -92,7 +92,7 @@ static void grl_flickr_source_personal_new (GrlPlugin *plugin,
static void grl_flickr_source_finalize (GObject *object);
-gboolean grl_flickr_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_flickr_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -114,7 +114,7 @@ static void grl_flickr_source_search (GrlSource *source,
/* =================== Flickr Plugin =============== */
gboolean
-grl_flickr_plugin_init (GrlPluginRegistry *registry,
+grl_flickr_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -153,10 +153,10 @@ grl_flickr_plugin_init (GrlPluginRegistry *registry,
} else {
GrlFlickrSource *source = grl_flickr_source_public_new (flickr_key, flickr_secret);
public_source_created = TRUE;
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
}
if (flickr_key != NULL)
@@ -258,7 +258,7 @@ token_info_cb (GFlickr *f,
{
GrlFlickrSource *source;
GrlPlugin *plugin = (GrlPlugin *) user_data;
- GrlPluginRegistry *registry;
+ GrlRegistry *registry;
gchar *fullname;
gchar *source_desc;
gchar *source_id;
@@ -271,7 +271,7 @@ token_info_cb (GFlickr *f,
return;
}
- registry = grl_plugin_registry_get_default ();
+ registry = grl_registry_get_default ();
username = g_hash_table_lookup (info, "user_username");
fullname = g_hash_table_lookup (info, "user_fullname");
@@ -281,7 +281,7 @@ token_info_cb (GFlickr *f,
source_desc = g_strdup_printf (PERSONAL_SOURCE_DESC, fullname);
/* Check if source is already registered */
- if (grl_plugin_registry_lookup_source (registry, source_id)) {
+ if (grl_registry_lookup_source (registry, source_id)) {
GRL_DEBUG ("A source with id '%s' is already registered. Skipping...",
source_id);
g_object_unref (f);
@@ -293,10 +293,10 @@ token_info_cb (GFlickr *f,
NULL);
source->priv->flickr = f;
source->priv->user_id = g_strdup (g_hash_table_lookup (info, "user_nsid"));
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
}
g_free (source_id);
diff --git a/src/media/jamendo/grl-jamendo.c b/src/media/jamendo/grl-jamendo.c
index d7aab4f..3fe3f93 100644
--- a/src/media/jamendo/grl-jamendo.c
+++ b/src/media/jamendo/grl-jamendo.c
@@ -171,7 +171,7 @@ struct _GrlJamendoSourcePriv {
static GrlJamendoSource *grl_jamendo_source_new (void);
-gboolean grl_jamendo_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_jamendo_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -198,7 +198,7 @@ static void grl_jamendo_source_cancel (GrlSource *source,
/* =================== Jamendo Plugin =============== */
gboolean
-grl_jamendo_plugin_init (GrlPluginRegistry *registry,
+grl_jamendo_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -207,10 +207,10 @@ grl_jamendo_plugin_init (GrlPluginRegistry *registry,
GRL_TRACE ();
GrlJamendoSource *source = grl_jamendo_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/media/optical-media/grl-optical-media.c b/src/media/optical-media/grl-optical-media.c
index 4e0e2af..7727998 100644
--- a/src/media/optical-media/grl-optical-media.c
+++ b/src/media/optical-media/grl-optical-media.c
@@ -65,7 +65,7 @@ static GrlOpticalMediaSource *grl_optical_media_source_new (void);
static void grl_optical_media_source_finalize (GObject *object);
-gboolean grl_optical_media_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_optical_media_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -88,7 +88,7 @@ on_g_volume_monitor_event (GVolumeMonitor *monitor,
/* =================== OpticalMedia Plugin =============== */
gboolean
-grl_optical_media_plugin_init (GrlPluginRegistry *registry,
+grl_optical_media_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -98,10 +98,10 @@ grl_optical_media_plugin_init (GrlPluginRegistry *registry,
GrlOpticalMediaSource *source = grl_optical_media_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/media/podcasts/grl-podcasts.c b/src/media/podcasts/grl-podcasts.c
index 90c203a..b273de3 100644
--- a/src/media/podcasts/grl-podcasts.c
+++ b/src/media/podcasts/grl-podcasts.c
@@ -267,7 +267,7 @@ static gboolean grl_podcasts_source_notify_change_stop (GrlSource *source,
/* =================== Podcasts Plugin =============== */
static gboolean
-grl_podcasts_plugin_init (GrlPluginRegistry *registry,
+grl_podcasts_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -280,10 +280,10 @@ grl_podcasts_plugin_init (GrlPluginRegistry *registry,
GRL_DEBUG ("podcasts_plugin_init");
GrlPodcastsSource *source = grl_podcasts_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
source->priv->cache_time = DEFAULT_CACHE_TIME;
if (!configs || !configs->data) {
diff --git a/src/media/shoutcast/grl-shoutcast.c b/src/media/shoutcast/grl-shoutcast.c
index e502976..bb93114 100644
--- a/src/media/shoutcast/grl-shoutcast.c
+++ b/src/media/shoutcast/grl-shoutcast.c
@@ -94,7 +94,7 @@ typedef struct {
static GrlShoutcastSource *grl_shoutcast_source_new (const gchar *dev_key);
-gboolean grl_shoutcast_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_shoutcast_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -124,7 +124,7 @@ static void grl_shoutcast_source_finalize (GObject *object);
/* =================== SHOUTcast Plugin =============== */
gboolean
-grl_shoutcast_plugin_init (GrlPluginRegistry *registry,
+grl_shoutcast_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -155,10 +155,10 @@ grl_shoutcast_plugin_init (GrlPluginRegistry *registry,
}
source = grl_shoutcast_source_new (dev_key);
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
g_free (dev_key);
diff --git a/src/media/tracker/grl-tracker-source-api.c b/src/media/tracker/grl-tracker-source-api.c
index 9304af2..1c73487 100644
--- a/src/media/tracker/grl-tracker-source-api.c
+++ b/src/media/tracker/grl-tracker-source-api.c
@@ -954,22 +954,22 @@ grl_tracker_source_change_stop (GrlSource *source, GError **error)
void
grl_tracker_source_init_requests (void)
{
- GrlPluginRegistry *registry = grl_plugin_registry_get_default ();
+ GrlRegistry *registry = grl_registry_get_default ();
/* Check if "tracker-category" is registered; if not, the register it */
grl_metadata_key_tracker_category =
- grl_plugin_registry_lookup_metadata_key (registry, "tracker-category");
+ grl_registry_lookup_metadata_key (registry, "tracker-category");
if (grl_metadata_key_tracker_category == GRL_METADATA_KEY_INVALID) {
grl_metadata_key_tracker_category =
- grl_plugin_registry_register_metadata_key (grl_plugin_registry_get_default (),
- g_param_spec_string ("tracker-category",
- "Tracker category",
- "Category a media belongs to",
- NULL,
- G_PARAM_STATIC_STRINGS |
- G_PARAM_READWRITE),
- NULL);
+ grl_registry_register_metadata_key (grl_registry_get_default (),
+ g_param_spec_string ("tracker-category",
+ "Tracker category",
+ "Category a media belongs to",
+ NULL,
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_READWRITE),
+ NULL);
}
grl_tracker_operations = g_hash_table_new (g_direct_hash, g_direct_equal);
diff --git a/src/media/tracker/grl-tracker-source-notif.c b/src/media/tracker/grl-tracker-source-notif.c
index 7a2d32b..1f5a571 100644
--- a/src/media/tracker/grl-tracker-source-notif.c
+++ b/src/media/tracker/grl-tracker-source-notif.c
@@ -290,8 +290,8 @@ tracker_evt_update_orphans (tracker_evt_update_t *evt)
return;
}
- sources = grl_plugin_registry_get_sources (grl_plugin_registry_get_default (),
- FALSE);
+ sources = grl_registry_get_sources (grl_registry_get_default (),
+ FALSE);
request_str = g_string_new ("");
subjects = g_hash_table_get_keys (evt->orphan_items);
diff --git a/src/media/tracker/grl-tracker-source.c b/src/media/tracker/grl-tracker-source.c
index 5a7bfe6..295fe1a 100644
--- a/src/media/tracker/grl-tracker-source.c
+++ b/src/media/tracker/grl-tracker-source.c
@@ -229,10 +229,10 @@ grl_tracker_add_source (GrlTrackerSource *source)
(gpointer) grl_tracker_source_get_tracker_source (source),
source);
priv->state = GRL_TRACKER_SOURCE_STATE_RUNNING;
- grl_plugin_registry_register_source (grl_plugin_registry_get_default (),
- grl_tracker_plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (grl_registry_get_default (),
+ grl_tracker_plugin,
+ GRL_SOURCE (source),
+ NULL);
}
}
@@ -254,9 +254,9 @@ grl_tracker_del_source (GrlTrackerSource *source)
grl_tracker_source_get_tracker_source (source));
grl_tracker_source_cache_del_source (grl_tracker_item_cache, source);
priv->state = GRL_TRACKER_SOURCE_STATE_DELETED;
- grl_plugin_registry_unregister_source (grl_plugin_registry_get_default (),
- GRL_SOURCE (source),
- NULL);
+ grl_registry_unregister_source (grl_registry_get_default (),
+ GRL_SOURCE (source),
+ NULL);
}
}
diff --git a/src/media/tracker/grl-tracker-utils.c b/src/media/tracker/grl-tracker-utils.c
index 8030d8f..9023258 100644
--- a/src/media/tracker/grl-tracker-utils.c
+++ b/src/media/tracker/grl-tracker-utils.c
@@ -146,22 +146,22 @@ insert_key_mapping_with_setter (GrlKeyID grl_key,
void
grl_tracker_setup_key_mappings (void)
{
- GrlPluginRegistry *registry = grl_plugin_registry_get_default ();
+ GrlRegistry *registry = grl_registry_get_default ();
/* Check if "tracker-urn" is registered; if not, then register it */
grl_metadata_key_tracker_urn =
- grl_plugin_registry_lookup_metadata_key (registry, "tracker-urn");
+ grl_registry_lookup_metadata_key (registry, "tracker-urn");
if (grl_metadata_key_tracker_urn == GRL_METADATA_KEY_INVALID) {
grl_metadata_key_tracker_urn =
- grl_plugin_registry_register_metadata_key (grl_plugin_registry_get_default (),
- g_param_spec_string ("tracker-urn",
- "Tracker URN",
- "Universal resource number in Tracker's store",
- NULL,
- G_PARAM_STATIC_STRINGS |
- G_PARAM_READWRITE),
- NULL);
+ grl_registry_register_metadata_key (grl_registry_get_default (),
+ g_param_spec_string ("tracker-urn",
+ "Tracker URN",
+ "Universal resource number in Tracker's store",
+ NULL,
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_READWRITE),
+ NULL);
}
grl_to_sparql_mapping = g_hash_table_new (g_direct_hash, g_direct_equal);
diff --git a/src/media/tracker/grl-tracker.c b/src/media/tracker/grl-tracker.c
index 3e0293a..478426f 100644
--- a/src/media/tracker/grl-tracker.c
+++ b/src/media/tracker/grl-tracker.c
@@ -67,7 +67,7 @@ GRL_LOG_DOMAIN_STATIC(tracker_general_log_domain);
/* --- Other --- */
-gboolean grl_tracker_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_tracker_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -208,7 +208,7 @@ tracker_get_connection_cb (GObject *object,
}
gboolean
-grl_tracker_plugin_init (GrlPluginRegistry *registry,
+grl_tracker_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
diff --git a/src/media/upnp/grl-upnp.c b/src/media/upnp/grl-upnp.c
index c48bada..8f6eeb0 100644
--- a/src/media/upnp/grl-upnp.c
+++ b/src/media/upnp/grl-upnp.c
@@ -98,7 +98,7 @@ static gchar *build_source_id (const gchar *udn);
static GrlUpnpSource *grl_upnp_source_new (const gchar *id, const gchar *name);
-gboolean grl_upnp_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_upnp_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -148,7 +148,7 @@ static GUPnPContextManager *context_manager = NULL;
/* =================== UPnP Plugin =============== */
gboolean
-grl_upnp_plugin_init (GrlPluginRegistry *registry,
+grl_upnp_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -318,7 +318,7 @@ gupnp_search_caps_cb (GUPnPServiceProxy *service,
gchar *name;
GrlUpnpSource *source;
gchar *source_id;
- GrlPluginRegistry *registry;
+ GrlRegistry *registry;
struct SourceInfo *source_info;
gboolean result;
@@ -338,8 +338,8 @@ gupnp_search_caps_cb (GUPnPServiceProxy *service,
name = source_info->source_name;
source_id = source_info->source_id;
- registry = grl_plugin_registry_get_default ();
- if (grl_plugin_registry_lookup_source (registry, source_id)) {
+ registry = grl_registry_get_default ();
+ if (grl_registry_lookup_source (registry, source_id)) {
GRL_DEBUG ("A source with id '%s' is already registered. Skipping...",
source_id);
goto free_resources;
@@ -358,10 +358,10 @@ gupnp_search_caps_cb (GUPnPServiceProxy *service,
GRL_DEBUG ("Setting search disabled for source '%s'", name );
}
- grl_plugin_registry_register_source (registry,
- source_info->plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ source_info->plugin,
+ GRL_SOURCE (source),
+ NULL);
free_resources:
g_free (caps);
@@ -403,7 +403,7 @@ device_available_cb (GUPnPControlPoint *cp,
const gchar* udn;
const char *type;
GUPnPServiceInfo *service;
- GrlPluginRegistry *registry;
+ GrlRegistry *registry;
gchar *source_id;
GRL_DEBUG ("device_available_cb");
@@ -424,9 +424,9 @@ device_available_cb (GUPnPControlPoint *cp,
name = gupnp_device_info_get_friendly_name (GUPNP_DEVICE_INFO (device));
GRL_DEBUG (" name: %s", name);
- registry = grl_plugin_registry_get_default ();
+ registry = grl_registry_get_default ();
source_id = build_source_id (udn);
- if (grl_plugin_registry_lookup_source (registry, source_id)) {
+ if (grl_registry_lookup_source (registry, source_id)) {
GRL_DEBUG ("A source with id '%s' is already registered. Skipping...",
source_id);
g_free (name);
@@ -450,11 +450,11 @@ device_available_cb (GUPnPControlPoint *cp,
GrlUpnpSource *source = grl_upnp_source_new (source_id, name);
GRL_WARNING ("Failed to start GetCapabilitiesSearch action");
GRL_DEBUG ("Setting search disabled for source '%s'", name );
- registry = grl_plugin_registry_get_default ();
- grl_plugin_registry_register_source (registry,
- source_info->plugin,
- GRL_SOURCE (source),
- NULL);
+ registry = grl_registry_get_default ();
+ grl_registry_register_source (registry,
+ source_info->plugin,
+ GRL_SOURCE (source),
+ NULL);
free_source_info (source_info);
}
@@ -470,7 +470,7 @@ device_unavailable_cb (GUPnPControlPoint *cp,
{
const gchar* udn;
GrlSource *source;
- GrlPluginRegistry *registry;
+ GrlRegistry *registry;
gchar *source_id;
GRL_DEBUG ("device_unavailable_cb");
@@ -478,13 +478,13 @@ device_unavailable_cb (GUPnPControlPoint *cp,
udn = gupnp_device_info_get_udn (GUPNP_DEVICE_INFO (device));
GRL_DEBUG (" udn: %s ", udn);
- registry = grl_plugin_registry_get_default ();
+ registry = grl_registry_get_default ();
source_id = build_source_id (udn);
- source = grl_plugin_registry_lookup_source (registry, source_id);
+ source = grl_registry_lookup_source (registry, source_id);
if (!source) {
GRL_DEBUG ("No source registered with id '%s', ignoring", source_id);
} else {
- grl_plugin_registry_unregister_source (registry, source, NULL);
+ grl_registry_unregister_source (registry, source, NULL);
}
g_free (source_id);
diff --git a/src/media/vimeo/grl-vimeo.c b/src/media/vimeo/grl-vimeo.c
index 97ead00..68fd44d 100644
--- a/src/media/vimeo/grl-vimeo.c
+++ b/src/media/vimeo/grl-vimeo.c
@@ -67,7 +67,7 @@ struct _GrlVimeoSourcePrivate {
static GrlVimeoSource *grl_vimeo_source_new (void);
-gboolean grl_vimeo_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_vimeo_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -85,7 +85,7 @@ static void grl_vimeo_source_search (GrlSource *source,
/* =================== Vimeo Plugin =============== */
gboolean
-grl_vimeo_plugin_init (GrlPluginRegistry *registry,
+grl_vimeo_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -130,10 +130,10 @@ grl_vimeo_plugin_init (GrlPluginRegistry *registry,
source = grl_vimeo_source_new ();
source->priv->vimeo = g_vimeo_new (vimeo_key, vimeo_secret);
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
init_result = TRUE;
go_out:
diff --git a/src/media/youtube/grl-youtube.c b/src/media/youtube/grl-youtube.c
index 89849e8..c07ae86 100644
--- a/src/media/youtube/grl-youtube.c
+++ b/src/media/youtube/grl-youtube.c
@@ -185,7 +185,7 @@ static void grl_youtube_source_set_property (GObject *object,
GParamSpec *pspec);
static void grl_youtube_source_finalize (GObject *object);
-gboolean grl_youtube_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_youtube_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -246,7 +246,7 @@ static GrlYoutubeSource *ytsrc = NULL;
/* =================== YouTube Plugin =============== */
gboolean
-grl_youtube_plugin_init (GrlPluginRegistry *registry,
+grl_youtube_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -285,10 +285,10 @@ grl_youtube_plugin_init (GrlPluginRegistry *registry,
source = grl_youtube_source_new (api_key, YOUTUBE_CLIENT_ID);
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
g_free (api_key);
diff --git a/src/metadata/fake-metadata/grl-fake-metadata.c b/src/metadata/fake-metadata/grl-fake-metadata.c
index 78042fa..c0d63d5 100644
--- a/src/metadata/fake-metadata/grl-fake-metadata.c
+++ b/src/metadata/fake-metadata/grl-fake-metadata.c
@@ -54,7 +54,7 @@ static gboolean grl_fake_metadata_source_may_resolve (GrlSource *source,
static const GList *grl_fake_metadata_source_writable_keys (GrlSource *source);
-gboolean grl_fake_metadata_source_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_fake_metadata_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -62,7 +62,7 @@ gboolean grl_fake_metadata_source_plugin_init (GrlPluginRegistry *registry,
/* =================== GrlFakeMetadata Plugin =============== */
gboolean
-grl_fake_metadata_source_plugin_init (GrlPluginRegistry *registry,
+grl_fake_metadata_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -71,10 +71,10 @@ grl_fake_metadata_source_plugin_init (GrlPluginRegistry *registry,
GRL_DEBUG ("grl_fake_metadata_source_plugin_init");
GrlFakeMetadataSource *source = grl_fake_metadata_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/metadata/gravatar/grl-gravatar.c b/src/metadata/gravatar/grl-gravatar.c
index d08d293..8d4ed3b 100644
--- a/src/metadata/gravatar/grl-gravatar.c
+++ b/src/metadata/gravatar/grl-gravatar.c
@@ -57,12 +57,12 @@ static gboolean grl_gravatar_source_may_resolve (GrlSource *source,
GrlKeyID key_id,
GList **missing_keys);
-static GrlKeyID register_gravatar_key (GrlPluginRegistry *registry,
+static GrlKeyID register_gravatar_key (GrlRegistry *registry,
const gchar *name,
const gchar *nick,
const gchar *blurb);
-gboolean grl_gravatar_source_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_gravatar_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -72,7 +72,7 @@ GrlKeyID GRL_METADATA_KEY_AUTHOR_AVATAR = 0;
/* =================== Gravatar Plugin =============== */
gboolean
-grl_gravatar_source_plugin_init (GrlPluginRegistry *registry,
+grl_gravatar_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -99,19 +99,19 @@ grl_gravatar_source_plugin_init (GrlPluginRegistry *registry,
}
/* Create relationship */
- grl_plugin_registry_register_metadata_key_relation (registry,
- GRL_METADATA_KEY_ARTIST,
- GRL_METADATA_KEY_ARTIST_AVATAR);
+ grl_registry_register_metadata_key_relation (registry,
+ GRL_METADATA_KEY_ARTIST,
+ GRL_METADATA_KEY_ARTIST_AVATAR);
- grl_plugin_registry_register_metadata_key_relation (registry,
- GRL_METADATA_KEY_AUTHOR,
- GRL_METADATA_KEY_AUTHOR_AVATAR);
+ grl_registry_register_metadata_key_relation (registry,
+ GRL_METADATA_KEY_AUTHOR,
+ GRL_METADATA_KEY_AUTHOR_AVATAR);
GrlGravatarSource *source = grl_gravatar_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
@@ -154,7 +154,7 @@ G_DEFINE_TYPE (GrlGravatarSource,
/* ======================= Utilities ==================== */
static GrlKeyID
-register_gravatar_key (GrlPluginRegistry *registry,
+register_gravatar_key (GrlRegistry *registry,
const gchar *name,
const gchar *nick,
const gchar *blurb)
@@ -168,13 +168,13 @@ register_gravatar_key (GrlPluginRegistry *registry,
NULL,
G_PARAM_READWRITE);
- key = grl_plugin_registry_register_metadata_key (registry, spec, NULL);
+ key = grl_registry_register_metadata_key (registry, spec, NULL);
/* If key was not registered, could be that it is already registered. If so,
check if type is the expected one, and reuse it */
if (key == GRL_METADATA_KEY_INVALID) {
g_param_spec_unref (spec);
- key = grl_plugin_registry_lookup_metadata_key (registry, name);
+ key = grl_registry_lookup_metadata_key (registry, name);
if (grl_metadata_key_get_type (key) != G_TYPE_STRING) {
key = GRL_METADATA_KEY_INVALID;
}
diff --git a/src/metadata/lastfm-albumart/grl-lastfm-albumart.c b/src/metadata/lastfm-albumart/grl-lastfm-albumart.c
index a779b8f..23ef72f 100644
--- a/src/metadata/lastfm-albumart/grl-lastfm-albumart.c
+++ b/src/metadata/lastfm-albumart/grl-lastfm-albumart.c
@@ -75,7 +75,7 @@ static gboolean grl_lastfm_albumart_source_may_resolve (GrlSource *source,
static void grl_lastfm_albumart_source_cancel (GrlSource *source,
guint operation_id);
-gboolean grl_lastfm_albumart_source_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_lastfm_albumart_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -83,7 +83,7 @@ gboolean grl_lastfm_albumart_source_plugin_init (GrlPluginRegistry *registry,
/* =================== Last.FM-AlbumArt Plugin =============== */
gboolean
-grl_lastfm_albumart_source_plugin_init (GrlPluginRegistry *registry,
+grl_lastfm_albumart_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -92,10 +92,10 @@ grl_lastfm_albumart_source_plugin_init (GrlPluginRegistry *registry,
GRL_DEBUG ("grl_lastfm_albumart_source_plugin_init");
GrlLastfmAlbumartSource *source = grl_lastfm_albumart_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/metadata/local-metadata/grl-local-metadata.c b/src/metadata/local-metadata/grl-local-metadata.c
index c3a5726..c6b9a3e 100644
--- a/src/metadata/local-metadata/grl-local-metadata.c
+++ b/src/metadata/local-metadata/grl-local-metadata.c
@@ -114,7 +114,7 @@ static gboolean grl_local_metadata_source_may_resolve (GrlSource *source,
GrlKeyID key_id,
GList **missing_keys);
-gboolean grl_local_metadata_source_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_local_metadata_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -123,7 +123,7 @@ gboolean grl_local_metadata_source_plugin_init (GrlPluginRegistry *registry,
/* =================== GrlLocalMetadata Plugin =============== */
gboolean
-grl_local_metadata_source_plugin_init (GrlPluginRegistry *registry,
+grl_local_metadata_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -149,10 +149,10 @@ grl_local_metadata_source_plugin_init (GrlPluginRegistry *registry,
}
GrlLocalMetadataSource *source = grl_local_metadata_source_new (guess_video);
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/src/metadata/metadata-store/grl-metadata-store.c b/src/metadata/metadata-store/grl-metadata-store.c
index 64c0d4c..56318e1 100644
--- a/src/metadata/metadata-store/grl-metadata-store.c
+++ b/src/metadata/metadata-store/grl-metadata-store.c
@@ -101,7 +101,7 @@ static const GList *grl_metadata_store_source_supported_keys (GrlSource *source)
static const GList *grl_metadata_store_source_writable_keys (GrlSource *source);
-gboolean grl_metadata_store_source_plugin_init (GrlPluginRegistry *registry,
+gboolean grl_metadata_store_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs);
@@ -109,7 +109,7 @@ gboolean grl_metadata_store_source_plugin_init (GrlPluginRegistry *registry,
/* =================== GrlMetadataStore Plugin =============== */
gboolean
-grl_metadata_store_source_plugin_init (GrlPluginRegistry *registry,
+grl_metadata_store_source_plugin_init (GrlRegistry *registry,
GrlPlugin *plugin,
GList *configs)
{
@@ -118,10 +118,10 @@ grl_metadata_store_source_plugin_init (GrlPluginRegistry *registry,
GRL_DEBUG ("grl_metadata_store_source_plugin_init");
GrlMetadataStoreSource *source = grl_metadata_store_source_new ();
- grl_plugin_registry_register_source (registry,
- plugin,
- GRL_SOURCE (source),
- NULL);
+ grl_registry_register_source (registry,
+ plugin,
+ GRL_SOURCE (source),
+ NULL);
return TRUE;
}
diff --git a/test/main.c b/test/main.c
index 6b569e5..87322f5 100644
--- a/test/main.c
+++ b/test/main.c
@@ -219,91 +219,91 @@ main (void)
GRL_DEBUG ("loading plugins");
- GrlPluginRegistry *registry = grl_plugin_registry_get_default ();
+ GrlRegistry *registry = grl_registry_get_default ();
GrlConfig *config = grl_config_new ("grl-youtube", NULL);
grl_config_set_api_key (config, YOUTUBE_KEY);
- grl_plugin_registry_add_config (registry, config, NULL);
-
- grl_plugin_registry_load (registry,
- "../src/media/youtube/.libs/libgrlyoutube.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/filesystem/.libs/libgrlfilesystem.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/jamendo/.libs/libgrljamendo.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/shoutcast/.libs/libgrlshoutcast.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/apple-trailers/.libs/libgrlappletrailers.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/metadata/fake-metadata/.libs/libgrlfakemetadata.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/metadata/lastfm-albumart/.libs/libgrllastfm-albumart.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/flickr/.libs/libgrlflickr.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/metadata/metadata-store/.libs/libgrlmetadatastore.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/bookmarks/.libs/libgrlbookmarks.so",
- NULL);
- grl_plugin_registry_load (registry,
- "../src/media/podcasts/.libs/libgrlpodcasts.so",
- NULL);
+ grl_registry_add_config (registry, config, NULL);
+
+ grl_registry_load (registry,
+ "../src/media/youtube/.libs/libgrlyoutube.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/filesystem/.libs/libgrlfilesystem.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/jamendo/.libs/libgrljamendo.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/shoutcast/.libs/libgrlshoutcast.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/apple-trailers/.libs/libgrlappletrailers.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/metadata/fake-metadata/.libs/libgrlfakemetadata.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/metadata/lastfm-albumart/.libs/libgrllastfm-albumart.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/flickr/.libs/libgrlflickr.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/metadata/metadata-store/.libs/libgrlmetadatastore.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/bookmarks/.libs/libgrlbookmarks.so",
+ NULL);
+ grl_registry_load (registry,
+ "../src/media/podcasts/.libs/libgrlpodcasts.so",
+ NULL);
GRL_DEBUG ("Obtaining sources");
GrlSource *youtube =
- grl_plugin_registry_lookup_source (registry,
- "grl-youtube");
+ grl_registry_lookup_source (registry,
+ "grl-youtube");
GrlSource *fs =
- grl_plugin_registry_lookup_source (registry,
- "grl-filesystem");
+ grl_registry_lookup_source (registry,
+ "grl-filesystem");
GrlSource *flickr =
- grl_plugin_registry_lookup_source (registry,
- "grl-flickr");
+ grl_registry_lookup_source (registry,
+ "grl-flickr");
GrlSource *jamendo =
- grl_plugin_registry_lookup_source (registry,
- "grl-jamendo");
+ grl_registry_lookup_source (registry,
+ "grl-jamendo");
GrlSource *shoutcast =
- grl_plugin_registry_lookup_source (registry,
- "grl-shoutcast");
+ grl_registry_lookup_source (registry,
+ "grl-shoutcast");
GrlSource *apple_trailers =
- grl_plugin_registry_lookup_source (registry,
- "grl-apple-trailers");
+ grl_registry_lookup_source (registry,
+ "grl-apple-trailers");
GrlSource *fake =
- grl_plugin_registry_lookup_source (registry,
- "grl-fake-metadata");
+ grl_registry_lookup_source (registry,
+ "grl-fake-metadata");
GrlSource *lastfm =
- grl_plugin_registry_lookup_source (registry,
- "grl-lastfm-albumart");
+ grl_registry_lookup_source (registry,
+ "grl-lastfm-albumart");
GrlSource *metadata_store =
- grl_plugin_registry_lookup_source (registry,
- "grl-metadata-store");
+ grl_registry_lookup_source (registry,
+ "grl-metadata-store");
GrlSource *bookmarks =
- grl_plugin_registry_lookup_source (registry,
- "grl-bookmarks");
+ grl_registry_lookup_source (registry,
+ "grl-bookmarks");
GrlSource *podcasts =
- grl_plugin_registry_lookup_source (registry,
- "grl-podcasts");
+ grl_registry_lookup_source (registry,
+ "grl-podcasts");
g_assert (youtube);
g_assert (fs);
diff --git a/test/test_local_metadata.c b/test/test_local_metadata.c
index 734124f..df79dfc 100644
--- a/test/test_local_metadata.c
+++ b/test/test_local_metadata.c
@@ -143,16 +143,16 @@ static gboolean
setup (void)
{
gboolean ret;
- GrlPluginRegistry *registry;
+ GrlRegistry *registry;
ret = install_thumbnail (TEST_IMAGE1);
if (!ret)
goto finish;
- registry = grl_plugin_registry_get_default ();
- grl_plugin_registry_load_all (registry, NULL);
+ registry = grl_registry_get_default ();
+ grl_registry_load_all (registry, NULL);
local_source =
- GRL_SOURCE (grl_plugin_registry_lookup_source (registry,
- LOCAL_SOURCE_ID));
+ GRL_SOURCE (grl_registry_lookup_source (registry,
+ LOCAL_SOURCE_ID));
finish:
return ret;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
