diff --git a/Makefile.am b/Makefile.am
index 26bc7fa5..f0bcca7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,8 +100,8 @@ dbus-interface.h dbus-interface.c: org.gnome.ShairportSync.xml
endif
if USE_MPRIS
-shairport_sync_SOURCES += mpris-service.c mpris-interface.c mpris-player-interface.c
-BUILT_SOURCES += mpris-interface.h mpris-interface.c mpris-player-interface.h mpris-player-interface.c
+shairport_sync_SOURCES += mpris-service.c mpris-interface.c
+BUILT_SOURCES += mpris-interface.h mpris-interface.c
# We don't want to install this header
noinst_HEADERS += $(BUILT_SOURCES)
# Correctly clean the generated headers, but keep the xml description
@@ -109,9 +109,6 @@ CLEANFILES += $(BUILT_SOURCES)
mpris-interface.h mpris-interface.c: org.mpris.MediaPlayer2.xml
gdbus-codegen --interface-prefix org.mpris --generate-c-code mpris-interface org.mpris.MediaPlayer2.xml
-
-mpris-player-interface.h mpris-player-interface.c: org.mpris.MediaPlayer2.Player.xml
- gdbus-codegen --interface-prefix org.mpris --generate-c-code mpris-player-interface org.mpris.MediaPlayer2.Player.xml
endif
noinst_PROGRAMS =
@@ -125,7 +122,7 @@ endif
if USE_MPRIS_CLIENT
#Make it, but don't install it anywhere
noinst_PROGRAMS += shairport-sync-mpris-test-client
-shairport_sync_mpris_test_client_SOURCES = mpris-interface.c mpris-interface.h mpris-player-interface.c mpris-player-interface.h shairport-sync-mpris-test-client.c
+shairport_sync_mpris_test_client_SOURCES = mpris-interface.c mpris-interface.h shairport-sync-mpris-test-client.c
endif
install-exec-hook:
diff --git a/mpris-service.h b/mpris-service.h
index be413540..f290d79c 100644
--- a/mpris-service.h
+++ b/mpris-service.h
@@ -3,7 +3,6 @@
#define MPRIS_SERVICE_H
#include "mpris-interface.h"
-#include "mpris-player-interface.h"
MediaPlayer2 *mprisPlayerSkeleton;
MediaPlayer2Player *mprisPlayerPlayerSkeleton;
diff --git a/org.mpris.MediaPlayer2.Player.xml b/org.mpris.MediaPlayer2.Player.xml
deleted file mode 100755
index 72362379..00000000
--- a/org.mpris.MediaPlayer2.Player.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.mpris.MediaPlayer2.xml b/org.mpris.MediaPlayer2.xml
index 8f8d0271..ae34e1e5 100755
--- a/org.mpris.MediaPlayer2.xml
+++ b/org.mpris.MediaPlayer2.xml
@@ -1,25 +1,54 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/shairport-sync-mpris-test-client.c b/shairport-sync-mpris-test-client.c
index c2daa5b7..ca5545bf 100644
--- a/shairport-sync-mpris-test-client.c
+++ b/shairport-sync-mpris-test-client.c
@@ -1,5 +1,4 @@
#include "mpris-interface.h"
-#include "mpris-player-interface.h"
#include
#include
#include
@@ -91,19 +90,29 @@ int main(int argc, char *argv[]) {
pthread_create(&dbus_thread, NULL, &dbus_thread_func, NULL);
- MediaPlayer2Player *proxy;
-
- GError *error = NULL;
-
- proxy = media_player2_player_proxy_new_for_bus_sync(gbus_type_selected, G_DBUS_PROXY_FLAGS_NONE,
+ GError *error1 = NULL;
+ MediaPlayer2 *proxy1 = media_player2_proxy_new_for_bus_sync(gbus_type_selected, G_DBUS_PROXY_FLAGS_NONE,
"org.mpris.MediaPlayer2.ShairportSync",
- "/org/mpris/MediaPlayer2", NULL, &error);
- g_signal_connect(proxy, "g-properties-changed", G_CALLBACK(on_properties_changed), NULL);
+ "/org/mpris/MediaPlayer2", NULL, &error1);
+ if (error1)
+ printf("Error proxying MediaPlayer2");
+ g_signal_connect(proxy1, "g-properties-changed", G_CALLBACK(on_properties_changed), NULL);
+
+
+ GError *error2 = NULL;
+ MediaPlayer2Player *proxy2 = media_player2_player_proxy_new_for_bus_sync(gbus_type_selected, G_DBUS_PROXY_FLAGS_NONE,
+ "org.mpris.MediaPlayer2.ShairportSync",
+ "/org/mpris/MediaPlayer2", NULL, &error2);
+ if (error2)
+ printf("Error proxying MediaPlayer2Player");
+ g_signal_connect(proxy2, "g-properties-changed", G_CALLBACK(on_properties_changed), NULL);
+
// g_main_loop_quit(loop);
pthread_join(dbus_thread, NULL);
printf("exiting program.\n");
- g_object_unref(proxy);
+ g_object_unref(proxy1);
+ g_object_unref(proxy2);
return 0;
}