Commit a97f94fa authored by Mirsal Ennaime's avatar Mirsal Ennaime Committed by Jean-Baptiste Kempf

single instance: append tracks as specified in MPRIS 2.2

Use /org/mpris/MediaPlayer2/TrackList/Append instead of / as the
AfterTrack argument to org.mpris.MediaPlayer2.AddTrack for appending
(cherry picked from commit 0376739feee15fa4636e30e7c85f1be97f2d74f9)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1b573cdc
...@@ -344,6 +344,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -344,6 +344,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* FIXME: could be replaced by using Unix sockets */ /* FIXME: could be replaced by using Unix sockets */
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
#define MPRIS_APPEND "/org/mpris/MediaPlayer2/TrackList/Append"
#define MPRIS_BUS_NAME "org.mpris.MediaPlayer2.vlc" #define MPRIS_BUS_NAME "org.mpris.MediaPlayer2.vlc"
#define MPRIS_OBJECT_PATH "/org/mpris/MediaPlayer2" #define MPRIS_OBJECT_PATH "/org/mpris/MediaPlayer2"
#define MPRIS_TRACKLIST_INTERFACE "org.mpris.MediaPlayer2.TrackList" #define MPRIS_TRACKLIST_INTERFACE "org.mpris.MediaPlayer2.TrackList"
...@@ -406,7 +407,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -406,7 +407,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* We need to resolve relative paths in this instance */ /* We need to resolve relative paths in this instance */
char *psz_mrl = make_URI( ppsz_argv[i_input], NULL ); char *psz_mrl = make_URI( ppsz_argv[i_input], NULL );
const char *psz_after_track = "/"; const char *psz_after_track = MPRIS_APPEND;
if( psz_mrl == NULL ) if( psz_mrl == NULL )
continue; continue;
...@@ -489,11 +490,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -489,11 +490,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* we unreference the connection when we've finished with it */ /* we unreference the connection when we've finished with it */
if( p_conn ) dbus_connection_unref( p_conn ); if( p_conn ) dbus_connection_unref( p_conn );
} }
#undef MPRIS_APPEND
#undef MPRIS_BUS_NAME #undef MPRIS_BUS_NAME
#undef MPRIS_OBJECT_PATH #undef MPRIS_OBJECT_PATH
#undef MPRIS_TRACKLIST_INTERFACE #undef MPRIS_TRACKLIST_INTERFACE
#endif #endif // HAVE_DBUS
/* /*
* Message queue options * Message queue options
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment