vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 20 18:24:02 2011 +0200| [001cbdee9e161a95e8c1b04f572a32315840aab2] | committer: Rémi Denis-Courmont
DTV: small DVB-C fixes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=001cbdee9e161a95e8c1b04f572a32315840aab2 --- modules/access/dtv/access.c | 10 +++++----- modules/access/dtv/linux.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c index 010e7a2..55c033d 100644 --- a/modules/access/dtv/access.c +++ b/modules/access/dtv/access.c @@ -164,10 +164,6 @@ vlc_module_begin () add_integer ("dvb-frequency", 0, FREQ_TEXT, FREQ_LONGTEXT, false) change_integer_range (0, UINT64_C(0xffffffff) * 1000) change_safe () - add_string ("dvb-modulation", 0, - MODULATION_TEXT, MODULATION_LONGTEXT, false) - change_string_list (modulation_vlc, modulation_user, NULL) - change_safe () add_integer ("dvb-inversion", -1, INVERSION_TEXT, INVERSION_LONGTEXT, true) change_integer_list (inversion_vlc, auto_off_on) change_safe () @@ -195,7 +191,11 @@ vlc_module_begin () change_integer_list (hierarchy_vlc, hierarchy_user) change_safe () - set_section (N_("Cable (DVB-C) and satellite (DVB-S) parameters"), NULL) + set_section (N_("Cable and satellite parameters"), NULL) + add_string ("dvb-modulation", 0, + MODULATION_TEXT, MODULATION_LONGTEXT, false) + change_string_list (modulation_vlc, modulation_user, NULL) + change_safe () add_integer ("dvb-srate", 0, SRATE_TEXT, SRATE_LONGTEXT, false) change_integer_range (0, UINT64_C(0xffffffff)) change_safe () diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c index de98803..3320ac4 100644 --- a/modules/access/dtv/linux.c +++ b/modules/access/dtv/linux.c @@ -528,7 +528,7 @@ int dvb_set_dvbc (dvb_device_t *d, uint32_t freq, const char *modstr, unsigned mod = dvb_parse_modulation (modstr, QAM_AUTO); unsigned fec = dvb_parse_fec (fecstr); - return dvb_set_props (d, 5, DTV_CLEAR, 0, + return dvb_set_props (d, 6, DTV_CLEAR, 0, DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_AC, DTV_FREQUENCY, freq, DTV_MODULATION, mod, DTV_SYMBOL_RATE, srate, DTV_INNER_FEC, fec); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
