#include <vlc/vlc.h>
#include <stdio.h>
-#include <stdlib.h>
#include <vlc_input.h>
#include <vlc_es_out.h>
#include <vlc_block.h>
+#include <vlc_aout.h>
#include "input_internal.h"
/* es to select */
int i_audio_last, i_audio_id;
int i_sub_last, i_sub_id;
+ int i_default_sub_id; /* As specified in container; if applicable */
char **ppsz_audio_language;
char **ppsz_sub_language;
var_Get( p_input, "sub-track", &val );
p_sys->i_sub_last = val.i_int;
+ p_sys->i_default_sub_id = -1;
+
if( !p_input->b_preparsing )
{
var_Get( p_input, "audio-language", &val );
}
/* Update now playing */
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- vlc_meta_SetNowPlaying( p_input->p->input.p_item->p_meta,
- p_pgrm->psz_now_playing );
- vlc_meta_SetPublisher( p_input->p->input.p_item->p_meta,
- p_pgrm->psz_publisher );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ input_item_SetNowPlaying( p_input->p->input.p_item,
+ p_pgrm->psz_now_playing );
+ input_item_SetPublisher( p_input->p->input.p_item,
+ p_pgrm->psz_publisher );
var_SetBool( p_sys->p_input, "intf-change", VLC_TRUE );
}
es_out_pgrm_t *p_pgrm = NULL;
input_thread_t *p_input = p_sys->p_input;
char *psz_cat;
- char *psz_title = NULL;
- char *psz_provider = NULL;
+ const char *psz_title = NULL;
+ const char *psz_provider = NULL;
int i;
msg_Dbg( p_input, "EsOutProgramMeta: number=%d", i_group );
/* Check against empty meta data (empty for what we handle) */
- if( !p_meta->psz_title && !p_meta->psz_nowplaying && !p_meta->psz_publisher && p_meta->i_extra <= 0 )
- return;
+ if( !vlc_meta_Get( p_meta, vlc_meta_Title) &&
+ !vlc_meta_Get( p_meta, vlc_meta_NowPlaying) &&
+ !vlc_meta_Get( p_meta, vlc_meta_Publisher) &&
+ vlc_dictionary_keys_count( &p_meta->extra_tags ) <= 0 )
+ return;
/* Find program */
for( i = 0; i < p_sys->i_pgrm; i++ )
{
p_pgrm = EsOutProgramAdd( out, i_group ); /* Create it */
/* */
- psz_title = p_meta->psz_title;
- psz_provider = p_meta->psz_publisher;
+ psz_title = vlc_meta_Get( p_meta, vlc_meta_Title);
+ psz_provider = vlc_meta_Get( p_meta, vlc_meta_Publisher);
/* Update the description text of the program */
if( psz_title && *psz_title )
}
else
{
- text.psz_string = psz_title;
+ text.psz_string = (char *)psz_title;
var_Change( p_input, "program", VLC_VAR_ADDCHOICE, &val, &text );
}
}
if( psz_provider )
{
if( p_sys->p_pgrm == p_pgrm )
- {
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- vlc_meta_SetPublisher( p_input->p->input.p_item->p_meta, psz_provider );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
- }
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _(VLC_META_PUBLISHER), psz_provider );
+ input_item_SetPublisher( p_input->p->input.p_item, psz_provider );
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat, input_MetaTypeToLocalizedString(vlc_meta_Publisher), psz_provider );
}
- for( i = 0; i < p_meta->i_extra; i++ )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _(p_meta->ppsz_extra_name[i]), p_meta->ppsz_extra_value[i] );
+ char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags );
+ for( i = 0; ppsz_all_keys[i]; i++ )
+ {
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat, _(ppsz_all_keys[i]),
+ vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) );
+ free( ppsz_all_keys[i] );
+ }
+ free( ppsz_all_keys );
free( psz_cat );
}
input_thread_t *p_input = p_sys->p_input;
es_out_pgrm_t *p_pgrm = NULL;
char *psz_cat;
- char *psz_epg;
int i;
/* Find program */
/* Update info */
psz_cat = EsOutProgramGetMetaName( p_pgrm );
#ifdef HAVE_LOCALTIME_R
- asprintf( &psz_epg, "EPG %s", psz_cat );
+ char *psz_epg;
+ if( asprintf( &psz_epg, "EPG %s", psz_cat ) == -1 )
+ psz_epg = NULL;
input_Control( p_input, INPUT_DEL_INFO, psz_epg, NULL );
msg_Dbg( p_input, "EsOutProgramEpg: number=%d name=%s", i_group, p_pgrm->p_epg->psz_name );
for( i = 0; i < p_pgrm->p_epg->i_event; i++ )
if( p_epg->p_current && p_epg->p_current->psz_name && *p_epg->p_current->psz_name )
p_pgrm->psz_now_playing = strdup( p_epg->p_current->psz_name );
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
if( p_pgrm == p_sys->p_pgrm )
- vlc_meta_SetNowPlaying( p_input->p->input.p_item->p_meta, p_pgrm->psz_now_playing );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ input_item_SetNowPlaying( p_input->p->input.p_item, p_pgrm->psz_now_playing );
if( p_pgrm->psz_now_playing )
- input_Control( p_input, INPUT_ADD_INFO, psz_cat, _(VLC_META_NOW_PLAYING), p_pgrm->psz_now_playing );
+ {
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ input_MetaTypeToLocalizedString(vlc_meta_NowPlaying),
+ p_pgrm->psz_now_playing );
+ }
else
- input_Control( p_input, INPUT_DEL_INFO, psz_cat, _(VLC_META_NOW_PLAYING) );
+ {
+ input_Control( p_input, INPUT_DEL_INFO, psz_cat,
+ input_MetaTypeToLocalizedString(vlc_meta_NowPlaying) );
+ }
free( psz_cat );
}
i_wanted = es->i_channel;
}
+ else if( p_sys->i_default_sub_id >= 0 )
+ {
+ if( es->i_id == p_sys->i_default_sub_id )
+ i_wanted = es->i_channel;
+ }
+
if( p_sys->i_sub_last >= 0 )
i_wanted = p_sys->i_sub_last;
es->i_preroll_end = -1;
}
- /* +11 -> avoid null value with non null dts/pts */
if( p_block->i_dts > 0 && (p_block->i_flags&BLOCK_FLAG_PREROLL) )
{
p_block->i_dts += i_delay;
p_block->i_rate = p_input->p->i_rate;
/* TODO handle mute */
- if( es->p_dec && ( es->fmt.i_cat != AUDIO_ES ||
- p_input->p->i_rate == INPUT_RATE_DEFAULT ) )
+ if( es->p_dec &&
+ ( es->fmt.i_cat != AUDIO_ES ||
+ ( p_input->p->i_rate >= INPUT_RATE_DEFAULT/AOUT_MAX_INPUT_RATE &&
+ p_input->p->i_rate <= INPUT_RATE_DEFAULT*AOUT_MAX_INPUT_RATE ) ) )
{
input_DecoderDecode( es->p_dec, p_block );
}
pl_Release( p_playlist );
}
return VLC_SUCCESS;
+
+ case ES_OUT_SET_DEFAULT:
+ {
+ es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+
+ if( es == NULL )
+ {
+ /*p_sys->i_default_video_id = -1;*/
+ /*p_sys->i_default_audio_id = -1;*/
+ p_sys->i_default_sub_id = -1;
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+AUDIO_ES) )
+ {
+ /*p_sys->i_default_video_id = -1;*/
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+VIDEO_ES) )
+ {
+ /*p_sys->i_default_audio_id = -1;*/
+ }
+ else if( es == (es_out_id_t*)((uint8_t*)NULL+SPU_ES) )
+ {
+ p_sys->i_default_sub_id = -1;
+ }
+ else
+ {
+ /*if( es->fmt.i_cat == VIDEO_ES )
+ p_sys->i_default_video_id = es->i_id;
+ else
+ if( es->fmt.i_cat == AUDIO_ES )
+ p_sys->i_default_audio_id = es->i_id;
+ else*/
+ if( es->fmt.i_cat == SPU_ES )
+ p_sys->i_default_sub_id = es->i_id;
+ }
+ return VLC_SUCCESS;
+ }
case ES_OUT_SET_PCR:
case ES_OUT_SET_GROUP_PCR:
i_pcr = (int64_t)va_arg( args, int64_t );
/* search program */
- /* 11 is a vodoo trick to avoid non_pcr*9/100 to be null */
input_ClockSetPCR( p_sys->p_input, &p_pgrm->clock, i_pcr );
return VLC_SUCCESS;
}
projects / vlc / blobdiff