From dce569710359b2d1dcccc5e95a2ef44c231f00e3 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 23 Nov 2008 15:29:49 +0100 Subject: [PATCH] Renamed "seekable" into "can-seek" (for consistency). --- include/vlc_input.h | 2 +- modules/control/dbus.c | 2 +- modules/control/hotkeys.c | 2 +- modules/gui/macosx/controls.m | 2 +- modules/gui/macosx/intf.m | 2 +- src/control/media_player.c | 10 +++++----- src/input/input.c | 4 ++-- src/input/var.c | 4 ++-- src/input/vlmshell.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index d336de9d5d..53213f3328 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -436,7 +436,7 @@ struct input_thread_t * The read only variables are: * - "length" * - "bookmarks" - * - "seekable (if you can seek, it doesn't say if 'bar display' has be shown FIXME rename can-seek + * - "can-seek" (if you can seek, it doesn't say if 'bar display' has be shown * or not, for that check position != 0.0) * - "can-pause" * - "can-rate" diff --git a/modules/control/dbus.c b/modules/control/dbus.c index bb6776ecbb..28ffe2fa52 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -1037,7 +1037,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked ) * unconditionnaly true */ if( var_GetBool( p_input, "can-pause" ) ) i_caps |= CAPS_CAN_PAUSE; - if( var_GetBool( p_input, "seekable" ) ) + if( var_GetBool( p_input, "can-seek" ) ) i_caps |= CAPS_CAN_SEEK; vlc_object_release( p_input ); } diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index aaa6014197..e3df64ec41 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -410,7 +410,7 @@ static void Run( intf_thread_t *p_intf ) /* Input options */ else if( p_input ) { - bool b_seekable = var_GetBool( p_input, "seekable" ); + bool b_seekable = var_GetBool( p_input, "can-seek" ); int i_interval =0; if( i_action == ACTIONID_PAUSE ) diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 3eaadf9bbf..8ce9ee1d19 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -983,7 +983,7 @@ { if( p_input != NULL ) { - var_Get( p_input, "seekable", &val); + var_Get( p_input, "can-seek", &val); bEnabled = val.b_bool; } else bEnabled = FALSE; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 0fc9b90e80..4c2cc11ab6 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1513,7 +1513,7 @@ static void * manage_cleanup( void * args ) } /* seekable streams */ - b_seekable = var_GetBool( p_input, "seekable" ); + b_seekable = var_GetBool( p_input, "can-seek" ); /* check whether slow/fast motion is possible */ b_control = p_input->b_can_pace_control; diff --git a/src/control/media_player.c b/src/control/media_player.c index 682aa8193e..8a191930c2 100644 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@ -84,8 +84,8 @@ static void release_input_thread( libvlc_media_player_t *p_mi ) { vlc_event_manager_t * p_em = input_get_event_manager( p_input_thread ); vlc_event_detach( p_em, vlc_InputStateChanged, input_state_changed, p_mi ); - var_DelCallback( p_input_thread, "seekable", input_seekable_changed, p_mi ); - var_DelCallback( p_input_thread, "pausable", input_pausable_changed, p_mi ); + var_DelCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi ); + var_DelCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi ); var_DelCallback( p_input_thread, "intf-event", input_event_changed, p_mi ); /* We owned this one */ @@ -586,8 +586,8 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, vlc_event_manager_t * p_em = input_get_event_manager( p_input_thread ); vlc_event_attach( p_em, vlc_InputStateChanged, input_state_changed, p_mi ); - var_AddCallback( p_input_thread, "seekable", input_seekable_changed, p_mi ); - var_AddCallback( p_input_thread, "pausable", input_pausable_changed, p_mi ); + var_AddCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi ); + var_AddCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi ); var_AddCallback( p_input_thread, "intf-event", input_event_changed, p_mi ); vlc_mutex_unlock( &p_mi->object_lock ); @@ -1078,7 +1078,7 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi, libvlc_exception_clear( p_e ); return false; } - var_Get( p_input_thread, "seekable", &val ); + var_Get( p_input_thread, "can-seek", &val ); vlc_object_release( p_input_thread ); return val.b_bool; diff --git a/src/input/input.c b/src/input/input.c index ff632952cb..1570f883b3 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -2347,7 +2347,7 @@ static int InputSourceInit( input_thread_t *p_input, &val.b_bool ); if( ret != VLC_SUCCESS ) val.b_bool = false; - var_Set( p_input, "seekable", val ); + var_Set( p_input, "can-seek", val ); } else { @@ -2431,7 +2431,7 @@ static int InputSourceInit( input_thread_t *p_input, access_Control( in->p_access, ACCESS_CAN_SEEK, &val.b_bool ); - var_Set( p_input, "seekable", val ); + var_Set( p_input, "can-seek", val ); } if( b_master ) diff --git a/src/input/var.c b/src/input/var.c index a3c72ab716..0d0c12b8ba 100644 --- a/src/input/var.c +++ b/src/input/var.c @@ -458,8 +458,8 @@ void input_ConfigVarInit ( input_thread_t *p_input ) VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); } - var_Create( p_input, "seekable", VLC_VAR_BOOL ); - var_SetBool( p_input, "seekable", true ); /* Fixed later*/ + var_Create( p_input, "can-seek", VLC_VAR_BOOL ); + var_SetBool( p_input, "can-seek", true ); /* Fixed later*/ var_Create( p_input, "can-pause", VLC_VAR_BOOL ); var_SetBool( p_input, "can-pause", true ); /* Fixed later*/ diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c index 2aeccff958..83a5639e7e 100644 --- a/src/input/vlmshell.c +++ b/src/input/vlmshell.c @@ -1356,7 +1356,7 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media ) APPEND_INPUT_INFO( "rate", "%d", Integer ); APPEND_INPUT_INFO( "title", "%d", Integer ); APPEND_INPUT_INFO( "chapter", "%d", Integer ); - APPEND_INPUT_INFO( "seekable", "%d", Bool ); + APPEND_INPUT_INFO( "can-seek", "%d", Bool ); } #undef APPEND_INPUT_INFO if( asprintf( &psz_tmp, "%d", p_instance->i_index + 1 ) != -1 ) -- 2.39.2