GNOME.org
 

[grilo-plugins] all: cancel() belongs to GrlMetadataSource

commit defa93b2c0ffd8b0e15087d00cdf10468c6e8bdc
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Tue Apr 5 09:57:19 2011 +0000

    all: cancel() belongs to GrlMetadataSource
    
    cancel() method has been moved from GrlMediaSource to GrlMetadataSource.
    
    Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>

 src/media/apple-trailers/grl-apple-trailers.c |    9 ++++-----
 src/media/filesystem/grl-filesystem.c         |    6 +++---
 src/media/jamendo/grl-jamendo.c               |    9 ++++-----
 src/media/shoutcast/grl-shoutcast.c           |    8 ++++----
 src/media/tracker/grl-tracker-media-api.c     |    2 +-
 src/media/tracker/grl-tracker-media-api.h     |    4 ++--
 src/media/tracker/grl-tracker-media.c         |    2 +-
 7 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/src/media/apple-trailers/grl-apple-trailers.c b/src/media/apple-trailers/grl-apple-trailers.c
index 30962e0..fc9d92a 100644
--- a/src/media/apple-trailers/grl-apple-trailers.c
+++ b/src/media/apple-trailers/grl-apple-trailers.c
@@ -91,7 +91,7 @@ static const GList *grl_apple_trailers_source_supported_keys (GrlMetadataSource
 static void grl_apple_trailers_source_browse (GrlMediaSource *source,
                                               GrlMediaSourceBrowseSpec *bs);
 
-static void grl_apple_trailers_source_cancel (GrlMediaSource *source,
+static void grl_apple_trailers_source_cancel (GrlMetadataSource *source,
                                               guint operation_id);
 
 /* =================== Apple Trailers Plugin  =============== */
@@ -216,7 +216,7 @@ grl_apple_trailers_source_class_init (GrlAppleTrailersSourceClass * klass)
   GrlMetadataSourceClass *metadata_class = GRL_METADATA_SOURCE_CLASS (klass);
   GObjectClass *g_class = G_OBJECT_CLASS (klass);
   source_class->browse = grl_apple_trailers_source_browse;
-  source_class->cancel = grl_apple_trailers_source_cancel;
+  metadata_class->cancel = grl_apple_trailers_source_cancel;
   metadata_class->supported_keys = grl_apple_trailers_source_supported_keys;
   g_class->finalize = grl_apple_trailers_source_finalize;
   g_class->set_property = grl_apple_trailers_source_set_property;
@@ -585,7 +585,7 @@ grl_apple_trailers_source_browse (GrlMediaSource *source,
 }
 
 static void
-grl_apple_trailers_source_cancel (GrlMediaSource *source, guint operation_id)
+grl_apple_trailers_source_cancel (GrlMetadataSource *source, guint operation_id)
 {
   OperationData *op_data;
   GrlAppleTrailersSourcePriv *priv;
@@ -601,8 +601,7 @@ grl_apple_trailers_source_cancel (GrlMediaSource *source, guint operation_id)
     grl_net_wc_flush_delayed_requests (priv->wc);
 
   op_data =
-    (OperationData *) grl_metadata_source_get_operation_data (GRL_METADATA_SOURCE (source),
-                                                              operation_id);
+    (OperationData *) grl_metadata_source_get_operation_data (source, operation_id);
 
   if (op_data) {
     op_data->cancelled = TRUE;
diff --git a/src/media/filesystem/grl-filesystem.c b/src/media/filesystem/grl-filesystem.c
index 586a43d..5a45392 100644
--- a/src/media/filesystem/grl-filesystem.c
+++ b/src/media/filesystem/grl-filesystem.c
@@ -141,7 +141,7 @@ static gboolean grl_filesystem_test_media_from_uri (GrlMediaSource *source,
 static void grl_filesystem_get_media_from_uri (GrlMediaSource *source,
                                                GrlMediaSourceMediaFromUriSpec *mfus);
 
-static void grl_filesystem_source_cancel (GrlMediaSource *source,
+static void grl_filesystem_source_cancel (GrlMetadataSource *source,
                                           guint operation_id);
 
 static gboolean grl_filesystem_source_notify_change_start (GrlMediaSource *source,
@@ -218,7 +218,6 @@ grl_filesystem_source_class_init (GrlFilesystemSourceClass * klass)
   GrlMetadataSourceClass *metadata_class = GRL_METADATA_SOURCE_CLASS (klass);
   source_class->browse = grl_filesystem_source_browse;
   source_class->search = grl_filesystem_source_search;
-  source_class->cancel = grl_filesystem_source_cancel;
   source_class->notify_change_start = grl_filesystem_source_notify_change_start;
   source_class->notify_change_stop = grl_filesystem_source_notify_change_stop;
   source_class->metadata = grl_filesystem_source_metadata;
@@ -226,6 +225,7 @@ grl_filesystem_source_class_init (GrlFilesystemSourceClass * klass)
   source_class->media_from_uri = grl_filesystem_get_media_from_uri;
   G_OBJECT_CLASS (source_class)->finalize = grl_filesystem_source_finalize;
   metadata_class->supported_keys = grl_filesystem_source_supported_keys;
+  metadata_class->cancel = grl_filesystem_source_cancel;
   g_type_class_add_private (klass, sizeof (GrlFilesystemSourcePrivate));
 }
 
@@ -1281,7 +1281,7 @@ beach:
 }
 
 static void
-grl_filesystem_source_cancel (GrlMediaSource *source, guint operation_id)
+grl_filesystem_source_cancel (GrlMetadataSource *source, guint operation_id)
 {
   GCancellable *cancellable;
   GrlFilesystemSourcePrivate *priv;
diff --git a/src/media/jamendo/grl-jamendo.c b/src/media/jamendo/grl-jamendo.c
index c83ce07..e7a0011 100644
--- a/src/media/jamendo/grl-jamendo.c
+++ b/src/media/jamendo/grl-jamendo.c
@@ -186,7 +186,7 @@ static void grl_jamendo_source_query (GrlMediaSource *source,
 static void grl_jamendo_source_search (GrlMediaSource *source,
                                        GrlMediaSourceSearchSpec *ss);
 
-static void grl_jamendo_source_cancel (GrlMediaSource *source,
+static void grl_jamendo_source_cancel (GrlMetadataSource *source,
                                        guint operation_id);
 
 /* =================== Jamendo Plugin  =============== */
@@ -253,7 +253,7 @@ grl_jamendo_source_class_init (GrlJamendoSourceClass * klass)
   source_class->browse = grl_jamendo_source_browse;
   source_class->query = grl_jamendo_source_query;
   source_class->search = grl_jamendo_source_search;
-  source_class->cancel = grl_jamendo_source_cancel;
+  metadata_class->cancel = grl_jamendo_source_cancel;
   metadata_class->supported_keys = grl_jamendo_source_supported_keys;
   g_class->finalize = grl_jamendo_source_finalize;
 
@@ -1337,7 +1337,7 @@ grl_jamendo_source_search (GrlMediaSource *source,
 }
 
 static void
-grl_jamendo_source_cancel (GrlMediaSource *source, guint operation_id)
+grl_jamendo_source_cancel (GrlMetadataSource *source, guint operation_id)
 {
   XmlParseEntries *xpe;
   GrlJamendoSourcePriv *priv;
@@ -1356,8 +1356,7 @@ grl_jamendo_source_cancel (GrlMediaSource *source, guint operation_id)
   GRL_DEBUG ("grl_jamendo_source_cancel");
 
   xpe =
-    (XmlParseEntries *) grl_metadata_source_get_operation_data (GRL_METADATA_SOURCE (source),
-                                                                operation_id);
+    (XmlParseEntries *) grl_metadata_source_get_operation_data (source, operation_id);
 
   if (xpe) {
     xpe->cancelled = TRUE;
diff --git a/src/media/shoutcast/grl-shoutcast.c b/src/media/shoutcast/grl-shoutcast.c
index f4bd04f..55be682 100644
--- a/src/media/shoutcast/grl-shoutcast.c
+++ b/src/media/shoutcast/grl-shoutcast.c
@@ -98,7 +98,7 @@ static void grl_shoutcast_source_browse (GrlMediaSource *source,
 static void grl_shoutcast_source_search (GrlMediaSource *source,
                                          GrlMediaSourceSearchSpec *ss);
 
-static void grl_shoutcast_source_cancel (GrlMediaSource *source,
+static void grl_shoutcast_source_cancel (GrlMetadataSource *source,
                                          guint operation_id);
 
 static void read_url_async (const gchar *url, OperationData *op_data);
@@ -150,7 +150,7 @@ grl_shoutcast_source_class_init (GrlShoutcastSourceClass * klass)
   source_class->metadata = grl_shoutcast_source_metadata;
   source_class->browse = grl_shoutcast_source_browse;
   source_class->search = grl_shoutcast_source_search;
-  source_class->cancel = grl_shoutcast_source_cancel;
+  metadata_class->cancel = grl_shoutcast_source_cancel;
   metadata_class->supported_keys = grl_shoutcast_source_supported_keys;
   gobject_class->finalize = grl_shoutcast_source_finalize;
 }
@@ -705,7 +705,7 @@ grl_shoutcast_source_search (GrlMediaSource *source,
 }
 
 static void
-grl_shoutcast_source_cancel (GrlMediaSource *source, guint operation_id)
+grl_shoutcast_source_cancel (GrlMetadataSource *source, guint operation_id)
 {
   OperationData *op_data;
 
@@ -716,7 +716,7 @@ grl_shoutcast_source_cancel (GrlMediaSource *source, guint operation_id)
   cancellable = NULL;
 
   op_data =
-    (OperationData *) grl_metadata_source_get_operation_data (GRL_METADATA_SOURCE (source), operation_id);
+    (OperationData *) grl_metadata_source_get_operation_data (source, operation_id);
 
   if (op_data) {
     op_data->cancelled = TRUE;
diff --git a/src/media/tracker/grl-tracker-media-api.c b/src/media/tracker/grl-tracker-media-api.c
index b8fffe5..e1db276 100644
--- a/src/media/tracker/grl-tracker-media-api.c
+++ b/src/media/tracker/grl-tracker-media-api.c
@@ -847,7 +847,7 @@ grl_tracker_media_browse (GrlMediaSource *source,
 }
 
 void
-grl_tracker_media_cancel (GrlMediaSource *source, guint operation_id)
+grl_tracker_media_cancel (GrlMetadataSource *source, guint operation_id)
 {
   GrlTrackerOp *os;
 
diff --git a/src/media/tracker/grl-tracker-media-api.h b/src/media/tracker/grl-tracker-media-api.h
index cd2f5ad..da635e7 100644
--- a/src/media/tracker/grl-tracker-media-api.h
+++ b/src/media/tracker/grl-tracker-media-api.h
@@ -42,14 +42,14 @@ void grl_tracker_media_metadata (GrlMediaSource *source,
 void grl_tracker_media_set_metadata (GrlMetadataSource *source,
                                      GrlMetadataSourceSetMetadataSpec *sms);
 
+void grl_tracker_media_cancel (GrlMetadataSource *source, guint operation_id);
+
 void grl_tracker_media_search (GrlMediaSource *source,
                                GrlMediaSourceSearchSpec *ss);
 
 void grl_tracker_media_browse (GrlMediaSource *source,
                                GrlMediaSourceBrowseSpec *bs);
 
-void grl_tracker_media_cancel (GrlMediaSource *source, guint operation_id);
-
 gboolean grl_tracker_media_change_start (GrlMediaSource *source,
                                          GError **error);
 
diff --git a/src/media/tracker/grl-tracker-media.c b/src/media/tracker/grl-tracker-media.c
index ca17dd6..4c21ce7 100644
--- a/src/media/tracker/grl-tracker-media.c
+++ b/src/media/tracker/grl-tracker-media.c
@@ -101,10 +101,10 @@ grl_tracker_media_class_init (GrlTrackerMediaClass * klass)
   source_class->metadata            = grl_tracker_media_metadata;
   source_class->search              = grl_tracker_media_search;
   source_class->browse              = grl_tracker_media_browse;
-  source_class->cancel              = grl_tracker_media_cancel;
   source_class->notify_change_start = grl_tracker_media_change_start;
   source_class->notify_change_stop  = grl_tracker_media_change_stop;
 
+  metadata_class->cancel         = grl_tracker_media_cancel;
   metadata_class->supported_keys = grl_tracker_supported_keys;
   metadata_class->writable_keys  = grl_tracker_media_writable_keys;
   metadata_class->set_metadata   = grl_tracker_media_set_metadata;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]