mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-05 14:02:26 +00:00
sys/dvb/gstdvbsrc.c: Add DVB Adapter name to structure sent over bus.
Original commit message from CVS: patch by: Sebastian Pölsterl * sys/dvb/gstdvbsrc.c: Add DVB Adapter name to structure sent over bus.
This commit is contained in:
parent
d2a27c6131
commit
64cd01e7e8
3 changed files with 16 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2008-09-05 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
|
patch by: Sebastian Pölsterl
|
||||||
|
|
||||||
|
* sys/dvb/gstdvbsrc.c:
|
||||||
|
Add DVB Adapter name to structure sent over bus.
|
||||||
|
|
||||||
2008-09-02 Edward Hervey <edward.hervey@collabora.co.uk>
|
2008-09-02 Edward Hervey <edward.hervey@collabora.co.uk>
|
||||||
|
|
||||||
* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_parse_pack_start):
|
* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_parse_pack_start):
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 8d494854a6018336a80ece82ceb3df0033e2da9c
|
Subproject commit a1e554f656b1f8829dbca280c0f1bdee9dec5e48
|
|
@ -683,6 +683,7 @@ gst_dvbsrc_open_frontend (GstDvbSrc * object)
|
||||||
char *adapter_desc = NULL;
|
char *adapter_desc = NULL;
|
||||||
gchar *frontend_dev;
|
gchar *frontend_dev;
|
||||||
GstStructure *adapter_structure;
|
GstStructure *adapter_structure;
|
||||||
|
char *adapter_name = NULL;
|
||||||
|
|
||||||
frontend_dev = g_strdup_printf ("/dev/dvb/adapter%d/frontend%d",
|
frontend_dev = g_strdup_printf ("/dev/dvb/adapter%d/frontend%d",
|
||||||
object->adapter_number, object->frontend_number);
|
object->adapter_number, object->frontend_number);
|
||||||
|
@ -717,18 +718,22 @@ gst_dvbsrc_open_frontend (GstDvbSrc * object)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
adapter_name = g_strdup (fe_info.name);
|
||||||
|
|
||||||
object->adapter_type = fe_info.type;
|
object->adapter_type = fe_info.type;
|
||||||
switch (object->adapter_type) {
|
switch (object->adapter_type) {
|
||||||
case FE_QPSK:
|
case FE_QPSK:
|
||||||
adapter_desc = "DVB-S";
|
adapter_desc = "DVB-S";
|
||||||
adapter_structure = gst_structure_new ("dvb-adapter",
|
adapter_structure = gst_structure_new ("dvb-adapter",
|
||||||
"type", G_TYPE_STRING, adapter_desc,
|
"type", G_TYPE_STRING, adapter_desc,
|
||||||
|
"name", G_TYPE_STRING, adapter_name,
|
||||||
"auto-fec", G_TYPE_BOOLEAN, fe_info.caps & FE_CAN_FEC_AUTO, NULL);
|
"auto-fec", G_TYPE_BOOLEAN, fe_info.caps & FE_CAN_FEC_AUTO, NULL);
|
||||||
break;
|
break;
|
||||||
case FE_QAM:
|
case FE_QAM:
|
||||||
adapter_desc = "DVB-C";
|
adapter_desc = "DVB-C";
|
||||||
adapter_structure = gst_structure_new ("dvb-adapter",
|
adapter_structure = gst_structure_new ("dvb-adapter",
|
||||||
"type", G_TYPE_STRING, adapter_desc,
|
"type", G_TYPE_STRING, adapter_desc,
|
||||||
|
"name", G_TYPE_STRING, adapter_name,
|
||||||
"auto-inversion", G_TYPE_BOOLEAN,
|
"auto-inversion", G_TYPE_BOOLEAN,
|
||||||
fe_info.caps & FE_CAN_INVERSION_AUTO, "auto-qam", G_TYPE_BOOLEAN,
|
fe_info.caps & FE_CAN_INVERSION_AUTO, "auto-qam", G_TYPE_BOOLEAN,
|
||||||
fe_info.caps & FE_CAN_QAM_AUTO, "auto-fec", G_TYPE_BOOLEAN,
|
fe_info.caps & FE_CAN_QAM_AUTO, "auto-fec", G_TYPE_BOOLEAN,
|
||||||
|
@ -738,6 +743,7 @@ gst_dvbsrc_open_frontend (GstDvbSrc * object)
|
||||||
adapter_desc = "DVB-T";
|
adapter_desc = "DVB-T";
|
||||||
adapter_structure = gst_structure_new ("dvb-adapter",
|
adapter_structure = gst_structure_new ("dvb-adapter",
|
||||||
"type", G_TYPE_STRING, adapter_desc,
|
"type", G_TYPE_STRING, adapter_desc,
|
||||||
|
"name", G_TYPE_STRING, adapter_name,
|
||||||
"auto-inversion", G_TYPE_BOOLEAN,
|
"auto-inversion", G_TYPE_BOOLEAN,
|
||||||
fe_info.caps & FE_CAN_INVERSION_AUTO, "auto-qam", G_TYPE_BOOLEAN,
|
fe_info.caps & FE_CAN_INVERSION_AUTO, "auto-qam", G_TYPE_BOOLEAN,
|
||||||
fe_info.caps & FE_CAN_QAM_AUTO, "auto-transmission-mode",
|
fe_info.caps & FE_CAN_QAM_AUTO, "auto-transmission-mode",
|
||||||
|
@ -758,10 +764,11 @@ gst_dvbsrc_open_frontend (GstDvbSrc * object)
|
||||||
"type", G_TYPE_STRING, "unknown", NULL);
|
"type", G_TYPE_STRING, "unknown", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_INFO_OBJECT (object, "DVB card: %s ", fe_info.name);
|
GST_INFO_OBJECT (object, "DVB card: %s ", adapter_name);
|
||||||
gst_element_post_message (GST_ELEMENT_CAST (object), gst_message_new_element
|
gst_element_post_message (GST_ELEMENT_CAST (object), gst_message_new_element
|
||||||
(GST_OBJECT (object), adapter_structure));
|
(GST_OBJECT (object), adapter_structure));
|
||||||
g_free (frontend_dev);
|
g_free (frontend_dev);
|
||||||
|
g_free (adapter_name);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue