Commit 21b9023e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Matroska demux: use var_Inherit

parent e83bd71d
......@@ -43,7 +43,7 @@ EbmlParser::EbmlParser( EbmlStream *es, EbmlElement *el_start, demux_t *p_demux
mi_level = 1;
mi_user_level = 1;
mb_keep = false;
mb_dummy = config_GetInt( p_demux, "mkv-use-dummy" );
mb_dummy = var_InheritInteger( p_demux, "mkv-use-dummy" );
}
EbmlParser::~EbmlParser( void )
......@@ -127,7 +127,7 @@ void EbmlParser::Reset( demux_t *p_demux )
mi_user_level = mi_level = 1;
// a little faster and cleaner
m_es->I_O().setFilePointer( static_cast<KaxSegment*>(m_el[0])->GetGlobalPosition(0) );
mb_dummy = config_GetInt( p_demux, "mkv-use-dummy" );
mb_dummy = var_InheritInteger( p_demux, "mkv-use-dummy" );
}
......
......@@ -1033,7 +1033,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters )
}
else if( MKV_IS_ID( l, KaxEditionFlagOrdered ) )
{
p_edition->b_ordered = config_GetInt( &sys.demuxer, "mkv-use-ordered-chapters" ) ? (uint8(*static_cast<KaxEditionFlagOrdered *>( l )) != 0) : 0;
p_edition->b_ordered = var_InheritInteger( &sys.demuxer, "mkv-use-ordered-chapters" ) ? (uint8(*static_cast<KaxEditionFlagOrdered *>( l )) != 0) : 0;
}
else if( MKV_IS_ID( l, KaxEditionFlagDefault ) )
{
......
......@@ -137,7 +137,7 @@ static int Open( vlc_object_t * p_this )
goto error;
}
if (config_GetInt( p_demux, "mkv-preload-local-dir" ))
if (var_InheritInteger( p_demux, "mkv-preload-local-dir" ))
{
/* get the files from the same dir from the same family (based on p_demux->psz_path) */
if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, ""))
......@@ -419,7 +419,7 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it
}
/* seek without index or without date */
if( f_percent >= 0 && (config_GetInt( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
if( f_percent >= 0 && (var_InheritInteger( p_demux, "mkv-seek-percent" ) || !p_segment->b_cues || i_date < 0 ))
{
if( p_sys->f_duration >= 0 && p_segment->b_cues )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment