Renamed "seekable" into "can-seek" (for consistency).

diff --git a/include/vlc_input.h b/include/vlc_input.h
index d336de9d5da1051954fca8af60c66c74b9525cf4..53213f33289a36a75bea8884f803f15d089a89f6 100644 (file)
--- 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 bb6776ecbb83320b4de52efe062e923ea5054276..28ffe2fa5253d0d54163d93d9bcac91e53eea216 100644 (file)
--- 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 aaa6014197188053fe5f7eafd4186a9173f81ed0..e3df64ec412b475eeaef4ea3bf994f2d0503b224 100644 (file)
--- 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 3eaadf9bbfdab7dcdb1c96ff27ec49b94fd0d5ce..8ce9ee1d1905efacd7a818b4b10da963dbc87c6b 100644 (file)
--- 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 0fc9b90e80d3890e78f899daa61f076973fe17c4..4c2cc11ab620b45e7a8c01254ac8fed19675588a 100644 (file)
--- 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 682aa8193e4070da8b6dce3d89c8dfaf2594a43f..8a191930c215862448fdae12aec2f220a182bfc7 100644 (file)
--- 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 ff632952cb42aaf860fc91f94789363fdfc5bb7c..1570f883b3e91295dde705bdc6a07f999df51355 100644 (file)
--- 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 a3c72ab716602a0b2b8bae19754d89c026a003a9..0d0c12b8ba7352d421e9c0cea0c9ef6c6a070b34 100644 (file)
--- 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 2aeccff958ee6c77acd10313d1ea4898b0b1d8b6..83a5639e7e7d8b6f85a50d9904edfd375c547356 100644 (file)
--- 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 )