/*****************************************************************************
* var.c: object variables for input thread
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: input.c 7955 2004-06-07 22:21:33Z fenrir $
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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.
*****************************************************************************/
/*****************************************************************************
void input_ConfigVarInit ( input_thread_t *p_input );
-
/*****************************************************************************
* Callbacks
*****************************************************************************/
vlc_value_t oldval, vlc_value_t newval, void * );
static int ESCallback ( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void * );
+static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void * );
+
static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void * );
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 );
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 );
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 );
var_Change( p_input, "program", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_input, "program", ProgramCallback, NULL );
+ /* Programs */
+ var_Create( p_input, "programs", VLC_VAR_LIST | VLC_VAR_DOINHERIT );
+ text.psz_string = _("Programs");
+ var_Change( p_input, "programs", VLC_VAR_SETTEXT, &text, NULL );
+
/* Title */
var_Create( p_input, "title", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
text.psz_string = _("Title");
text.psz_string = _("Navigation");
var_Change( p_input, "navigation", VLC_VAR_SETTEXT, &text, NULL );
+ /* Delay */
+ var_Create( p_input, "audio-delay", VLC_VAR_TIME );
+ val.i_time = 0;
+ var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
+ var_AddCallback( p_input, "audio-delay", EsDelayCallback, NULL );
+ var_Create( p_input, "spu-delay", VLC_VAR_TIME );
+ val.i_time = 0;
+ 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");
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 );
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 );
var_SetBool( p_input, "intf-change", VLC_TRUE );
+
+ /* item-change variable */
+ var_Create( p_input, "item-change", VLC_VAR_INTEGER );
}
/*****************************************************************************
var_Destroy( p_input, "time" );
var_Destroy( p_input, "time-offset" );
+ var_Destroy( p_input, "audio-delay" );
+ var_Destroy( p_input, "spu-delay" );
+
var_Destroy( p_input, "bookmark" );
var_Destroy( p_input, "program" );
vlc_value_t val2, text, text2;
int j;
- /* Add title choice */
- val2.i_int = i;
- var_Change( p_input, "title", VLC_VAR_ADDCHOICE, &val2, NULL );
-
/* Add Navigation entries */
sprintf( val.psz_string, "title %2i", i );
var_Destroy( p_input, val.psz_string );
- var_Create( p_input, val.psz_string, VLC_VAR_INTEGER|VLC_VAR_HASCHOICE|VLC_VAR_ISCOMMAND );
- var_AddCallback( p_input, val.psz_string, NavigationCallback, (void *)i );
+ var_Create( p_input, val.psz_string,
+ VLC_VAR_INTEGER|VLC_VAR_HASCHOICE|VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_input, val.psz_string,
+ NavigationCallback, (void *)i );
if( p_input->title[i]->psz_name == NULL ||
*p_input->title[i]->psz_name == '\0' )
{
- text.psz_string = malloc( strlen( _("Title %i") ) + 20 );
- sprintf( text.psz_string, _("Title %i"), i );
+ asprintf( &text.psz_string, _("Title %i"),
+ i + p_input->i_title_offset );
}
else
{
text.psz_string = strdup( p_input->title[i]->psz_name );
}
var_Change( p_input, "navigation", VLC_VAR_ADDCHOICE, &val, &text );
+
+ /* Add title choice */
+ val2.i_int = i;
+ var_Change( p_input, "title", VLC_VAR_ADDCHOICE, &val2, &text );
+
free( text.psz_string );
for( j = 0; j < p_input->title[i]->i_seekpoint; j++ )
*p_input->title[i]->seekpoint[j]->psz_name == '\0' )
{
/* Default value */
- text2.psz_string = malloc( strlen( _("Chapter %i") ) + 20 );
- sprintf( text2.psz_string, _("Chapter %i"), j );
+ asprintf( &text2.psz_string, _("Chapter %i"),
+ j + p_input->i_seekpoint_offset );
}
else
{
- text2.psz_string = strdup( p_input->title[i]->seekpoint[j]->psz_name );
+ text2.psz_string =
+ strdup( p_input->title[i]->seekpoint[j]->psz_name );
}
- var_Change( p_input, val.psz_string, VLC_VAR_ADDCHOICE, &val2, &text2 );
+ var_Change( p_input, val.psz_string, VLC_VAR_ADDCHOICE,
+ &val2, &text2 );
if( text2.psz_string ) free( text2.psz_string );
}
int i;
/* Create/Destroy command variables */
- if( t->i_seekpoint > 1 )
+ if( t->i_seekpoint <= 1 )
+ {
+ var_Destroy( p_input, "next-chapter" );
+ var_Destroy( p_input, "prev-chapter" );
+ }
+ else if( var_Get( p_input, "next-chapter", &val ) != VLC_SUCCESS )
{
vlc_value_t text;
var_Change( p_input, "prev-chapter", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_input, "prev-chapter", SeekpointCallback, NULL );
}
- else
- {
- var_Destroy( p_input, "next-chapter" );
- var_Destroy( p_input, "prev-chapter" );
- }
/* Build chapter list */
var_Change( p_input, "chapter", VLC_VAR_CLEARCHOICES, NULL, NULL );
for( i = 0; i < t->i_seekpoint; i++ )
{
- val.i_int = i + 1;
- var_Change( p_input, "chapter", VLC_VAR_ADDCHOICE, &val, NULL );
+ vlc_value_t text;
+ val.i_int = i;
+
+ if( t->seekpoint[i]->psz_name == NULL ||
+ *t->seekpoint[i]->psz_name == '\0' )
+ {
+ /* Default value */
+ asprintf( &text.psz_string, _("Chapter %i"),
+ i + p_input->i_seekpoint_offset );
+ }
+ else
+ {
+ text.psz_string = strdup( t->seekpoint[i]->psz_name );
+ }
+
+ var_Change( p_input, "chapter", VLC_VAR_ADDCHOICE, &val, &text );
+ if( text.psz_string ) free( text.psz_string );
}
}
-
/*****************************************************************************
* input_ConfigVarInit:
* Create all config object variables
/* 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 );
+
+ 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-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
- var_Create( p_input, "spu-channel", VLC_VAR_INTEGER|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 |
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 );
var_Create( p_input, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_input, "cr-average", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_input, "clock-synchro", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+
+ var_Create( p_input, "seekable", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE; /* Fixed later*/
+ var_Change( p_input, "seekable", VLC_VAR_SETVALUE, &val, NULL );
+
+ var_Create( p_input, "input-slave", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+
+ /* */
+ 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 );
+ var_Create( p_input, "meta-author", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_input, "meta-artist", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_input, "meta-genre", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_input, "meta-copyright", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+ var_Create( p_input, "meta-description", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
+ var_Create( p_input, "meta-date", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_input, "meta-url", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
}
/*****************************************************************************
* All Callbacks:
*****************************************************************************/
-static int StateCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int StateCallback( 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;
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 )
+
+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" ) )
{
input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_SLOWER, NULL );
-
- /* Fix "rate" value */
- i_rate = var_GetInteger( p_input, "rate" ) * 2;
- if( i_rate < INPUT_RATE_MIN ) i_rate = INPUT_RATE_MIN;
- val.i_int = i_rate;
- var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
}
else if( !strcmp( psz_cmd, "rate-faster" ) )
{
input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_FASTER, NULL );
- i_rate = var_GetInteger( p_input, "rate" ) / 2;
-
- if( i_rate > INPUT_RATE_MAX ) i_rate = INPUT_RATE_MAX;
- val.i_int = i_rate;
- var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
}
else
{
}
static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+ 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, length;
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 )
+static int TimeCallback( 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, length;
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 ? */
return VLC_SUCCESS;
}
-static int ProgramCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int ProgramCallback( 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;
return VLC_SUCCESS;
}
-static int TitleCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int TitleCallback( 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, count;
}
static int SeekpointCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+ 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, count;
}
static int NavigationCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+ 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;
return VLC_SUCCESS;
}
-static int ESCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int ESCallback( 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;
return VLC_SUCCESS;
}
+static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p )
+{
+ input_thread_t *p_input = (input_thread_t*)p_this;
+
+
+ if( !strcmp( psz_cmd, "audio-delay" ) )
+ {
+ /*Change i_pts_delay to make sure es are decoded in time*/
+ if (newval.i_int < 0 || oldval.i_int < 0 )
+ {
+ p_input->i_pts_delay -= newval.i_int - oldval.i_int;
+ }
+ input_ControlPush( p_input, INPUT_CONTROL_SET_AUDIO_DELAY, &newval );
+ }
+ else if( !strcmp( psz_cmd, "spu-delay" ) )
+ input_ControlPush( p_input, INPUT_CONTROL_SET_SPU_DELAY, &newval );
+ return VLC_SUCCESS;
+}
+
static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
{
input_thread_t *p_input = (input_thread_t*)p_this;
return VLC_SUCCESS;
}
-
projects / vlc / blobdiff