few fixes to mpris plugin

2 files changed, 12 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index bdb4ac63..5060b885 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ AC_ARG_ENABLE(aac,     [  --disable-aac            disable AAC decoder based on
 AC_ARG_ENABLE(mms,     [  --disable-mms            disable MMS streaming vfs plugin (default: enabled)], [enable_mms=$enableval], [enable_mms=yes])
 AC_ARG_ENABLE(shn,     [  --disable-shn            disable shorten plugin (default: enabled)], [enable_shn=$enableval], [enable_shn=yes])
 AC_ARG_ENABLE(ao,     [  --disable-ao            disable audio overload plugin (default: enabled)], [enable_ao=$enableval], [enable_ao=yes])
-AC_ARG_ENABLE(mpris,     [  --enable-mpris            disable Ubuntu Sound Menu plugin (default: disabled)], [enable_mpris=$enableval], [enable_mpris=no])
+AC_ARG_ENABLE(mpris,     [  --enable-mpris            disable Ubuntu Sound Menu plugin (default: disabled)], [enable_mpris=$enableval], [enable_mpris=yes])
 
 PKG_CHECK_MODULES(DEPS, samplerate)
 
@@ -397,7 +397,7 @@ if test "x$enable_ao" != "xno" ; then
 fi
 
 if test "x$enable_mpris" != "xno" ; then
-    PKG_CHECK_MODULES(MPRIS_DEPS, indicate >= 0.4.4  glib-2.0 >= 2.26.0, HAVE_MPRIS=yes, HAVE_MPRIS=no)
+    PKG_CHECK_MODULES(MPRIS_DEPS, gio-2.0 glib-2.0 >= 2.26.0, HAVE_MPRIS=yes, HAVE_MPRIS=no)
 fi
 
 PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/dumb plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shn plugins/ao plugins/shellexec plugins/mpris"
diff --git a/plugins/mpris/mpris.c b/plugins/mpris/mpris.c
index 37b6e4c9..040de84c 100644
--- a/plugins/mpris/mpris.c
+++ b/plugins/mpris/mpris.c
@@ -19,7 +19,7 @@
 
 #include <time.h>
 #include <gio/gio.h>
-#include <libindicate/server.h>
+//#include <libindicate/server.h>
 
 #include <deadbeef/deadbeef.h>
 #include "../artwork/artwork.h"
@@ -36,7 +36,7 @@ DB_functions_t *deadbeef;
 static short enabled = 0;
 DB_artwork_plugin_t *coverart_plugin = NULL;
 
-static IndicateServer *indicate_server;
+//static IndicateServer *indicate_server;
 static GDBusConnection *connection;
 static guint name_own_id;
 static guint root_id;
@@ -1087,10 +1087,10 @@ name_lost_cb (GDBusConnection *connection, const char *name, gpointer *user_data
 static gboolean 
 mpris_begin ()
 {
-    indicate_server = indicate_server_ref_default ();
-    indicate_server_set_type (indicate_server, "music.deadbeef");
-    indicate_server_set_desktop_file (indicate_server, DESKTOP_FILE);
-    indicate_server_show (indicate_server);
+//    indicate_server = indicate_server_ref_default ();
+//    indicate_server_set_type (indicate_server, "music.deadbeef");
+//    indicate_server_set_desktop_file (indicate_server, DESKTOP_FILE);
+//    indicate_server_show (indicate_server);
 
     GError *error = NULL;
     GDBusInterfaceInfo *ifaceinfo;
@@ -1201,7 +1201,7 @@ mpris_end ()
         name_own_id = 0;
     }
 
-    indicate_server_hide (indicate_server);
+//    indicate_server_hide (indicate_server);
 
     deadbeef->mutex_lock(emit_id_mtx);    
 	if (player_property_emit_id != 0) {
@@ -1291,9 +1291,9 @@ static DB_dsp_t plugin = {
     .plugin.api_vmajor = DB_API_VERSION_MAJOR,
     .plugin.api_vminor = DB_API_VERSION_MINOR,
     .plugin.type = DB_PLUGIN_MISC,
-    .plugin.id = "Sound Menu",
-    .plugin.name = "Sound Menu",
-    .plugin.descr = "Ubuntu Sound Menu plugin",
+    .plugin.id = "mpris",
+    .plugin.name = "MPRIS",
+    .plugin.descr = "MPRIS",
     .plugin.author = "Robert Y",
     .plugin.email = "Decatf@gmail.com",
     .plugin.website = "http://deadbeef.sf.net",