mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvb/parsechannels: rename v5/zap parsers for congruency

Browse source 
Add function prototypes while at it.
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-06-21 16:08:57 -07:00
parent cf86ec5874
commit d9e0e43ca7
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/dvb/parsechannels.c
View file

@ -37,6 +37,12 @@
#include <linux/dvb/frontend.h> #include <linux/dvb/frontend.h>
static gboolean parse_and_configure_from_v5_conf_file (GstElement * dvbbasebin,
const gchar * filename, const gchar * channel_name, GError ** error);
static gboolean parse_and_configure_from_zap_conf_file (GstElement * dvbbasebin,
const gchar * filename, const gchar * channel_name, GError ** error);
GST_DEBUG_CATEGORY_EXTERN (dvb_base_bin_debug); GST_DEBUG_CATEGORY_EXTERN (dvb_base_bin_debug);
#define GST_CAT_DEFAULT dvb_base_bin_debug #define GST_CAT_DEFAULT dvb_base_bin_debug
@ -265,7 +271,7 @@ GstDvbV5ChannelsConfToPropertyMap dvbv5_prop_map[] = {
}; };
static gboolean static gboolean
parse_and_configure_from_v5_channels_conf_file (GstElement * dvbbasebin, parse_and_configure_from_v5_conf_file (GstElement * dvbbasebin,
const gchar * filename, const gchar * channel_name, GError ** error) const gchar * filename, const gchar * channel_name, GError ** error)
{ {
GKeyFile *keyfile; GKeyFile *keyfile;
@ -507,7 +513,7 @@ destroy_channels_hash (GHashTable * channels)
} }
static gboolean static gboolean
parse_and_configure_from_channels_conf_file (GstElement * dvbbasebin, parse_and_configure_from_zap_conf_file (GstElement * dvbbasebin,
const gchar * filename, const gchar * channel_name, GError ** error) const gchar * filename, const gchar * channel_name, GError ** error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
@ -790,8 +796,7 @@ set_properties_for_channel (GstElement * dvbbasebin,
if (adapter) if (adapter)
g_object_set (dvbbasebin, "adapter", atoi (adapter), NULL); g_object_set (dvbbasebin, "adapter", atoi (adapter), NULL);
if (!(ret = if (!(ret = parse_and_configure_from_v5_conf_file (dvbbasebin, filename,
parse_and_configure_from_v5_channels_conf_file (dvbbasebin, filename,
channel_name, error))) { channel_name, error))) {
/* TODO only fallback if it was a parsing error */ /* TODO only fallback if it was a parsing error */
@ -799,8 +804,7 @@ set_properties_for_channel (GstElement * dvbbasebin,
GST_DEBUG_OBJECT (dvbbasebin, "Resorting to old ZAP format file parsing"); GST_DEBUG_OBJECT (dvbbasebin, "Resorting to old ZAP format file parsing");
/* fallback to old format */ /* fallback to old format */
ret = ret = parse_and_configure_from_zap_conf_file (dvbbasebin, filename,
parse_and_configure_from_channels_conf_file (dvbbasebin, filename,
channel_name, error); channel_name, error);
} }
g_free (filename); g_free (filename);