1 From af7aab21f2ed0d837ddf583126f7dbfd88a69627 Mon Sep 17 00:00:00 2001
2 From: Bastien Nocera <hadess@hadess.net>
3 Date: Thu, 17 Dec 2015 13:42:12 +0100
4 Subject: [PATCH] grilo: Port to 0.3.0
6 https://bugzilla.gnome.org/show_bug.cgi?id=759589
9 plugins/grilo/rb-grilo-plugin.c | 2 +-
10 plugins/grilo/rb-grilo-source.c | 10 +++++-----
11 3 files changed, 8 insertions(+), 8 deletions(-)
13 diff --git a/configure.ac b/configure.ac
14 index 4457182..1929905 100644
17 @@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
26 @@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
27 [Disable Grilo support]),,
29 if test "x$enable_grilo" != "xno"; then
30 - PKG_CHECK_MODULES(GRILO, grilo-0.2 >= $GRILO_REQS, have_grilo=yes, have_grilo=no)
31 + PKG_CHECK_MODULES(GRILO, grilo-0.3 >= $GRILO_REQS, have_grilo=yes, have_grilo=no)
32 if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
33 AC_MSG_ERROR([Grilo support explicitly requested, but grilo couldn not be found])
35 diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
36 index 2816be2..5c56b93 100644
37 --- a/plugins/grilo/rb-grilo-plugin.c
38 +++ b/plugins/grilo/rb-grilo-plugin.c
39 @@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
40 pi->registry = grl_registry_get_default ();
41 g_signal_connect (pi->registry, "source-added", G_CALLBACK (grilo_source_added_cb), pi);
42 g_signal_connect (pi->registry, "source-removed", G_CALLBACK (grilo_source_removed_cb), pi);
43 - if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
44 + if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) == FALSE) {
45 g_warning ("Failed to load Grilo plugins: %s", error->message);
46 g_clear_error (&error);
48 diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
49 index 103e06b..22a9d11 100644
50 --- a/plugins/grilo/rb-grilo-source.c
51 +++ b/plugins/grilo/rb-grilo-source.c
52 @@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source, GrlSupportedOps op, int position)
53 grl_operation_options_set_count (options,
54 CONTAINER_FETCH_SIZE);
55 grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
56 - grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
57 + grl_operation_options_set_resolution_flags (options, GRL_RESOLVE_NORMAL);
61 @@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, g
62 source->priv->browse_position++;
65 - if (media && GRL_IS_MEDIA_BOX (media)) {
66 + if (media && grl_media_is_container (media)) {
69 if (source->priv->browse_container == NULL) {
70 @@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, g
74 - } else if (media && GRL_IS_MEDIA_AUDIO (media)) {
75 + } else if (media && grl_media_is_audio (media)) {
76 source->priv->browse_got_media = TRUE;
79 @@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *me
80 source->priv->media_browse_got_results = TRUE;
81 source->priv->media_browse_position++;
83 - if (GRL_IS_MEDIA_AUDIO (media)) {
84 + if (grl_media_is_audio (media)) {
86 entry = create_entry_for_media (source->priv->db,
87 source->priv->entry_type,
88 @@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *me
90 rhythmdb_query_model_add_entry (source->priv->query_model, entry, -1);
92 - } else if (GRL_IS_MEDIA_BOX (media)) {
93 + } else if (grl_media_is_container (media)) {
94 source->priv->media_browse_got_containers = TRUE;