vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 11 17:46:44 2012 +0200| [fd122ba2010fd42f5e2ad33bfbec8d79f9587291] | committer: Rémi Denis-Courmont
Linux DVB: distinguish Clear QAM from terrestrial ATSC This will be needed for proper DVBv5.5 support. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fd122ba2010fd42f5e2ad33bfbec8d79f9587291 --- modules/access/dtv/dtv.h | 1 + modules/access/dtv/linux.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/access/dtv/dtv.h b/modules/access/dtv/dtv.h index 3cf6503..66887b5 100644 --- a/modules/access/dtv/dtv.h +++ b/modules/access/dtv/dtv.h @@ -28,6 +28,7 @@ extern "C" { enum { ATSC = 0x00000001, + CQAM = 0x00000002, DVB_C = 0x00000010, DVB_C2 = 0x00000020, diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c index c6994ae..2c7cf10 100644 --- a/modules/access/dtv/linux.c +++ b/modules/access/dtv/linux.c @@ -460,7 +460,7 @@ static unsigned dvb_probe_frontend (dvb_device_t *d, int fd) case FE_QPSK: systems = DVB_S; break; case FE_QAM: systems = DVB_C; break; case FE_OFDM: systems = DVB_T; break; - case FE_ATSC: systems = ATSC; break; + case FE_ATSC: systems = ATSC | CQAM; break; default: systems = 0; msg_Err (d->obj, "unknown frontend type %u", info.type); @@ -1032,7 +1032,7 @@ int dvb_set_cqam (dvb_device_t *d, uint32_t freq, const char *modstr) { unsigned mod = dvb_parse_modulation (modstr, QAM_AUTO); - if (dvb_find_frontend (d, ATSC)) + if (dvb_find_frontend (d, CQAM)) return -1; return dvb_set_props (d, 4, DTV_CLEAR, 0, DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_B, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
