diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2016-12-22 16:08:30 -0800 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2016-12-22 16:39:24 -0800 |
| commit | 3e519937a17b19cf5c0dbcb10b4e1f392fdaa169 (patch) | |
| tree | 82305dbae27e58c9d1d3fc215ee01976ac499ca0 /sys/dvb | |
| parent | 61b7b1856ef5f8dc37ad9198d300a75452bc4152 (diff) | |
| download | gstreamer-plugins-bad-3e519937a17b19cf5c0dbcb10b4e1f392fdaa169.tar.gz | |
dvb: move adapter number set-up by way of environment to dvbsrc
This logic did not belong to the channel configuration
parser (only used by dvbbasebin) but to dvbsrc, which
is the element directly using this value and honoring
the "adapter" property.
Allows previously non-working cases like this to work:
GST_DVB_ADAPTER=1 gst-launch-1.0 dvbsrc delsys=11 modulation=7 frequency=689000000 ! fakesink
Diffstat (limited to 'sys/dvb')
| -rw-r--r-- | sys/dvb/gstdvbsrc.c | 9 | ||||
| -rw-r--r-- | sys/dvb/parsechannels.c | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c index 3a5f682a2..94bf48fa2 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -1022,6 +1022,7 @@ static void gst_dvbsrc_init (GstDvbSrc * object) { int i = 0; + const gchar *adapter; GST_DEBUG_OBJECT (object, "Kernel DVB API version %d.%d", DVB_API_VERSION, DVB_API_VERSION_MINOR); @@ -1044,7 +1045,13 @@ gst_dvbsrc_init (GstDvbSrc * object) object->pids[0] = 8192; object->pids[1] = G_MAXUINT16; object->dvb_buffer_size = DEFAULT_DVB_BUFFER_SIZE; - object->adapter_number = DEFAULT_ADAPTER; + + adapter = g_getenv ("GST_DVB_ADAPTER"); + if (adapter) + object->adapter_number = atoi (adapter); + else + object->adapter_number = DEFAULT_ADAPTER; + object->frontend_number = DEFAULT_FRONTEND; object->diseqc_src = DEFAULT_DISEQC_SRC; object->send_diseqc = (DEFAULT_DISEQC_SRC != -1); diff --git a/sys/dvb/parsechannels.c b/sys/dvb/parsechannels.c index e1620d84c..1ecc38aea 100644 --- a/sys/dvb/parsechannels.c +++ b/sys/dvb/parsechannels.c @@ -885,7 +885,6 @@ set_properties_for_channel (GstElement * dvbbasebin, { gboolean ret = FALSE; gchar *filename; - const gchar *adapter; filename = g_strdup (g_getenv ("GST_DVB_CHANNELS_CONF")); if (filename == NULL) { @@ -893,10 +892,6 @@ set_properties_for_channel (GstElement * dvbbasebin, "gstreamer-" GST_API_VERSION, "dvb-channels.conf", NULL); } - adapter = g_getenv ("GST_DVB_ADAPTER"); - if (adapter) - g_object_set (dvbbasebin, "adapter", atoi (adapter), NULL); - switch (detect_file_format (filename)) { case CHANNEL_CONF_FORMAT_DVBV5: if (!parse_and_configure_from_v5_conf_file (dvbbasebin, filename, |