Skip to content

V
vlc
Commit 9afded64 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

- Append CRLF manually 

- Compiler warning fixed
parent b0aaeaa0
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 136 deletions
modules/control/rc.c
View file @ 9afded64
...@@ -129,12 +129,14 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) ...@@ -129,12 +129,14 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
{ {
va_list args; va_list args;
va_start( args, psz_fmt ); va_start( args, psz_fmt );
if( p_intf->p_sys->i_socket == -1 ) if( p_intf->p_sys->i_socket == -1 )
vprintf( psz_fmt, args ); vprintf( psz_fmt, args );
else else
{ {
net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args ); net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args );
net_Printf( VLC_OBJECT(p_intf), p_intf->p_sys->i_socket, NULL, "\r" ); net_Write( p_intf, p_intf->p_sys->i_socket, NULL, (uint8_t *)"\r\n",
2 );
} }
va_end( args ); va_end( args );
} }
...@@ -323,7 +325,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -323,7 +325,7 @@ static int Activate( vlc_object_t *p_this )
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
msg_rc( _("Remote control interface initialized, `h' for help\n") ); msg_rc( _("Remote control interface initialized, `h' for help") );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -561,8 +563,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -561,8 +563,8 @@ static void Run( intf_thread_t *p_intf )
{ {
if( !p_input->b_dead || !p_input->b_die ) if( !p_input->b_dead || !p_input->b_die )
{ {
msg_rc( STATUS_CHANGE "( New input: %s )\r\n", p_input->input.p_item->psz_uri ); msg_rc( STATUS_CHANGE "( New input: %s )", p_input->input.p_item->psz_uri );
msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", config_GetInt( p_intf, "volume" )); msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" ));
} }
var_AddCallback( p_input, "state", StateChanged, p_intf ); var_AddCallback( p_input, "state", StateChanged, p_intf );
var_AddCallback( p_input, "rate-faster", RateChanged, p_intf ); var_AddCallback( p_input, "rate-faster", RateChanged, p_intf );
...@@ -585,7 +587,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -585,7 +587,7 @@ static void Run( intf_thread_t *p_intf )
{ {
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED; p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED;
msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" ); msg_rc( STATUS_CHANGE "( stop state: 0 )" );
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
} }
} }
...@@ -598,19 +600,19 @@ static void Run( intf_thread_t *p_intf ) ...@@ -598,19 +600,19 @@ static void Run( intf_thread_t *p_intf )
(p_playlist->status.i_status == PLAYLIST_STOPPED) ) (p_playlist->status.i_status == PLAYLIST_STOPPED) )
{ {
p_intf->p_sys->i_last_state = PLAYLIST_STOPPED; p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" ); msg_rc( STATUS_CHANGE "( stop state: 0 )" );
} }
else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
(p_playlist->status.i_status == PLAYLIST_RUNNING) ) (p_playlist->status.i_status == PLAYLIST_RUNNING) )
{ {
p_intf->p_sys->i_last_state = p_playlist->status.i_status; p_intf->p_sys->i_last_state = p_playlist->status.i_status;
msg_rc( STATUS_CHANGE "( play state: 1 )\r\n" ); msg_rc( STATUS_CHANGE "( play state: 1 )" );
} }
else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) && else if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
(p_playlist->status.i_status == PLAYLIST_PAUSED) ) (p_playlist->status.i_status == PLAYLIST_PAUSED) )
{ {
p_intf->p_sys->i_last_state = p_playlist->status.i_status; p_intf->p_sys->i_last_state = p_playlist->status.i_status;
msg_rc( STATUS_CHANGE "( pause state: 2 )\r\n" ); msg_rc( STATUS_CHANGE "( pause state: 2 )" );
} }
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
} }
...@@ -621,7 +623,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -621,7 +623,7 @@ static void Run( intf_thread_t *p_intf )
if( i_oldpos != i_newpos ) if( i_oldpos != i_newpos )
{ {
i_oldpos = i_newpos; i_oldpos = i_newpos;
msg_rc( "pos: %d%%\n", i_newpos ); msg_rc( "pos: %d%%", i_newpos );
} }
} }
...@@ -660,7 +662,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -660,7 +662,7 @@ static void Run( intf_thread_t *p_intf )
val.psz_string = psz_arg; val.psz_string = psz_arg;
i_ret = var_Set( p_intf, psz_cmd, val ); i_ret = var_Set( p_intf, psz_cmd, val );
msg_rc( "%s: returned %i (%s)\n", msg_rc( "%s: returned %i (%s)",
psz_cmd, i_ret, vlc_error( i_ret ) ); psz_cmd, i_ret, vlc_error( i_ret ) );
} }
/* Or maybe it's a global command */ /* Or maybe it's a global command */
...@@ -675,7 +677,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -675,7 +677,7 @@ static void Run( intf_thread_t *p_intf )
i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val ); i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val );
if( i_ret != 0 ) if( i_ret != 0 )
{ {
msg_rc( "%s: returned %i (%s)\n", msg_rc( "%s: returned %i (%s)",
psz_cmd, i_ret, vlc_error( i_ret ) ); psz_cmd, i_ret, vlc_error( i_ret ) );
} }
} }
...@@ -699,38 +701,38 @@ static void Run( intf_thread_t *p_intf ) ...@@ -699,38 +701,38 @@ static void Run( intf_thread_t *p_intf )
info_category_t *p_category = info_category_t *p_category =
p_input->input.p_item->pp_categories[i]; p_input->input.p_item->pp_categories[i];
msg_rc( "+----[ %s ]\n", p_category->psz_name ); msg_rc( "+----[ %s ]", p_category->psz_name );
msg_rc( "| \n" ); msg_rc( "| " );
for ( j = 0; j < p_category->i_infos; j++ ) for ( j = 0; j < p_category->i_infos; j++ )
{ {
info_t *p_info = p_category->pp_infos[j]; info_t *p_info = p_category->pp_infos[j];
msg_rc( "| %s: %s\n", p_info->psz_name, msg_rc( "| %s: %s", p_info->psz_name,
p_info->psz_value ); p_info->psz_value );
} }
msg_rc( "| \n" ); msg_rc( "| " );
} }
msg_rc( "+----[ end of stream info ]\n" ); msg_rc( "+----[ end of stream info ]" );
vlc_mutex_unlock( &p_input->input.p_item->lock ); vlc_mutex_unlock( &p_input->input.p_item->lock );
} }
else else
{ {
msg_rc( "no input\n" ); msg_rc( "no input" );
} }
} }
else if( !strcmp( psz_cmd, "is_playing" ) ) else if( !strcmp( psz_cmd, "is_playing" ) )
{ {
if( ! p_input ) if( ! p_input )
{ {
msg_rc( "0\n" ); msg_rc( "0" );
} }
else else
{ {
msg_rc( "1\n" ); msg_rc( "1" );
/* FIXME: This is a hack */ /* FIXME: This is a hack */
/* Replay the current state of the system. */ /* Replay the current state of the system. */
msg_rc( STATUS_CHANGE "( New input: %s )\r\n", p_input->input.p_item->psz_uri ); msg_rc( STATUS_CHANGE "( New input: %s )", p_input->input.p_item->psz_uri );
msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", config_GetInt( p_intf, "volume" )); msg_rc( STATUS_CHANGE "( audio volume: %d )", config_GetInt( p_intf, "volume" ));
if( p_playlist ) if( p_playlist )
{ {
...@@ -738,16 +740,16 @@ static void Run( intf_thread_t *p_intf ) ...@@ -738,16 +740,16 @@ static void Run( intf_thread_t *p_intf )
switch( p_playlist->status.i_status ) switch( p_playlist->status.i_status )
{ {
case PLAYLIST_STOPPED: case PLAYLIST_STOPPED:
msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" ); msg_rc( STATUS_CHANGE "( stop state: 0 )" );
break; break;
case PLAYLIST_RUNNING: case PLAYLIST_RUNNING:
msg_rc( STATUS_CHANGE "( play state: %d )\r\n", var_GetInteger( p_input, "state" ) ); msg_rc( STATUS_CHANGE "( play state: %d )", var_GetInteger( p_input, "state" ) );
break; break;
case PLAYLIST_PAUSED: case PLAYLIST_PAUSED:
msg_rc( STATUS_CHANGE "( pause state: 2 )\r\n" ); msg_rc( STATUS_CHANGE "( pause state: 2 )" );
break; break;
default: default:
msg_rc( STATUS_CHANGE "( state unknown )\r\n" ); msg_rc( STATUS_CHANGE "( state unknown )" );
break; break;
} }
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
...@@ -758,37 +760,37 @@ static void Run( intf_thread_t *p_intf ) ...@@ -758,37 +760,37 @@ static void Run( intf_thread_t *p_intf )
{ {
if( ! p_input ) if( ! p_input )
{ {
msg_rc("0\n"); msg_rc("0");
} }
else else
{ {
vlc_value_t time; vlc_value_t time;
var_Get( p_input, "time", &time ); var_Get( p_input, "time", &time );
msg_rc( "%i\n", time.i_time / 1000000); msg_rc( "%i", time.i_time / 1000000);
} }
} }
else if( !strcmp( psz_cmd, "get_length" ) ) else if( !strcmp( psz_cmd, "get_length" ) )
{ {
if( ! p_input ) if( ! p_input )
{ {
msg_rc("0\n"); msg_rc("0");
} }
else else
{ {
vlc_value_t time; vlc_value_t time;
var_Get( p_input, "length", &time ); var_Get( p_input, "length", &time );
msg_rc( "%i\n", time.i_time / 1000000); msg_rc( "%i", time.i_time / 1000000);
} }
} }
else if( !strcmp( psz_cmd, "get_title" ) ) else if( !strcmp( psz_cmd, "get_title" ) )
{ {
if( ! p_input ) if( ! p_input )
{ {
msg_rc("\n"); msg_rc("");
} }
else else
{ {
msg_rc( "%s\n", p_input->input.p_item->psz_name ); msg_rc( "%s", p_input->input.p_item->psz_name );
} }
} }
else if( !strcmp( psz_cmd, "longhelp" ) || !strncmp( psz_cmd, "h", 1 ) else if( !strcmp( psz_cmd, "longhelp" ) || !strncmp( psz_cmd, "h", 1 )
...@@ -828,7 +830,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -828,7 +830,7 @@ static void Run( intf_thread_t *p_intf )
break; break;
default: default:
msg_rc(_("unknown command `%s', type `help' for help\n"), psz_cmd); msg_rc(_("unknown command `%s', type `help' for help"), psz_cmd);
break; break;
} }
...@@ -836,8 +838,8 @@ static void Run( intf_thread_t *p_intf ) ...@@ -836,8 +838,8 @@ static void Run( intf_thread_t *p_intf )
i_size = 0; p_buffer[0] = 0; i_size = 0; p_buffer[0] = 0;
} }
msg_rc( STATUS_CHANGE "( stop state: 0 )\r\n" ); msg_rc( STATUS_CHANGE "( stop state: 0 )" );
msg_rc( STATUS_CHANGE "( quit )\r\n" ); msg_rc( STATUS_CHANGE "( quit )" );
if( p_input ) if( p_input )
{ {
...@@ -861,85 +863,85 @@ static void Run( intf_thread_t *p_intf ) ...@@ -861,85 +863,85 @@ static void Run( intf_thread_t *p_intf )
static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
{ {
msg_rc(_("+----[ Remote control commands ]\n")); msg_rc(_("+----[ Remote control commands ]"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist\n")); msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist"));
msg_rc(_("| playlist . . . show items currently in playlist\n")); msg_rc(_("| playlist . . . show items currently in playlist"));
msg_rc(_("| play . . . . . . . . . . . . . . . . play stream\n")); msg_rc(_("| play . . . . . . . . . . . . . . . . play stream"));
msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream\n")); msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream"));
msg_rc(_("| next . . . . . . . . . . . . next playlist item\n")); msg_rc(_("| next . . . . . . . . . . . . next playlist item"));
msg_rc(_("| prev . . . . . . . . . . previous playlist item\n")); msg_rc(_("| prev . . . . . . . . . . previous playlist item"));
msg_rc(_("| goto . . . . . . . . . . . . goto item at index\n")); msg_rc(_("| goto . . . . . . . . . . . . goto item at index"));
msg_rc(_("| title [X] . . . . set/get title in current item\n")); msg_rc(_("| title [X] . . . . set/get title in current item"));
msg_rc(_("| title_n . . . . . . next title in current item\n")); msg_rc(_("| title_n . . . . . . next title in current item"));
msg_rc(_("| title_p . . . . previous title in current item\n")); msg_rc(_("| title_p . . . . previous title in current item"));
msg_rc(_("| chapter [X] . . set/get chapter in current item\n")); msg_rc(_("| chapter [X] . . set/get chapter in current item"));
msg_rc(_("| chapter_n . . . . next chapter in current item\n")); msg_rc(_("| chapter_n . . . . next chapter in current item"));
msg_rc(_("| chapter_p . . previous chapter in current item\n")); msg_rc(_("| chapter_p . . previous chapter in current item"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("| seek X . seek in seconds, for instance `seek 12'\n")); msg_rc(_("| seek X . seek in seconds, for instance `seek 12'"));
msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause\n")); msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause"));
msg_rc(_("| fastforward . . . . . . . set to maximum rate\n")); msg_rc(_("| fastforward . . . . . . . set to maximum rate"));
msg_rc(_("| rewind . . . . . . . . . . set to minimum rate\n")); msg_rc(_("| rewind . . . . . . . . . . set to minimum rate"));
msg_rc(_("| faster . . . . . . . . faster playing of stream\n")); msg_rc(_("| faster . . . . . . . . faster playing of stream"));
msg_rc(_("| slower . . . . . . . . slower playing of stream\n")); msg_rc(_("| slower . . . . . . . . slower playing of stream"));
msg_rc(_("| normal . . . . . . . . normal playing of stream\n")); msg_rc(_("| normal . . . . . . . . normal playing of stream"));
msg_rc(_("| f . . . . . . . . . . . . . . toggle fullscreen\n")); msg_rc(_("| f . . . . . . . . . . . . . . toggle fullscreen"));
msg_rc(_("| info . . . information about the current stream\n")); msg_rc(_("| info . . . information about the current stream"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("| volume [X] . . . . . . . . set/get audio volume\n")); msg_rc(_("| volume [X] . . . . . . . . set/get audio volume"));
msg_rc(_("| volup [X] . . . . . raise audio volume X steps\n")); msg_rc(_("| volup [X] . . . . . raise audio volume X steps"));
msg_rc(_("| voldown [X] . . . . lower audio volume X steps\n")); msg_rc(_("| voldown [X] . . . . lower audio volume X steps"));
msg_rc(_("| adev [X] . . . . . . . . . set/get audio device\n")); msg_rc(_("| adev [X] . . . . . . . . . set/get audio device"));
msg_rc(_("| achan [X]. . . . . . . . set/get audio channels\n")); msg_rc(_("| achan [X]. . . . . . . . set/get audio channels"));
msg_rc(_("| menu [on|off|up|down|left|right|select] use menu\n")); msg_rc(_("| menu [on|off|up|down|left|right|select] use menu"));
msg_rc( "| \n"); msg_rc( "| ");
if (b_longhelp) if (b_longhelp)
{ {
msg_rc(_("| marq-marquee STRING . . overlay STRING in video\n")); msg_rc(_("| marq-marquee STRING . . overlay STRING in video"));
msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left\n")); msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left"));
msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top\n")); msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top"));
msg_rc(_("| marq-position #. . . .relative position control\n")); msg_rc(_("| marq-position #. . . .relative position control"));
msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB\n")); msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB"));
msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity\n")); msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity"));
msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms\n")); msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms"));
msg_rc(_("| marq-size # . . . . . . . . font size, in pixels\n")); msg_rc(_("| marq-size # . . . . . . . . font size, in pixels"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("| time-format STRING . . . overlay STRING in video\n")); msg_rc(_("| time-format STRING . . . overlay STRING in video"));
msg_rc(_("| time-x X . . . . . . . . . . . .offset from left\n")); msg_rc(_("| time-x X . . . . . . . . . . . .offset from left"));
msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top\n")); msg_rc(_("| time-y Y . . . . . . . . . . . . offset from top"));
msg_rc(_("| time-position #. . . . . . . . relative position\n")); msg_rc(_("| time-position #. . . . . . . . relative position"));
msg_rc(_("| time-color # . . . . . . . . . . font color, RGB\n")); msg_rc(_("| time-color # . . . . . . . . . . font color, RGB"));
msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity\n")); msg_rc(_("| time-opacity # . . . . . . . . . . . . . opacity"));
msg_rc(_("| time-size # . . . . . . . . font size, in pixels\n")); msg_rc(_("| time-size # . . . . . . . . font size, in pixels"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("| logo-file STRING . . . the overlay file path/name\n")); msg_rc(_("| logo-file STRING . . . the overlay file path/name"));
msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left\n")); msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left"));
msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top\n")); msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top"));
msg_rc(_("| logo-position #. . . . . . . . relative position\n")); msg_rc(_("| logo-position #. . . . . . . . relative position"));
msg_rc(_("| logo-transparency #. . . . . . . . .transparency\n")); msg_rc(_("| logo-transparency #. . . . . . . . .transparency"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("| mosaic-alpha # . . . . . . . . . . . . . . alpha\n")); msg_rc(_("| mosaic-alpha # . . . . . . . . . . . . . . alpha"));
msg_rc(_("| mosaic-height #. . . . . . . . . . . . . .height\n")); msg_rc(_("| mosaic-height #. . . . . . . . . . . . . .height"));
msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width\n")); msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width"));
msg_rc(_("| mosaic-xoffset # . . . .top left corner position\n")); msg_rc(_("| mosaic-xoffset # . . . .top left corner position"));
msg_rc(_("| mosaic-yoffset # . . . .top left corner position\n")); msg_rc(_("| mosaic-yoffset # . . . .top left corner position"));
msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment\n")); msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"));
msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border\n")); msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border"));
msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border\n")); msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border"));
msg_rc(_("| mosaic-position {0=auto,1=fixed} . . . .position\n")); msg_rc(_("| mosaic-position {0=auto,1=fixed} . . . .position"));
msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows\n")); msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows"));
msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols\n")); msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols"));
msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio\n")); msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"));
msg_rc( "| \n"); msg_rc( "| ");
} }
msg_rc(_("| help . . . . . . . . . . . . . this help message\n")); msg_rc(_("| help . . . . . . . . . . . . . this help message"));
msg_rc(_("| longhelp . . . . . . . . . a longer help message\n")); msg_rc(_("| longhelp . . . . . . . . . a longer help message"));
msg_rc(_("| logout . . . . . exit (if in socket connection)\n")); msg_rc(_("| logout . . . . . exit (if in socket connection)"));
msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc\n")); msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc"));
msg_rc( "| \n"); msg_rc( "| ");
msg_rc(_("+----[ end of help ]\n")); msg_rc(_("+----[ end of help ]"));
} }
/******************************************************************** /********************************************************************
...@@ -955,7 +957,7 @@ static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd, ...@@ -955,7 +957,7 @@ static int TimeOffsetChanged( vlc_object_t *p_this, char const *psz_cmd,
p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input ) if( p_input )
{ {
msg_rc( STATUS_CHANGE "( time-offset: %d )\r\n", var_GetInteger( p_input, "time-offset" ) ); msg_rc( STATUS_CHANGE "( time-offset: %d )", var_GetInteger( p_input, "time-offset" ) );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
vlc_mutex_unlock( &p_intf->p_sys->status_lock ); vlc_mutex_unlock( &p_intf->p_sys->status_lock );
...@@ -968,7 +970,7 @@ static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd, ...@@ -968,7 +970,7 @@ static int VolumeChanged( vlc_object_t *p_this, char const *psz_cmd,
intf_thread_t *p_intf = (intf_thread_t*)p_data; intf_thread_t *p_intf = (intf_thread_t*)p_data;
vlc_mutex_lock( &p_intf->p_sys->status_lock ); vlc_mutex_lock( &p_intf->p_sys->status_lock );
msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", newval.i_int ); msg_rc( STATUS_CHANGE "( audio volume: %d )", newval.i_int );
vlc_mutex_unlock( &p_intf->p_sys->status_lock ); vlc_mutex_unlock( &p_intf->p_sys->status_lock );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -1003,7 +1005,7 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1003,7 +1005,7 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
cmd[5] = '\0'; cmd[5] = '\0';
break; break;
} /* var_GetInteger( p_input, "state" ) */ } /* var_GetInteger( p_input, "state" ) */
msg_rc( STATUS_CHANGE "( %s state: %d )\r\n", &cmd[0], newval.i_int ); msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
vlc_object_release( p_input ); vlc_object_release( p_input );
...@@ -1022,7 +1024,7 @@ static int RateChanged( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1022,7 +1024,7 @@ static int RateChanged( vlc_object_t *p_this, char const *psz_cmd,
p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input ) if( p_input )
{ {
msg_rc( STATUS_CHANGE "( new rate: %d )\r\n", var_GetInteger( p_input, "rate" ) ); msg_rc( STATUS_CHANGE "( new rate: %d )", var_GetInteger( p_input, "rate" ) );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
vlc_mutex_unlock( &p_intf->p_sys->status_lock ); vlc_mutex_unlock( &p_intf->p_sys->status_lock );
...@@ -1046,7 +1048,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1046,7 +1048,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( psz_cmd, "pause" ) != 0 ) ) ( strcmp( psz_cmd, "pause" ) != 0 ) )
{ {
msg_rc( _("press pause to continue\r\n") ); msg_rc( _("press pause to continue") );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1136,7 +1138,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1136,7 +1138,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
var_Get( p_input, "chapter", &val ); var_Get( p_input, "chapter", &val );
var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, var_Change( p_input, "chapter", VLC_VAR_GETCHOICES,
&val_list, NULL ); &val_list, NULL );
msg_rc( "Currently playing chapter %d/%d\n", msg_rc( "Currently playing chapter %d/%d",
val.i_int, val_list.p_list->i_count ); val.i_int, val_list.p_list->i_count );
var_Change( p_this, "chapter", VLC_VAR_FREELIST, var_Change( p_this, "chapter", VLC_VAR_FREELIST,
&val_list, NULL ); &val_list, NULL );
...@@ -1176,7 +1178,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1176,7 +1178,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
var_Get( p_input, "title", &val ); var_Get( p_input, "title", &val );
var_Change( p_input, "title", VLC_VAR_GETCHOICES, var_Change( p_input, "title", VLC_VAR_GETCHOICES,
&val_list, NULL ); &val_list, NULL );
msg_rc( "Currently playing title %d/%d\n", msg_rc( "Currently playing title %d/%d",
val.i_int, val_list.p_list->i_count ); val.i_int, val_list.p_list->i_count );
var_Change( p_this, "title", VLC_VAR_FREELIST, var_Change( p_this, "title", VLC_VAR_FREELIST,
&val_list, NULL ); &val_list, NULL );
...@@ -1222,7 +1224,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1222,7 +1224,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( psz_cmd, "pause" ) != 0 ) ) ( strcmp( psz_cmd, "pause" ) != 0 ) )
{ {
msg_rc( _("press pause to continue\r\n") ); msg_rc( _("press pause to continue") );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1274,7 +1276,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1274,7 +1276,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
if( p_item ) if( p_item )
{ {
msg_rc( "trying to add %s to playlist\n", newval.psz_string ); msg_rc( "trying to add %s to playlist", newval.psz_string );
playlist_AddItem( p_playlist, p_item, playlist_AddItem( p_playlist, p_item,
PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END ); PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
} }
...@@ -1284,7 +1286,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1284,7 +1286,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
int i; int i;
for ( i = 0; i < p_playlist->i_size; i++ ) for ( i = 0; i < p_playlist->i_size; i++ )
{ {
msg_rc( "|%s%s %s|%s|\n", i == p_playlist->i_index ? "*" : " ", msg_rc( "|%s%s %s|%s|", i == p_playlist->i_index ? "*" : " ",
p_playlist->pp_items[i]->input.psz_name, p_playlist->pp_items[i]->input.psz_name,
p_playlist->pp_items[i]->input.psz_uri, p_playlist->pp_items[i]->input.psz_uri,
p_playlist->pp_items[i]->i_parents > 0 ? p_playlist->pp_items[i]->i_parents > 0 ?
...@@ -1292,7 +1294,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1292,7 +1294,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
} }
if ( i == 0 ) if ( i == 0 )
{ {
msg_rc( "| no entries\n" ); msg_rc( "| no entries" );
} }
} }
...@@ -1301,7 +1303,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1301,7 +1303,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
*/ */
else else
{ {
msg_rc( "unknown command!\n" ); msg_rc( "unknown command!" );
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
...@@ -1335,7 +1337,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1335,7 +1337,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( psz_cmd, "pause" ) != 0 ) ) ( strcmp( psz_cmd, "pause" ) != 0 ) )
{ {
msg_rc( _("press pause to continue\r\n") ); msg_rc( _("press pause to continue") );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -1615,7 +1617,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1615,7 +1617,7 @@ static int Other( vlc_object_t *p_this, char const *psz_cmd,
*/ */
else else
{ {
msg_rc( "unknown command!\n" ); msg_rc( "unknown command!" );
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
...@@ -1670,7 +1672,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1670,7 +1672,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
audio_volume_t i_volume = atoi( newval.psz_string ); audio_volume_t i_volume = atoi( newval.psz_string );
if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) ) if ( (i_volume > (audio_volume_t)AOUT_VOLUME_MAX) )
{ {
msg_rc( "Volume must be in the range %d-%d\n", AOUT_VOLUME_MIN, msg_rc( "Volume must be in the range %d-%d", AOUT_VOLUME_MIN,
AOUT_VOLUME_MAX ); AOUT_VOLUME_MAX );
i_error = VLC_EBADVAR; i_error = VLC_EBADVAR;
} }
...@@ -1696,7 +1698,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1696,7 +1698,7 @@ static int Volume( vlc_object_t *p_this, char const *psz_cmd,
} }
else else
{ {
msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", i_volume ); msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
i_error = VLC_SUCCESS; i_error = VLC_SUCCESS;
} }
} }
...@@ -1730,7 +1732,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1730,7 +1732,7 @@ static int VolumeMove( vlc_object_t *p_this, char const *psz_cmd,
osd_VolumeDown( p_this ); osd_VolumeDown( p_this );
} }
if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )\r\n", i_volume ); if ( !i_error ) msg_rc( STATUS_CHANGE "( audio volume: %d )", i_volume );
return i_error; return i_error;
} }
...@@ -1780,19 +1782,19 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1780,19 +1782,19 @@ static int AudioConfig( vlc_object_t *p_this, char const *psz_cmd,
return VLC_EGENERIC; return VLC_EGENERIC;
} }
msg_rc( "+----[ %s ]\n", val_name.psz_string ); msg_rc( "+----[ %s ]", val_name.psz_string );
for ( i = 0; i < val.p_list->i_count; i++ ) for ( i = 0; i < val.p_list->i_count; i++ )
{ {
if ( i_value == val.p_list->p_values[i].i_int ) if ( i_value == val.p_list->p_values[i].i_int )
msg_rc( "| %i - %s *\n", val.p_list->p_values[i].i_int, msg_rc( "| %i - %s *", val.p_list->p_values[i].i_int,
text.p_list->p_values[i].psz_string ); text.p_list->p_values[i].psz_string );
else else
msg_rc( "| %i - %s\n", val.p_list->p_values[i].i_int, msg_rc( "| %i - %s", val.p_list->p_values[i].i_int,
text.p_list->p_values[i].psz_string ); text.p_list->p_values[i].psz_string );
} }
var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST, var_Change( (vlc_object_t *)p_aout, psz_variable, VLC_VAR_FREELIST,
&val, &text ); &val, &text );
msg_rc( "+----[ end of %s ]\n", val_name.psz_string ); msg_rc( "+----[ end of %s ]", val_name.psz_string );
if( val_name.psz_string ) free( val_name.psz_string ); if( val_name.psz_string ) free( val_name.psz_string );
i_error = VLC_SUCCESS; i_error = VLC_SUCCESS;
...@@ -1820,7 +1822,8 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1820,7 +1822,8 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
if ( !*newval.psz_string ) if ( !*newval.psz_string )
{ {
msg_rc( "please provide one of the following paramaters\r\n[on|off|up|down|left|right|select]\r\n" ); msg_rc( _("please provide one of the following paramaters") );
msg_rc( "[on|off|up|down|left|right|select]" );
return i_error; return i_error;
} }
...@@ -1834,7 +1837,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1834,7 +1837,7 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) && if( ( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) &&
( strcmp( newval.psz_string, "select" ) != 0 ) ) ( strcmp( newval.psz_string, "select" ) != 0 ) )
{ {
msg_rc( _("press menu select to continue\r\n") ); msg_rc( _("press menu select to continue") );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1858,7 +1861,8 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1858,7 +1861,8 @@ static int Menu( vlc_object_t *p_this, char const *psz_cmd,
osd_MenuActivate( p_this ); osd_MenuActivate( p_this );
else else
{ {
msg_rc( "please provide one of the following paramaters\r\n[on|off|up|down|left|right|select]\r\n" ); msg_rc( _("please provide one of the following paramaters") );
msg_rc( "[on|off|up|down|left|right|select]" );
if( val.psz_string ) free( val.psz_string ); if( val.psz_string ) free( val.psz_string );
return i_error; return i_error;
} }
...@@ -1951,7 +1955,7 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) ...@@ -1951,7 +1955,7 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH && while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
(i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ? (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?
0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL, 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL,
p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
{ {
if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
break; break;
......
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