X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvar.c;h=f22a4d1d8d90c6f3f274097ecc0afa8753a79124;hb=905cbca56aed4e41603d5a69645023f57b94406a;hp=f2fcd15c51f0abc8bc9ba991e22c7c5eb73e3c0e;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/src/input/var.c b/src/input/var.c index f2fcd15c51..f22a4d1d8d 100644 --- a/src/input/var.c +++ b/src/input/var.c @@ -2,7 +2,7 @@ * var.c: object variables for input thread ***************************************************************************** * Copyright (C) 2004 the VideoLAN team - * $Id: input.c 7955 2004-06-07 22:21:33Z fenrir $ + * $Id$ * * Authors: Laurent Aimar * @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -40,7 +40,6 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title ); void input_ConfigVarInit ( input_thread_t *p_input ); - /***************************************************************************** * Callbacks *****************************************************************************/ @@ -94,7 +93,6 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Create( p_input, "rate-faster", VLC_VAR_VOID ); var_AddCallback( p_input, "rate-faster", RateCallback, NULL ); - /* Position */ var_Create( p_input, "position", VLC_VAR_FLOAT ); var_Create( p_input, "position-offset", VLC_VAR_FLOAT ); @@ -111,7 +109,6 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_AddCallback( p_input, "time", TimeCallback, NULL ); var_AddCallback( p_input, "time-offset", TimeCallback, NULL ); - /* Bookmark */ var_Create( p_input, "bookmark", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND ); @@ -119,7 +116,6 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Change( p_input, "bookmark", VLC_VAR_SETTEXT, &val, NULL ); var_AddCallback( p_input, "bookmark", BookmarkCallback, NULL ); - /* Program */ var_Create( p_input, "program", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); @@ -162,7 +158,6 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL ); var_AddCallback( p_input, "spu-delay", EsDelayCallback, NULL ); - /* Video ES */ var_Create( p_input, "video-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); text.psz_string = _("Video Track"); @@ -181,7 +176,6 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Change( p_input, "spu-es", VLC_VAR_SETTEXT, &text, NULL ); var_AddCallback( p_input, "spu-es", ESCallback, NULL ); - /* Special read only objects variables for intf */ var_Create( p_input, "bookmarks", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -189,8 +183,7 @@ void input_ControlVarInit ( input_thread_t *p_input ) val.i_time = 0; var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - - /* Special "intf-change" variable, it allows intf to set up a callback + /* Special "intf-change" variable, it allows intf to set up a callback * to be notified of some changes. * TODO list all changes warn by this callbacks */ var_Create( p_input, "intf-change", VLC_VAR_BOOL ); @@ -384,7 +377,6 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title ) } } - /***************************************************************************** * input_ConfigVarInit: * Create all config object variables @@ -396,6 +388,7 @@ void input_ConfigVarInit ( input_thread_t *p_input ) /* Create Object Variables for private use only */ var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); var_Create( p_input, "sub-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); @@ -403,6 +396,9 @@ void input_ConfigVarInit ( input_thread_t *p_input ) var_Create( p_input, "audio-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); var_Create( p_input, "sub-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); + var_Create( p_input, "audio-track-id", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-track-id", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT ); var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); @@ -415,6 +411,7 @@ void input_ConfigVarInit ( input_thread_t *p_input ) var_Create( p_input, "sout-all", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sout-spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_input, "sout-keep", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_input, "input-repeat", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); @@ -441,6 +438,8 @@ void input_ConfigVarInit ( input_thread_t *p_input ) /* */ var_Create( p_input, "access-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "access", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "demux", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); /* Meta */ var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -471,12 +470,11 @@ static int StateCallback( vlc_object_t *p_this, char const *psz_cmd, return VLC_EGENERIC; } + static int RateCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; - vlc_value_t val; - int i_rate; /* Problem with this way: the "rate" variable is update after the input thread do the change */ if( !strcmp( psz_cmd, "rate-slower" ) ) @@ -528,7 +526,6 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } - static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { @@ -538,7 +535,6 @@ static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd, if( !strcmp( psz_cmd, "time-offset" ) ) { input_ControlPush( p_input, INPUT_CONTROL_SET_TIME_OFFSET, &newval ); - val.i_time = var_GetTime( p_input, "time" ) + newval.i_time; if( val.i_time < 0 ) val.i_time = 0; /* TODO maybe test against i_length ? */