D-Bus, The Repeat method should be part of /Player, not /TrackList

Patch by Mirsal ENNAIME, as usual.

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index f4fab785a4ba9bbab4665a64cae9c02d44829f88..9d762cfb0f12e4281e23a0ac16cb3ba521a5ecfa 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -667,6 +667,7 @@ DBUS_METHOD( handle_player )
     METHOD_FUNC( "Stop",                    Stop );
     METHOD_FUNC( "Play",                    Play );
     METHOD_FUNC( "Pause",                   Pause );
+    METHOD_FUNC( "Repeat",                  Repeat );
     METHOD_FUNC( "VolumeSet",               VolumeSet );
     METHOD_FUNC( "VolumeGet",               VolumeGet );
     METHOD_FUNC( "PositionSet",             PositionSet );
@@ -691,7 +692,6 @@ DBUS_METHOD( handle_tracklist )
     METHOD_FUNC( "AddTrack",                AddTrack );
     METHOD_FUNC( "DelTrack",                DelTrack );
     METHOD_FUNC( "Loop",                    Loop );
-    METHOD_FUNC( "Repeat",                  Repeat );
     METHOD_FUNC( "Random",                  Random );
 
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index cad2ce42f6fe2db06111a1012c43d1ff54efb37b..cd263357ca03c70b264b9be9030d8db5f8e4a969 100644 (file)
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -127,6 +127,9 @@ const char* psz_introspection_xml_data_player =
 "    </method>\n"
 "    <method name=\"Pause\">\n"
 "    </method>\n"
+"    <method name=\"Repeat\">\n"
+"      <arg type=\"b\" direction=\"in\" />\n"
+"    </method>\n"
 "    <method name=\"VolumeSet\">\n"
 "      <arg type=\"i\" direction=\"in\" />\n"
 "    </method>\n"
@@ -176,9 +179,6 @@ const char* psz_introspection_xml_data_tracklist =
 "    <method name=\"Loop\">\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
 "    </method>\n"
-"    <method name=\"Repeat\">\n"
-"      <arg type=\"b\" direction=\"in\" />\n"
-"    </method>\n"
 "    <method name=\"Random\">\n"
 "      <arg type=\"b\" direction=\"in\" />\n"
 "    </method>\n"