Skip to content

V
vlc
Commit fd122ba2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Linux DVB: distinguish Clear QAM from terrestrial ATSC 

This will be needed for proper DVBv5.5 support.
parent a9862530
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/access/dtv/dtv.h
View file @ fd122ba2
...@@ -28,6 +28,7 @@ extern "C" { ...@@ -28,6 +28,7 @@ extern "C" {
enum { enum {
ATSC = 0x00000001, ATSC = 0x00000001,
CQAM = 0x00000002,
DVB_C = 0x00000010, DVB_C = 0x00000010,
DVB_C2 = 0x00000020, DVB_C2 = 0x00000020,
......
modules/access/dtv/linux.c
View file @ fd122ba2
...@@ -460,7 +460,7 @@ static unsigned dvb_probe_frontend (dvb_device_t *d, int fd) ...@@ -460,7 +460,7 @@ static unsigned dvb_probe_frontend (dvb_device_t *d, int fd)
case FE_QPSK: systems = DVB_S; break; case FE_QPSK: systems = DVB_S; break;
case FE_QAM: systems = DVB_C; break; case FE_QAM: systems = DVB_C; break;
case FE_OFDM: systems = DVB_T; break; case FE_OFDM: systems = DVB_T; break;
case FE_ATSC: systems = ATSC; break; case FE_ATSC: systems = ATSC | CQAM; break;
default: default:
systems = 0; systems = 0;
msg_Err (d->obj, "unknown frontend type %u", info.type); 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) ...@@ -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); unsigned mod = dvb_parse_modulation (modstr, QAM_AUTO);
if (dvb_find_frontend (d, ATSC)) if (dvb_find_frontend (d, CQAM))
return -1; return -1;
return dvb_set_props (d, 4, DTV_CLEAR, 0, return dvb_set_props (d, 4, DTV_CLEAR, 0,
DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_B, DTV_DELIVERY_SYSTEM, SYS_DVBC_ANNEX_B,
......
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