From 435290ee4fba04c39dd45984924a17df2505cf67 Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Mon, 10 Nov 2014 14:07:18 +0100
Subject: server: Port to new mediaart API

Signed-off-by: Jens Georg <mail@jensge.org>
---
 configure.ac                                   | 8 ++++----
 src/librygel-server/rygel-media-art-store.vala | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 324dd564..265a9608 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ GEE_REQUIRED=0.8.0
 UUID_REQUIRED=1.41.3
 LIBSOUP_REQUIRED=2.44.0
 GTK_REQUIRED=3.0
-MEDIAART_REQUIRED=0.5.0
+MEDIAART_REQUIRED=0.7.0
 
 dnl Additional requirements for media-export plugin
 GSTREAMER_TAG_REQUIRED=1.0
@@ -73,10 +73,10 @@ RYGEL_COMMON_MODULES="$RYGEL_BASE_MODULES gupnp-av-1.0 >= $GUPNP_AV_REQUIRED"
 PKG_CHECK_MODULES([LIBRYGEL_SERVER_DEPS], [$RYGEL_COMMON_MODULES uuid >=
                    $UUID_REQUIRED gssdp-1.0 >= $GSSDP_REQUIRED gio-2.0 >=
                    $GIO_REQUIRED gmodule-2.0 libxml-2.0 >= $LIBXML_REQUIRED
-                   libsoup-2.4 >= $LIBSOUP_REQUIRED libmediaart-1.0 >=
+                   libsoup-2.4 >= $LIBSOUP_REQUIRED libmediaart-2.0 >=
                    $MEDIAART_REQUIRED])
 RYGEL_COMMON_MODULES_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gupnp-av-1.0"
-LIBRYGEL_SERVER_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gssdp-1.0 --pkg gio-2.0 --pkg libsoup-2.4 --pkg gmodule-2.0 --pkg libmediaart-1.0"
+LIBRYGEL_SERVER_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gssdp-1.0 --pkg gio-2.0 --pkg libsoup-2.4 --pkg gmodule-2.0 --pkg libmediaart-2.0"
 AC_SUBST([LIBRYGEL_SERVER_DEPS_VALAFLAGS])
 
 PKG_CHECK_MODULES([LIBRYGEL_RENDERER_DEPS], [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED libsoup-2.4 >= $LIBSOUP_REQUIRED])
@@ -172,7 +172,7 @@ AS_IF([test "x$with_media_engine" = "xgstreamer"],
                                gstreamer-pbutils-1.0 >= $GSTPBU_REQUIRED
                                libsoup-2.4 >= $LIBSOUP_REQUIRED
                                sqlite3 >= $LIBSQLITE3_REQUIRED
-                               libmediaart-1.0 >= $MEDIAART_REQUIRED
+                               libmediaart-2.0 >= $MEDIAART_REQUIRED
                                uuid])
             RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_VALAFLAGS="$RYGEL_COMMON_MODULES_VALAFLAGS --pkg gupnp-dlna-2.0 --pkg gupnp-dlna-gst-2.0 --pkg gstreamer-tag-1.0 --pkg gstreamer-app-1.0 --pkg gstreamer-pbutils-1.0 --pkg sqlite3"
             AC_SUBST([RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_VALAFLAGS])
diff --git a/src/librygel-server/rygel-media-art-store.vala b/src/librygel-server/rygel-media-art-store.vala
index 6b5281b1..8ddc15bc 100644
--- a/src/librygel-server/rygel-media-art-store.vala
+++ b/src/librygel-server/rygel-media-art-store.vala
@@ -100,9 +100,7 @@ public class Rygel.MediaArtStore : GLib.Object {
         MediaArt.get_file (item.artist,
                            type == "album" ? item.album : item.title,
                            type,
-                           null,
-                           out file,
-                           null);
+                           out file);
 
         return file;
     }
-- 
cgit v1.2.1