X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=c8c93c55725244e6cc833d975996ec5966768187;hb=fe85cd9a157e393e6e03decb5a474fdb929f2172;hp=2baa832c4b27aea7d431ef73f1a5e74db010de4f;hpb=6d506eaba1ce7790d28628bfd9d8fdcb2214a9b8;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 2baa832c4b..c8c93c5572 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -34,7 +34,6 @@ #include #include /* ENOMEM */ -#include #include #include @@ -48,10 +47,6 @@ #ifdef HAVE_UNISTD_H # include #endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif #include #include @@ -220,14 +215,14 @@ static int Activate( vlc_object_t *p_this ) #ifndef WIN32 #if defined(HAVE_ISATTY) /* Check that stdin is a TTY */ - if( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) + if( !var_InheritBool( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) { msg_Warn( p_intf, "fd 0 is not a TTY" ); return VLC_EGENERIC; } #endif - psz_unix_path = config_GetPsz( p_intf, "rc-unix" ); + psz_unix_path = var_InheritString( p_intf, "rc-unix" ); if( psz_unix_path ) { int i_socket; @@ -295,7 +290,7 @@ static int Activate( vlc_object_t *p_this ) #endif /* !WIN32 */ if( ( pi_socket == NULL ) && - ( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL ) + ( psz_host = var_InheritString( p_intf, "rc-host" ) ) != NULL ) { vlc_url_t url; @@ -334,7 +329,7 @@ static int Activate( vlc_object_t *p_this ) p_intf->pf_run = Run; #ifdef WIN32 - p_intf->p_sys->b_quiet = config_GetInt( p_intf, "rc-quiet" ); + p_intf->p_sys->b_quiet = var_InheritBool( p_intf, "rc-quiet" ); if( !p_intf->p_sys->b_quiet ) { CONSOLE_INTRO_MSG; } #else CONSOLE_INTRO_MSG; @@ -444,10 +439,10 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) static void Run( intf_thread_t *p_intf ) { input_thread_t * p_input = NULL; - playlist_t * p_playlist = pl_Hold( p_intf ); + playlist_t * p_playlist = pl_Get( p_intf ); char p_buffer[ MAX_LINE_LENGTH + 1 ]; - bool b_showpos = config_GetInt( p_intf, "rc-show-pos" ); + bool b_showpos = var_InheritBool( p_intf, "rc-show-pos" ); bool b_longhelp = false; int i_size = 0; @@ -463,7 +458,7 @@ static void Run( intf_thread_t *p_intf ) /* status callbacks */ /* Listen to audio volume updates */ - var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); + var_AddCallback( p_playlist, "volume-change", VolumeChanged, p_intf ); #ifdef WIN32 /* Get the file descriptor of the console input */ @@ -739,45 +734,34 @@ static void Run( intf_thread_t *p_intf ) } else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) ) { - var_SetInteger( p_intf->p_libvlc, "key-pressed", - config_GetInt( p_intf, psz_arg ) ); + var_SetInteger( p_intf->p_libvlc, "key-action", + vlc_GetActionId( psz_arg ) ); } else switch( psz_cmd[0] ) { case 'f': case 'F': + { + bool fs; + + if( !strncasecmp( psz_arg, "on", 2 ) ) + var_SetBool( p_playlist, "fullscreen", fs = true ); + else if( !strncasecmp( psz_arg, "off", 3 ) ) + var_SetBool( p_playlist, "fullscreen", fs = false ); + else + fs = var_ToggleBool( p_playlist, "fullscreen" ); + if( p_input ) { - vout_thread_t *p_vout; - p_vout = input_GetVout( p_input ); - + vout_thread_t *p_vout = input_GetVout( p_input ); if( p_vout ) { - vlc_value_t val; - bool b_update = false; - var_Get( p_vout, "fullscreen", &val ); - val.b_bool = !val.b_bool; - if( !strncmp( psz_arg, "on", 2 ) - && ( val.b_bool == true ) ) - { - b_update = true; - val.b_bool = true; - } - else if( !strncmp( psz_arg, "off", 3 ) - && ( val.b_bool == false ) ) - { - b_update = true; - val.b_bool = false; - } - else if( strncmp( psz_arg, "off", 3 ) - && strncmp( psz_arg, "on", 2 ) ) - b_update = true; - if( b_update ) var_Set( p_vout, "fullscreen", val ); + var_SetBool( p_vout, "fullscreen", fs ); vlc_object_release( p_vout ); } } break; - + } case 's': case 'S': ; @@ -805,9 +789,7 @@ static void Run( intf_thread_t *p_intf ) vlc_object_release( p_input ); } - pl_Release( p_intf ); - - var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf ); + var_DelCallback( p_playlist, "volume-change", VolumeChanged, p_intf ); vlc_restorecancel( canc ); } @@ -1886,12 +1868,12 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) /* Input */ msg_rc("%s", _("+-[Incoming]")); - msg_rc(_("| input bytes read : %8.0f kB"), - (float)(p_item->p_stats->i_read_bytes)/1000 ); + msg_rc(_("| input bytes read : %8.0f KiB"), + (float)(p_item->p_stats->i_read_bytes)/1024 ); msg_rc(_("| input bitrate : %6.0f kb/s"), (float)(p_item->p_stats->f_input_bitrate)*8000 ); - msg_rc(_("| demux bytes read : %8.0f kB"), - (float)(p_item->p_stats->i_demux_read_bytes)/1000 ); + msg_rc(_("| demux bytes read : %8.0f KiB"), + (float)(p_item->p_stats->i_demux_read_bytes)/1024 ); msg_rc(_("| demux bitrate : %6.0f kb/s"), (float)(p_item->p_stats->f_demux_bitrate)*8000 ); msg_rc(_("| demux corrupted : %5i"), @@ -1920,8 +1902,8 @@ static int updateStatistics( intf_thread_t *p_intf, input_item_t *p_item ) /* Sout */ msg_rc("%s", _("+-[Streaming]")); msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); - msg_rc(_("| bytes sent : %8.0f kB"), - (float)(p_item->p_stats->i_sent_bytes)/1000 ); + msg_rc(_("| bytes sent : %8.0f KiB"), + (float)(p_item->p_stats->i_sent_bytes)/1024 ); msg_rc(_("| sending bitrate : %6.0f kb/s"), (float)(p_item->p_stats->f_send_bitrate*8)*1000 ); msg_rc("|"); @@ -2106,7 +2088,7 @@ static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) else if( *psz_item ) { i_options++; - ppsz_options = realloc( ppsz_options, i_options * sizeof(char *) ); + ppsz_options = xrealloc( ppsz_options, i_options * sizeof(char *) ); ppsz_options[i_options - 1] = &psz_item[1]; }