Skip to content

V
vlc-1.1
Commit ca0ada33 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Fix broken status command on rc interface

parent 71391376
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
modules/control/rc.c
View file @ ca0ada33
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include <vlc/aout.h> #include <vlc/aout.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#include <vlc_video.h>
#include <vlc_osd.h> #include <vlc_osd.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
...@@ -378,6 +379,8 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) ...@@ -378,6 +379,8 @@ static void RegisterCallbacks( intf_thread_t *p_intf )
var_AddCallback( p_intf, "next", Playlist, NULL ); var_AddCallback( p_intf, "next", Playlist, NULL );
var_Create( p_intf, "goto", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); var_Create( p_intf, "goto", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "goto", Playlist, NULL ); var_AddCallback( p_intf, "goto", Playlist, NULL );
var_Create( p_intf, "status", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "status", Playlist, NULL );
/* marquee on the fly items */ /* marquee on the fly items */
var_Create( p_intf, "marq-marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND ); var_Create( p_intf, "marq-marquee", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
...@@ -861,6 +864,7 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) ...@@ -861,6 +864,7 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
msg_rc(_("| next . . . . . . . . . . . . next playlist item")); msg_rc(_("| next . . . . . . . . . . . . next playlist item"));
msg_rc(_("| prev . . . . . . . . . . previous playlist item")); msg_rc(_("| prev . . . . . . . . . . previous playlist item"));
msg_rc(_("| goto . . . . . . . . . . . . goto item at index")); msg_rc(_("| goto . . . . . . . . . . . . goto item at index"));
msg_rc(_("| status . . . . . . . . . current playlist status"));
msg_rc(_("| title [X] . . . . set/get title in current item")); msg_rc(_("| title [X] . . . . set/get title in current item"));
msg_rc(_("| title_n . . . . . . next title in current item")); msg_rc(_("| title_n . . . . . . next title in current item"));
msg_rc(_("| title_p . . . . previous title in current item")); msg_rc(_("| title_p . . . . previous title in current item"));
...@@ -1285,7 +1289,9 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1285,7 +1289,9 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
msg_rc( "| no entries" ); msg_rc( "| no entries" );
} }
} }
else if( !strcmp( newval.psz_string, "status" ) ) else if( !strcmp( psz_cmd, "status" ) )
{
if( p_playlist->p_input )
{ {
/* Replay the current state of the system. */ /* Replay the current state of the system. */
msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri ); msg_rc( STATUS_CHANGE "( New input: %s )", p_playlist->p_input->input.p_item->psz_uri );
...@@ -1309,6 +1315,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1309,6 +1315,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
} }
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
} }
}
/* /*
* sanity check * sanity check
......
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