* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
- * $Id: input_programs.c,v 1.105 2003/05/04 22:42:17 gbazin Exp $
+ * $Id: input_programs.c,v 1.115 2003/07/23 22:01:25 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
vlc_value_t, vlc_value_t, void * );
static int NavigationCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int ESCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* input_InitStream: init the stream descriptor of the given input
*****************************************************************************/
int input_InitStream( input_thread_t * p_input, size_t i_data_len )
{
+ vlc_value_t text,val;
p_input->stream.i_stream_id = 0;
{
p_input->stream.p_demux_data = NULL;
}
+
+ var_Create( p_input, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "intf-change", val );
/* Create a few object variables used for navigation in the interfaces */
var_Create( p_input, "program", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Program");
+ var_Change( p_input, "program", VLC_VAR_SETTEXT, &text, NULL );
+
var_Create( p_input, "title", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Title");
+ var_Change( p_input, "title", VLC_VAR_SETTEXT, &text, NULL );
+
var_Create( p_input, "chapter", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Chapter");
+ var_Change( p_input, "chapter", VLC_VAR_SETTEXT, &text, NULL );
+
var_Create( p_input, "navigation", VLC_VAR_VARIABLE | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Navigation");
+ var_Change( p_input, "navigation", VLC_VAR_SETTEXT, &text, NULL );
+
+ var_Create( p_input, "video-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Video track");
+ var_Change( p_input, "video-es", VLC_VAR_SETTEXT, &text, NULL );
+ var_Create( p_input, "audio-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Audio track");
+ var_Change( p_input, "audio-es", VLC_VAR_SETTEXT, &text, NULL );
+ var_Create( p_input, "spu-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Subtitles track");
+ var_Change( p_input, "spu-es", VLC_VAR_SETTEXT, &text, NULL );
+
var_AddCallback( p_input, "program", ProgramCallback, NULL );
var_AddCallback( p_input, "title", TitleCallback, NULL );
var_AddCallback( p_input, "chapter", ChapterCallback, NULL );
+ var_AddCallback( p_input, "video-es", ESCallback, NULL );
+ var_AddCallback( p_input, "audio-es", ESCallback, NULL );
+ var_AddCallback( p_input, "spu-es", ESCallback, NULL );
return 0;
}
*****************************************************************************/
void input_EndStream( input_thread_t * p_input )
{
- /* Free navigation variables */
- var_Destroy( p_input, "program" );
- var_Destroy( p_input, "title" );
- var_Destroy( p_input, "chapter" );
-
/* Free all programs and associated ES, and associated decoders. */
while( p_input->stream.i_pgrm_number )
{
{
free( p_input->stream.p_demux_data );
}
+
+ /* Free navigation variables */
+ var_Destroy( p_input, "program" );
+ var_Destroy( p_input, "title" );
+ var_Destroy( p_input, "chapter" );
+ var_Destroy( p_input, "video-es" );
+ var_Destroy( p_input, "audio-es" );
+ var_Destroy( p_input, "spu-es" );
+ var_Destroy( p_input, "intf-change" );
}
/*****************************************************************************
val.psz_string = malloc( sizeof("title ") + 5 );
if( val.psz_string )
{
- vlc_value_t val2;
+ vlc_value_t val2, text, text2;
sprintf( val.psz_string, "title %2i", i_area_id );
- 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 *)(int)i_area_id );
+ 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 *)(int)i_area_id );
+
+ text.psz_string = malloc( strlen( _("Title %i") ) + 20 );
+ if( text.psz_string )
+ sprintf( text.psz_string, _("Title %i"), i_area_id );
+
+ var_Change( p_input, "navigation", VLC_VAR_ADDCHOICE, &val, &text );
+
+ if( text.psz_string ) free( text.psz_string );
- var_Change( p_input, "navigation", VLC_VAR_ADDCHOICE, &val, NULL );
+ text2.psz_string = malloc( strlen( _("Chapter %i") ) + 20 );
- for( i = 1; i <= i_part_nb; i++ )
- {
- val2.i_int = i;
- var_Change( p_input, val.psz_string,
- VLC_VAR_ADDCHOICE, &val2, NULL );
- }
+ for( i = 1; i <= i_part_nb; i++ )
+ {
+ val2.i_int = i;
+
+ if( text2.psz_string )
+ sprintf( text2.psz_string, _("Chapter %i"), i );
+
+ var_Change( p_input, val.psz_string,
+ VLC_VAR_ADDCHOICE, &val2, &text2 );
+ }
+
+ if( text2.psz_string ) free( text2.psz_string );
+ }
+
+ if( p_input->stream.i_area_nb == 2 )
+ {
+ vlc_value_t text;
+
+ /* Add another bunch of navigation object variables */
+ var_Create( p_input, "next-title", VLC_VAR_VOID );
+ text.psz_string = _("Next title");
+ var_Change( p_input, "next-title", VLC_VAR_SETTEXT, &text, NULL );
+ var_Create( p_input, "prev-title", VLC_VAR_VOID );
+ text.psz_string = _("Previous title");
+ var_Change( p_input, "prev-title", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_input, "next-title", TitleCallback, NULL );
+ var_AddCallback( p_input, "prev-title", TitleCallback, NULL );
+
+ var_Create( p_input, "next-chapter", VLC_VAR_VOID );
+ text.psz_string = _("Next Chapter");
+ var_Change( p_input, "next-chapter", VLC_VAR_SETTEXT, &text, NULL );
+ var_Create( p_input, "prev-chapter", VLC_VAR_VOID );
+ text.psz_string = _("Previous Chapter");
+ var_Change( p_input, "prev-chapter", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_input, "next-chapter", ChapterCallback, NULL );
+ var_AddCallback( p_input, "prev-chapter", ChapterCallback, NULL );
}
return p_area;
#undef p_es
}
}
+
/* Get the number of the required audio stream */
- if( config_GetInt( p_input, "audio" ) )
+ var_Get( p_input, "audio", &val );
+ if( val.b_bool )
{
/* Default is the first one */
- i_required_audio_es = config_GetInt( p_input, "audio-channel" );
+ var_Get( p_input, "audio-channel", &val );
+ i_required_audio_es = val.i_int;
if( i_required_audio_es < 0 )
{
i_required_audio_es = 1;
}
/* Same thing for subtitles */
- if( config_GetInt( p_input, "video" ) )
+ var_Get( p_input, "video", &val );
+ if( val.b_bool )
{
/* for spu, default is none */
- i_required_spu_es = config_GetInt( p_input, "spu-channel" );
+ var_Get( p_input, "spu-channel", &val );
+ i_required_spu_es = val.i_int;
if( i_required_spu_es < 0 )
{
i_required_spu_es = 0;
if( val.psz_string )
{
sprintf( val.psz_string, "title %i", p_area->i_id );
- var_Change( p_input, "navigation", VLC_VAR_DELCHOICE, &val, NULL );
- var_Destroy( p_input, val.psz_string );
+ var_Change( p_input, "navigation", VLC_VAR_DELCHOICE, &val, NULL );
+ var_Destroy( p_input, val.psz_string );
}
/* Remove this area from the stream's list of areas */
/* Free the description of this area */
free( p_area );
+
+ if( p_input->stream.i_area_nb == 1 )
+ {
+ /* Del unneeded navigation object variables */
+ var_Destroy( p_input, "next-title" );
+ var_Destroy( p_input, "prev-title" );
+ var_Destroy( p_input, "next-chapter" );
+ var_Destroy( p_input, "prev-chapter" );
+ }
}
*****************************************************************************/
es_descriptor_t * input_AddES( input_thread_t * p_input,
pgrm_descriptor_t * p_pgrm, u16 i_es_id,
+ int i_category, char const *psz_desc,
size_t i_data_len )
{
es_descriptor_t * p_es;
+ vlc_value_t val, text;
+ char *psz_var = NULL;
p_es = (es_descriptor_t *)malloc( sizeof(es_descriptor_t) );
if( p_es == NULL )
/* Init its values */
p_es->i_id = i_es_id;
- p_es->psz_desc[0] = '\0';
p_es->p_pes = NULL;
p_es->p_decoder_fifo = NULL;
- p_es->i_cat = UNKNOWN_ES;
+ p_es->i_cat = i_category;
p_es->i_demux_fd = 0;
p_es->c_packets = 0;
p_es->c_invalid_packets = 0;
p_es->p_pgrm = NULL;
}
+ switch( i_category )
+ {
+ case AUDIO_ES:
+ psz_var = "audio-es";
+ break;
+ case SPU_ES:
+ psz_var = "spu-es";
+ break;
+ case VIDEO_ES:
+ psz_var = "video-es";
+ break;
+ }
+
+ if( psz_var )
+ {
+ /* Get the number of ES already added */
+ var_Change( p_input, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int == 0 )
+ {
+ vlc_value_t val2;
+
+ /* First one, we need to add the "Disable" choice */
+ val2.i_int = -1; text.psz_string = _("Disable");
+ var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val2, &text );
+ val.i_int++;
+ }
+
+ /* Take care of the ES description */
+ if( psz_desc )
+ {
+ p_es->psz_desc = strdup( psz_desc );
+ }
+ else
+ {
+ p_es->psz_desc = malloc( strlen( _("Track %i") ) + 20 );
+ if( p_es->psz_desc )
+ sprintf( p_es->psz_desc, _("Track %i"), val.i_int );
+ }
+
+ val.i_int = p_es->i_id;
+ text.psz_string = p_es->psz_desc;
+ var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val, &text );
+ }
+ else p_es->psz_desc = NULL;
+
return p_es;
}
{
unsigned int i_index, i_es_index;
pgrm_descriptor_t * p_pgrm;
+ char * psz_var = NULL;
+ vlc_value_t val;
/* Find the ES in the ES table */
for( i_es_index = 0; i_es_index < p_input->stream.i_es_number;
return;
}
- p_pgrm = p_es->p_pgrm;
+ /* Remove es from its associated variable */
+ switch( p_es->i_cat )
+ {
+ case AUDIO_ES:
+ psz_var = "audio-es";
+ break;
+ case SPU_ES:
+ psz_var = "spu-es";
+ break;
+ case VIDEO_ES:
+ psz_var = "video-es";
+ break;
+ }
+
+ if( psz_var )
+ {
+ val.i_int = p_es->i_id;
+ var_Change( p_input, psz_var, VLC_VAR_DELCHOICE, &val, NULL );
+
+ /* Remove the "Disable" entry if needed */
+ var_Change( p_input, psz_var, VLC_VAR_CHOICESCOUNT, &val, NULL );
+ if( val.i_int == 1 )
+ {
+ val.i_int = -1;
+ var_Change( p_input, psz_var, VLC_VAR_DELCHOICE, &val, NULL );
+ }
+ }
/* Kill associated decoder, if any. */
if( p_es->p_decoder_fifo != NULL )
{
- input_EndDecoder( p_input, p_es );
+ input_UnselectES( p_input, p_es );
}
- /* Remove this ES from the description of the program if it is associated to
- * one */
+ /* Remove this ES from the description of the program if it is associated
+ * to one */
+ p_pgrm = p_es->p_pgrm;
if( p_pgrm )
{
for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ )
free( p_es->p_bitmapinfoheader );
}
+ /* Free the description string */
+ if( p_es->psz_desc != NULL )
+ {
+ free( p_es->psz_desc );
+ }
+
/* Find the ES in the ES table */
for( i_es_index = 0; i_es_index < p_input->stream.i_es_number;
i_es_index++ )
*****************************************************************************/
int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
{
+ vlc_value_t val;
+ char *psz_var = NULL;
+
if( p_es == NULL )
{
msg_Err( p_input, "nothing to do in input_SelectES" );
return -1;
}
- if( ((p_es->i_cat == VIDEO_ES) || (p_es->i_cat == SPU_ES))
- && !config_GetInt( p_input, "video" ) )
+ if( p_es->i_cat == VIDEO_ES || p_es->i_cat == SPU_ES )
{
- msg_Dbg( p_input,
- "video is disabled, not selecting ES 0x%x", p_es->i_id );
- return -1;
+ var_Get( p_input, "video", &val );
+ if( !val.b_bool )
+ {
+ msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
+ p_es->i_id );
+ return -1;
+ }
}
- if( (p_es->i_cat == AUDIO_ES) && !config_GetInt( p_input, "audio" ) )
+ if( p_es->i_cat == AUDIO_ES )
{
- msg_Dbg( p_input,
- "audio is disabled, not selecting ES 0x%x", p_es->i_id );
- return -1;
+ var_Get( p_input, "audio", &val );
+ if( !val.b_bool )
+ {
+ msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
+ p_es->i_id );
+ return -1;
+ }
}
msg_Dbg( p_input, "selecting ES 0x%x", p_es->i_id );
return -1;
}
+ /* Update the es variable without triggering a callback */
+ switch( p_es->i_cat )
+ {
+ case AUDIO_ES:
+ psz_var = "audio-es";
+ break;
+ case SPU_ES:
+ psz_var = "spu-es";
+ break;
+ case VIDEO_ES:
+ psz_var = "video-es";
+ break;
+ }
+
+ if( psz_var )
+ {
+ val.i_int = p_es->i_id;
+ var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
+ }
+
return 0;
}
*****************************************************************************/
int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
{
-
unsigned int i_index = 0;
+ vlc_value_t val;
+ char *psz_var = NULL;
if( p_es == NULL )
{
return( -1 );
}
+ /* Update the es variable without triggering a callback */
+ switch( p_es->i_cat )
+ {
+ case AUDIO_ES:
+ psz_var = "audio-es";
+ break;
+ case SPU_ES:
+ psz_var = "spu-es";
+ break;
+ case VIDEO_ES:
+ psz_var = "video-es";
+ break;
+ }
+
+ if( psz_var )
+ {
+ val.i_int = -1;
+ var_Change( p_input, psz_var, VLC_VAR_SETVALUE, &val, NULL );
+ }
+
+ /* Actually unselect the ES */
input_EndDecoder( p_input, p_es );
p_es->p_pes = NULL;
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;
if( oldval.i_int == newval.i_int )
return VLC_SUCCESS;
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "intf-change", val );
+
return VLC_SUCCESS;
}
{
input_thread_t *p_input = (input_thread_t *)p_this;
input_area_t *p_area;
+ vlc_value_t val, val_list;
+ int i, i_step = 0;
- if( oldval.i_int == newval.i_int )
- return VLC_SUCCESS;
+ if( !strcmp( psz_cmd, "next-title" ) ) i_step++;
+ else if( !strcmp( psz_cmd, "prev-title" ) ) i_step--;
+
+ if( !i_step && oldval.i_int == newval.i_int ) return VLC_SUCCESS;
- /* Sanity check should have already be done by var_Set(). */
+ /* Sanity check should have already been done by var_Set(). */
vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ if( i_step )
+ {
+ var_Get( p_this, "title", &newval );
+ var_Change( p_this, "title", VLC_VAR_GETCHOICES, &val_list, NULL );
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ if( val_list.p_list->p_values[i].i_int == newval.i_int &&
+ i + i_step >= 0 && i + i_step < val_list.p_list->i_count )
+ {
+ newval.i_int = val_list.p_list->p_values[i + i_step].i_int;
+ break;
+ }
+ }
+ var_Change( p_this, "title", VLC_VAR_FREELIST, &val_list, NULL );
+ }
+
p_area = p_input->stream.pp_areas[newval.i_int];
p_area->i_part = 1;
+
vlc_mutex_unlock( &p_input->stream.stream_lock );
+
input_ChangeArea( p_input, p_area );
input_SetStatus( p_input, INPUT_STATUS_PLAY );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "intf-change", val );
+
return VLC_SUCCESS;
}
{
input_thread_t *p_input = (input_thread_t *)p_this;
input_area_t *p_area;
+ vlc_value_t val, val_list;
+ int i, i_step = 0;
- if( oldval.i_int == newval.i_int )
- return VLC_SUCCESS;
+ if( !strcmp( psz_cmd, "next-chapter" ) ) i_step++;
+ else if( !strcmp( psz_cmd, "prev-chapter" ) ) i_step--;
+
+ if( !i_step && oldval.i_int == newval.i_int ) return VLC_SUCCESS;
- /* Sanity check will have already be done by var_Set(). */
+ /* Sanity check should have already been done by var_Set(). */
vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ if( i_step )
+ {
+ var_Get( p_this, "chapter", &newval );
+ var_Change( p_this, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL );
+ for( i = 0; i < val_list.p_list->i_count; i++ )
+ {
+ if( val_list.p_list->p_values[i].i_int == newval.i_int &&
+ i + i_step >= 0 && i + i_step < val_list.p_list->i_count )
+ {
+ newval.i_int = val_list.p_list->p_values[i + i_step].i_int;
+ break;
+ }
+ }
+ var_Change( p_this, "chapter", VLC_VAR_FREELIST, &val_list, NULL );
+ }
+
p_area = p_input->stream.p_selected_area;
p_input->stream.p_selected_area->i_part = newval.i_int;
vlc_mutex_unlock( &p_input->stream.stream_lock );
input_ChangeArea( p_input, p_area );
input_SetStatus( p_input, INPUT_STATUS_PLAY );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "intf-change", val );
+
return VLC_SUCCESS;
}
{
input_thread_t *p_input = (input_thread_t *)p_this;
uint16_t i_area_id = (int)p_data;
+ vlc_value_t val;
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.pp_areas[i_area_id]->i_part_nb ) )
{
input_area_t *p_area = p_input->stream.pp_areas[i_area_id];
- p_input->stream.p_selected_area->i_part = newval.i_int;
+ p_area->i_part = newval.i_int;
vlc_mutex_unlock( &p_input->stream.stream_lock );
input_ChangeArea( p_input, p_area );
input_SetStatus( p_input, INPUT_STATUS_PLAY );
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "intf-change", 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 )
+{
+ input_thread_t *p_input = (input_thread_t *)p_this;
+ unsigned int i;
+ vlc_value_t val;
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ /* Unselect old ES */
+ for( i = 0 ; i < p_input->stream.i_es_number ; i++ )
+ {
+ if( p_input->stream.pp_es[i]->i_id == oldval.i_int &&
+ p_input->stream.pp_es[i]->p_decoder_fifo != NULL )
+ {
+ input_UnselectES( p_input, p_input->stream.pp_es[i] );
+ }
+ }
+
+ /* Select new ES */
+ for( i = 0 ; i < p_input->stream.i_es_number ; i++ )
+ {
+ if( p_input->stream.pp_es[i]->i_id == newval.i_int &&
+ p_input->stream.pp_es[i]->p_decoder_fifo == NULL )
+ {
+ input_SelectES( p_input, p_input->stream.pp_es[i] );
+ }
+ }
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "intf-change", val );
+
return VLC_SUCCESS;
}
projects / vlc / blobdiff