X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=2dec506c85f9fa107b27549010e5f6296f636cd5;hb=3ad0ad05dc172f454c9806709e768c1a07184d1c;hp=70e3cd830cf912cc68b0a1bfe3fb47dcf98cf8fd;hpb=19ed4ded0da1415877e6d08286ca04a75242b7a6;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 70e3cd830c..2dec506c85 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -85,8 +85,6 @@ static int Input ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Playlist ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int Other ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); static int Quit ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int Intf ( vlc_object_t *, char const *, @@ -382,38 +380,6 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) ADD( "goto", INTEGER, Playlist ) ADD( "status", INTEGER, Playlist ) - /* marquee on the fly items */ - ADD( "marq-marquee", STRING, Other ) - ADD( "marq-x", INTEGER, Other ) - ADD( "marq-y", INTEGER, Other ) - ADD( "marq-position", INTEGER, Other ) - ADD( "marq-color", INTEGER, Other ) - ADD( "marq-opacity", INTEGER, Other ) - ADD( "marq-timeout", INTEGER, Other ) - ADD( "marq-size", INTEGER, Other ) - - ADD( "mosaic-alpha", INTEGER, Other ) - ADD( "mosaic-height", INTEGER, Other ) - ADD( "mosaic-width", INTEGER, Other ) - ADD( "mosaic-xoffset", INTEGER, Other ) - ADD( "mosaic-yoffset", INTEGER, Other ) - ADD( "mosaic-offsets", STRING, Other ) - ADD( "mosaic-align", INTEGER, Other ) - ADD( "mosaic-vborder", INTEGER, Other ) - ADD( "mosaic-hborder", INTEGER, Other ) - ADD( "mosaic-position", INTEGER, Other ) - ADD( "mosaic-rows", INTEGER, Other ) - ADD( "mosaic-cols", INTEGER, Other ) - ADD( "mosaic-order", STRING, Other ) - ADD( "mosaic-keep-aspect-ratio", INTEGER, Other ) - - /* logo on the fly items */ - ADD( "logo-file", STRING, Other ) - ADD( "logo-x", INTEGER, Other ) - ADD( "logo-y", INTEGER, Other ) - ADD( "logo-position", INTEGER, Other ) - ADD( "logo-transparency", INTEGER, Other ) - /* OSD menu commands */ ADD( "menu", STRING, Menu ) @@ -628,8 +594,30 @@ static void Run( intf_thread_t *p_intf ) psz_arg = ""; } + /* module specfic commands: @ */ + if( *psz_cmd == '@' && *psz_arg ) + { + /* Parse miscellaneous commands */ + char *psz_alias = psz_cmd + 1; + char *psz_mycmd = strdup( psz_arg ); + char *psz_myarg = strchr( psz_mycmd, ' ' ); + char *psz_msg; + + *psz_myarg = '\0'; + psz_myarg ++; + + var_Command( p_input, psz_alias, psz_mycmd, psz_myarg, &psz_msg ); + + + if( psz_msg ) + { + msg_rc( psz_msg ); + free( psz_msg ); + } + free( psz_mycmd ); + } /* If the user typed a registered local command, try it */ - if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND ) + else if( var_Type( p_intf, psz_cmd ) & VLC_VAR_ISCOMMAND ) { vlc_value_t val; int i_ret; @@ -841,94 +829,94 @@ static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp) { msg_rc(_("+----[ Remote control commands ]")); msg_rc( "| "); - msg_rc(_("| add XYZ . . . . . . . . . . add XYZ to playlist")); - msg_rc(_("| enqueue XYZ . . . . . . . queue XYZ to playlist")); - msg_rc(_("| playlist . . . show items currently in playlist")); - msg_rc(_("| play . . . . . . . . . . . . . . . . play stream")); - msg_rc(_("| stop . . . . . . . . . . . . . . . . stop stream")); - msg_rc(_("| next . . . . . . . . . . . . next playlist item")); - msg_rc(_("| prev . . . . . . . . . . previous playlist item")); - msg_rc(_("| goto . . . . . . . . . . . . goto item at index")); - msg_rc(_("| repeat [on|off] . . toggle playlist item repeat")); - msg_rc(_("| loop [on|off] . . . . toggle playlist item loop")); - msg_rc(_("| clear . . . . . . . . . . . clear the playlist")); - msg_rc(_("| status . . . . . . . . . current playlist status")); - msg_rc(_("| title [X] . . . . set/get title in current item")); - msg_rc(_("| title_n . . . . . . next title in current item")); - msg_rc(_("| title_p . . . . previous title in current item")); - msg_rc(_("| chapter [X] . . set/get chapter in current item")); - msg_rc(_("| chapter_n . . . . next chapter in current item")); - msg_rc(_("| chapter_p . . previous chapter in current item")); + msg_rc(_("| add XYZ . . . . . . . . . . . . add XYZ to playlist")); + msg_rc(_("| enqueue XYZ . . . . . . . . . queue XYZ to playlist")); + msg_rc(_("| playlist . . . . . show items currently in playlist")); + msg_rc(_("| play . . . . . . . . . . . . . . . . . . play stream")); + msg_rc(_("| stop . . . . . . . . . . . . . . . . . . stop stream")); + msg_rc(_("| next . . . . . . . . . . . . . . next playlist item")); + msg_rc(_("| prev . . . . . . . . . . . . previous playlist item")); + msg_rc(_("| goto . . . . . . . . . . . . . . goto item at index")); + msg_rc(_("| repeat [on|off] . . . . toggle playlist item repeat")); + msg_rc(_("| loop [on|off] . . . . . . toggle playlist item loop")); + msg_rc(_("| clear . . . . . . . . . . . . . clear the playlist")); + msg_rc(_("| status . . . . . . . . . . . current playlist status")); + msg_rc(_("| title [X] . . . . . . set/get title in current item")); + msg_rc(_("| title_n . . . . . . . . next title in current item")); + msg_rc(_("| title_p . . . . . . previous title in current item")); + msg_rc(_("| chapter [X] . . . . set/get chapter in current item")); + msg_rc(_("| chapter_n . . . . . . next chapter in current item")); + msg_rc(_("| chapter_p . . . . previous chapter in current item")); msg_rc( "| "); - msg_rc(_("| seek X . seek in seconds, for instance `seek 12'")); - msg_rc(_("| pause . . . . . . . . . . . . . . toggle pause")); - msg_rc(_("| fastforward . . . . . . . set to maximum rate")); - msg_rc(_("| rewind . . . . . . . . . . set to minimum rate")); - msg_rc(_("| faster . . . . . . . . faster playing of stream")); - msg_rc(_("| slower . . . . . . . . slower playing of stream")); - msg_rc(_("| normal . . . . . . . . normal playing of stream")); - msg_rc(_("| f [on|off] . . . . . . . . . . toggle fullscreen")); - msg_rc(_("| info . . . information about the current stream")); + msg_rc(_("| seek X . . . seek in seconds, for instance `seek 12'")); + msg_rc(_("| pause . . . . . . . . . . . . . . . . toggle pause")); + msg_rc(_("| fastforward . . . . . . . . . set to maximum rate")); + msg_rc(_("| rewind . . . . . . . . . . . . set to minimum rate")); + msg_rc(_("| faster . . . . . . . . . . faster playing of stream")); + msg_rc(_("| slower . . . . . . . . . . slower playing of stream")); + msg_rc(_("| normal . . . . . . . . . . normal playing of stream")); + msg_rc(_("| f [on|off] . . . . . . . . . . . . toggle fullscreen")); + msg_rc(_("| info . . . . . information about the current stream")); msg_rc(_("| get_time . . seconds elapsed since stream's beginning")); - msg_rc(_("| is_playing . . 1 if a stream plays, 0 otherwise")); - msg_rc(_("| get_title . . . the title of the current stream")); - msg_rc(_("| get_length . . the length of the current stream")); + msg_rc(_("| is_playing . . . . 1 if a stream plays, 0 otherwise")); + msg_rc(_("| get_title . . . . . the title of the current stream")); + msg_rc(_("| get_length . . . . the length of the current stream")); msg_rc( "| "); - msg_rc(_("| volume [X] . . . . . . . . set/get audio volume")); - msg_rc(_("| volup [X] . . . . . raise audio volume X steps")); - msg_rc(_("| voldown [X] . . . . lower audio volume X steps")); - msg_rc(_("| adev [X] . . . . . . . . . set/get audio device")); - msg_rc(_("| achan [X]. . . . . . . . set/get audio channels")); - msg_rc(_("| atrack [X] . . . . . . . . . set/get audio track")); - msg_rc(_("| vtrack [X] . . . . . . . . . set/get video track")); - msg_rc(_("| vratio [X] . . . . . set/get video aspect ratio")); - msg_rc(_("| vcrop [X] . . . . . . . . . set/get video crop")); - msg_rc(_("| vzoom [X] . . . . . . . . . set/get video zoom")); - msg_rc(_("| strack [X] . . . . . . . set/get subtitles track")); - msg_rc(_("| key [hotkey name] . . . . simulate hotkey press")); - msg_rc(_("| menu [on|off|up|down|left|right|select] use menu")); + msg_rc(_("| volume [X] . . . . . . . . . . set/get audio volume")); + msg_rc(_("| volup [X] . . . . . . . raise audio volume X steps")); + msg_rc(_("| voldown [X] . . . . . . lower audio volume X steps")); + msg_rc(_("| adev [X] . . . . . . . . . . . set/get audio device")); + msg_rc(_("| achan [X]. . . . . . . . . . set/get audio channels")); + msg_rc(_("| atrack [X] . . . . . . . . . . . set/get audio track")); + msg_rc(_("| vtrack [X] . . . . . . . . . . . set/get video track")); + msg_rc(_("| vratio [X] . . . . . . . set/get video aspect ratio")); + msg_rc(_("| vcrop [X] . . . . . . . . . . . set/get video crop")); + msg_rc(_("| vzoom [X] . . . . . . . . . . . set/get video zoom")); + msg_rc(_("| strack [X] . . . . . . . . . set/get subtitles track")); + msg_rc(_("| key [hotkey name] . . . . . . simulate hotkey press")); + msg_rc(_("| menu . . [on|off|up|down|left|right|select] use menu")); msg_rc( "| "); if (b_longhelp) { - msg_rc(_("| marq-marquee STRING . . overlay STRING in video")); - msg_rc(_("| marq-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| marq-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| marq-position #. . . .relative position control")); - msg_rc(_("| marq-color # . . . . . . . . . . font color, RGB")); - msg_rc(_("| marq-opacity # . . . . . . . . . . . . . opacity")); - msg_rc(_("| marq-timeout T. . . . . . . . . . timeout, in ms")); - msg_rc(_("| marq-size # . . . . . . . . font size, in pixels")); + msg_rc(_("| @name marq-marquee STRING . . overlay STRING in video")); + msg_rc(_("| @name marq-x X . . . . . . . . . . . .offset from left")); + msg_rc(_("| @name marq-y Y . . . . . . . . . . . . offset from top")); + msg_rc(_("| @name marq-position #. . . .relative position control")); + msg_rc(_("| @name marq-color # . . . . . . . . . . font color, RGB")); + msg_rc(_("| @name marq-opacity # . . . . . . . . . . . . . opacity")); + msg_rc(_("| @name marq-timeout T. . . . . . . . . . timeout, in ms")); + msg_rc(_("| @name marq-size # . . . . . . . . font size, in pixels")); msg_rc( "| "); - msg_rc(_("| logo-file STRING . . .the overlay file path/name")); - msg_rc(_("| logo-x X . . . . . . . . . . . .offset from left")); - msg_rc(_("| logo-y Y . . . . . . . . . . . . offset from top")); - msg_rc(_("| logo-position #. . . . . . . . relative position")); - msg_rc(_("| logo-transparency #. . . . . . . . .transparency")); + msg_rc(_("| @name logo-file STRING . . .the overlay file path/name")); + msg_rc(_("| @name logo-x X . . . . . . . . . . . .offset from left")); + msg_rc(_("| @name logo-y Y . . . . . . . . . . . . offset from top")); + msg_rc(_("| @name logo-position #. . . . . . . . relative position")); + msg_rc(_("| @name logo-transparency #. . . . . . . . .transparency")); msg_rc( "| "); - msg_rc(_("| mosaic-alpha # . . . . . . . . . . . . . . alpha")); - msg_rc(_("| mosaic-height #. . . . . . . . . . . . . .height")); - msg_rc(_("| mosaic-width # . . . . . . . . . . . . . . width")); - msg_rc(_("| mosaic-xoffset # . . . .top left corner position")); - msg_rc(_("| mosaic-yoffset # . . . .top left corner position")); - msg_rc(_("| mosaic-offsets x,y(,x,y)*. . . . list of offsets")); - msg_rc(_("| mosaic-align 0..2,4..6,8..10. . .mosaic alignment")); - msg_rc(_("| mosaic-vborder # . . . . . . . . vertical border")); - msg_rc(_("| mosaic-hborder # . . . . . . . horizontal border")); - msg_rc(_("| mosaic-position {0=auto,1=fixed} . . . .position")); - msg_rc(_("| mosaic-rows #. . . . . . . . . . .number of rows")); - msg_rc(_("| mosaic-cols #. . . . . . . . . . .number of cols")); - msg_rc(_("| mosaic-order id(,id)* . . . . order of pictures ")); - msg_rc(_("| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); + msg_rc(_("| @name mosaic-alpha # . . . . . . . . . . . . . . alpha")); + msg_rc(_("| @name mosaic-height #. . . . . . . . . . . . . .height")); + msg_rc(_("| @name mosaic-width # . . . . . . . . . . . . . . width")); + msg_rc(_("| @name mosaic-xoffset # . . . .top left corner position")); + msg_rc(_("| @name mosaic-yoffset # . . . .top left corner position")); + msg_rc(_("| @name mosaic-offsets x,y(,x,y)*. . . . list of offsets")); + msg_rc(_("| @name mosaic-align 0..2,4..6,8..10. . .mosaic alignment")); + msg_rc(_("| @name mosaic-vborder # . . . . . . . . vertical border")); + msg_rc(_("| @name mosaic-hborder # . . . . . . . horizontal border")); + msg_rc(_("| @name mosaic-position {0=auto,1=fixed} . . . .position")); + msg_rc(_("| @name mosaic-rows #. . . . . . . . . . .number of rows")); + msg_rc(_("| @name mosaic-cols #. . . . . . . . . . .number of cols")); + msg_rc(_("| @name mosaic-order id(,id)* . . . . order of pictures ")); + msg_rc(_("| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio")); msg_rc( "| "); msg_rc(_("| check-updates [newer] [equal] [older]\n" "| [undef] [info] [source] [binary] [plugin]")); msg_rc( "| "); } - msg_rc(_("| help . . . . . . . . . . . . . this help message")); - msg_rc(_("| longhelp . . . . . . . . . a longer help message")); - msg_rc(_("| logout . . . . . exit (if in socket connection)")); - msg_rc(_("| quit . . . . . . . . . . . . . . . . . quit vlc")); + msg_rc(_("| help . . . . . . . . . . . . . . . this help message")); + msg_rc(_("| longhelp . . . . . . . . . . . a longer help message")); + msg_rc(_("| logout . . . . . . . exit (if in socket connection)")); + msg_rc(_("| quit . . . . . . . . . . . . . . . . . . . quit vlc")); msg_rc( "| "); msg_rc(_("+----[ end of help ]")); } @@ -1367,7 +1355,8 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, { msg_rc( "Trying to add %s to playlist.", newval.psz_string ); playlist_AddInput( p_playlist, p_item, - PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE ); + PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE, + VLC_FALSE ); } } else if( !strcmp( psz_cmd, "enqueue" ) && @@ -1379,7 +1368,8 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, { msg_rc( "trying to enqueue %s to playlist", newval.psz_string ); playlist_AddInput( p_playlist, p_item, - PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE ); + PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE, + VLC_FALSE); } } else if( !strcmp( psz_cmd, "playlist" ) ) @@ -1436,84 +1426,6 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } -static int Other( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - intf_thread_t *p_intf = (intf_thread_t*)p_this; - vlc_object_t *p_playlist; - vlc_value_t val; - vlc_object_t *p_input; - - p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( !p_playlist ) - { - return VLC_ENOOBJ; - } - - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( !p_input ) - { - vlc_object_release( p_playlist ); - return VLC_ENOOBJ; - } - - if( p_input ) - { - var_Get( p_input, "state", &val ); - if( ( val.i_int == PAUSE_S ) || ( val.i_int == PLAYLIST_PAUSED ) ) - { - msg_rc( _("Type 'pause' to continue.") ); - vlc_object_release( p_playlist ); - vlc_object_release( p_input ); - return VLC_EGENERIC; - } - } - - /* Parse miscellaneous commands */ - { - static const char vars[] = - "marq-x\0" "marq-y\0" "marq-position\0" "marq-color\0" - "marq-opacity\0" "marq-size\0" "marq-timeout\0" - "mosaic-alpha\0" "mosaic-height\0" "mosaic-width\0" - "mosaic-xoffset\0" "mosaic-yoffset\0" "mosaic-align\0" - "mosaic-vborder\0" "mosaic-hborder\0" "mosaic-position\0" - "mosaic-rows\0" "mosaic-cols\0" "mosaic-order\0" - "mosaic-offsets\0" "mosaic-keep-aspect-ratio\0" - "logo-file\0" "logo-x\0" "logo-y\0" "logo-position\0" - "logo-transparency\0"; - const char *psz_name = NULL; - - if( newval.psz_string ) - for( psz_name = vars; *psz_name; psz_name += strlen( psz_name ) + 1 ) - { - if( strcmp( psz_name, psz_cmd ) == 0 ) - { - int i_type = var_Type( p_input->p_libvlc_global, psz_name ); - - if( i_type & VLC_VAR_INTEGER ) - { - var_SetInteger( p_input->p_libvlc_global, psz_name, - atoi( newval.psz_string ) ); - break; - } - else if( i_type & VLC_VAR_STRING ) - { - var_SetString( p_input->p_libvlc_global, psz_name, - newval.psz_string ); - break; - } - } - } - - if( *psz_name == '\0' ) - msg_rc( "Unknown command!" ); - } - - vlc_object_release( p_playlist ); - vlc_object_release( p_input ); - return VLC_SUCCESS; -} - static int Quit( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -2020,9 +1932,9 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) #endif while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH && - (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ? + (i_read = net_Read( p_intf, p_intf->p_sys->i_socket == -1 ? 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL, - (uint8_t *)p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 ) + (uint8_t *)p_buffer + *pi_size, 1, VLC_FALSE ) ) > 0 ) { if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' ) break; @@ -2031,9 +1943,17 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) } /* Connection closed */ - if( i_read == -1 ) + if( i_read <= 0 ) { - p_intf->p_sys->i_socket = -1; + if( p_intf->p_sys->i_socket != -1 ) + { + net_Close( p_intf->p_sys->i_socket ); + p_intf->p_sys->i_socket = -1; + } + else + /* Standard input closed: exit */ + p_intf->b_die = VLC_TRUE; + p_buffer[ *pi_size ] = 0; return VLC_TRUE; }