diff options
| author | Bastien Nocera <hadess@hadess.net> | 2014-05-09 11:30:45 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2014-08-18 12:53:53 +0200 |
| commit | 72bc2886692cf025a4bf1d63f7c47ce3f00b34a5 (patch) | |
| tree | 35d74405c2934977d08319819f01c12c12f46e55 | |
| parent | 693cbc5541561004504e03fe6f80e94540e16b33 (diff) | |
| download | totem-72bc2886692cf025a4bf1d63f7c47ce3f00b34a5.tar.gz | |
main: Extend find_media_cb() to be more flexible
Instead of always comparing IDs, allow the type to compare to be
passed to the helper.
| -rw-r--r-- | src/totem-grilo.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/totem-grilo.c b/src/totem-grilo.c index 10d5d8398..0fd0d690d 100644 --- a/src/totem-grilo.c +++ b/src/totem-grilo.c @@ -147,6 +147,7 @@ typedef struct { typedef struct { gboolean found; + GrlKeyID key; GtkTreeIter *iter; GrlMedia *media; } FindMediaData; @@ -1098,6 +1099,7 @@ find_media_cb (GtkTreeModel *model, FindMediaData *data) { GrlMedia *media; + const char *a, *b; gtk_tree_model_get (model, iter, MODEL_RESULTS_CONTENT, &media, @@ -1105,7 +1107,10 @@ find_media_cb (GtkTreeModel *model, if (!media) return FALSE; - if (g_strcmp0 (grl_media_get_id (media), grl_media_get_id (data->media)) == 0) { + a = grl_data_get_string (GRL_DATA (media), data->key); + b = grl_data_get_string (GRL_DATA (data->media), data->key); + + if (g_strcmp0 (a, b) == 0) { g_object_unref (media); data->found = TRUE; data->iter = gtk_tree_iter_copy (iter); @@ -1123,6 +1128,7 @@ find_media (GtkTreeModel *model, FindMediaData data; data.found = FALSE; + data.key = GRL_METADATA_KEY_ID; data.media = media; data.iter = NULL; gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) find_media_cb, &data); |