vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Apr 29 17:21:29 2016 +0200| [3bdd49e428c19b074e399b7389ec97fbbd15207e] | committer: Francois Cartegnie
access: dvb: map scanlist delivery to scan type unused for now (dtv goal) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3bdd49e428c19b074e399b7389ec97fbbd15207e --- modules/access/dvb/scan.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c index db292e1..e5b70ba 100644 --- a/modules/access/dvb/scan.c +++ b/modules/access/dvb/scan.c @@ -731,6 +731,23 @@ static int Scan_GetNextTunerConfig( scan_t *p_scan, scan_tuner_config_t *p_cfg, p_cfg->i_bandwidth = p_entry->i_bw / 1000000; p_scan->p_current = p_scan->p_current->p_next; *pf_pos = (double) p_scan->i_index / p_scan->i_scanlist; + switch( p_entry->delivery ) + { + case DELIVERY_UNKNOWN: + break; + case DELIVERY_DVBT: + p_cfg->type = SCAN_DVB_T; + break; + case DELIVERY_DVBS: + p_cfg->type = SCAN_DVB_S; + break; + case DELIVERY_DVBC: + p_cfg->type = SCAN_DVB_C; + break; + default: + p_cfg->type = SCAN_NONE; + break; + } return VLC_SUCCESS; } @@ -1552,7 +1569,7 @@ block_t *scan_GetM3U( scan_t *p_scan ) char *psz_mrl; int i_ret = -1; - switch( p_scan->parameter.type ) + switch( s->p_mplex->cfg.type ) { case SCAN_DVB_T: i_ret = asprintf( &psz_mrl, "dvb://frequency=%d:bandwidth=%d:modulation=%d", _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
