diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-19 14:24:27 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-19 14:24:27 +0100 |
| commit | d2774e48780a6350b7435b5975397e0234e300bf (patch) | |
| tree | 6b28f20b0c2b39422c92caaac71b936fca7989f6 /src/input/input_dvb.c | |
| parent | 15eb883def371a660ee8c9e8f47edb164d0a7feb (diff) | |
| parent | 048c41a4661a6fffc5a4842390902493eea82168 (diff) | |
| download | xine-lib-d2774e48780a6350b7435b5975397e0234e300bf.tar.gz xine-lib-d2774e48780a6350b7435b5975397e0234e300bf.tar.bz2 | |
Merge from 1.1, dropping the channels.conf patch for XDG-related reasons.
--HG--
rename : m4/_xine.m4 => m4/types.m4
rename : po/libxine1.pot => po/libxine2.pot
Diffstat (limited to 'src/input/input_dvb.c')
| -rw-r--r-- | src/input/input_dvb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index baf6b3780..e36ec14e7 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -373,6 +373,7 @@ static const Param bw_list [] = { { "BANDWIDTH_6_MHZ", BANDWIDTH_6_MHZ }, { "BANDWIDTH_7_MHZ", BANDWIDTH_7_MHZ }, { "BANDWIDTH_8_MHZ", BANDWIDTH_8_MHZ }, + { "BANDWIDTH_AUTO", BANDWIDTH_AUTO }, { NULL, 0 } }; @@ -395,6 +396,7 @@ static const Param guard_list [] = { {"GUARD_INTERVAL_1_32", GUARD_INTERVAL_1_32}, {"GUARD_INTERVAL_1_4", GUARD_INTERVAL_1_4}, {"GUARD_INTERVAL_1_8", GUARD_INTERVAL_1_8}, + {"GUARD_INTERVAL_AUTO", GUARD_INTERVAL_AUTO}, { NULL, 0 } }; @@ -403,6 +405,7 @@ static const Param hierarchy_list [] = { { "HIERARCHY_2", HIERARCHY_2 }, { "HIERARCHY_4", HIERARCHY_4 }, { "HIERARCHY_NONE", HIERARCHY_NONE }, + { "HIERARCHY_AUTO", HIERARCHY_AUTO }, { NULL, 0 } }; @@ -421,12 +424,14 @@ static const Param qam_list [] = { { "QAM_256", QAM_256 }, { "QAM_32", QAM_32 }, { "QAM_64", QAM_64 }, + { "QAM_AUTO", QAM_AUTO }, { NULL, 0 } }; static const Param transmissionmode_list [] = { { "TRANSMISSION_MODE_2K", TRANSMISSION_MODE_2K }, { "TRANSMISSION_MODE_8K", TRANSMISSION_MODE_8K }, + { "TRANSMISSION_MODE_AUTO", TRANSMISSION_MODE_AUTO }, { NULL, 0 } }; @@ -2750,7 +2755,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen) xine_config_lookup_entry(this->stream->xine, "media.dvb.gui_enabled", &gui_enabled); this->dvb_gui_enabled = gui_enabled.num_value; xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("input_dvb: DVB GUI %s\n"), this->dvb_gui_enabled ? "enabled" : "disabled"); - + xine_config_lookup_entry(this->stream->xine, "media.dvb.adapter", &adapter); if (!(tuner = tuner_init(this->class->xine,adapter.num_value))) { |