summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2016-10-23 22:00:30 -0700
committerReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2016-10-23 22:00:30 -0700
commit6e0eb266bdecb4ca482607630a8944adca22c78c (patch)
tree2bc4eb11f4bfae7307da7ae521cea60b5dbb75c1
parent3551d61af5519151641d5a309293edb0f398f219 (diff)
dvb/parsechannels: rename ZAP parser for clarity
This function only does ZAP parsing. Additionally, remove redundant comment while at it.
-rw-r--r--sys/dvb/parsechannels.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dvb/parsechannels.c b/sys/dvb/parsechannels.c
index e683992ca..2e4bbe9e8 100644
--- a/sys/dvb/parsechannels.c
+++ b/sys/dvb/parsechannels.c
@@ -94,7 +94,7 @@ static gboolean gst_dvb_base_bin_conf_set_hierarchy (GstElement * dvbbasebin,
static gboolean gst_dvb_base_bin_conf_set_modulation (GstElement * dvbbasebin,
const gchar * property, GKeyFile * kf, const gchar * channel_name,
const gchar * key);
-static GHashTable *parse_channels_conf_from_file (GstElement * dvbbasebin,
+static GHashTable *parse_channels_conf_from_zap_file (GstElement * dvbbasebin,
const gchar * filename, GError ** error);
static gboolean remove_channel_from_hash (gpointer key, gpointer value,
gpointer user_data);
@@ -445,10 +445,9 @@ property_error:
}
}
-/* this will do zap style channels.conf only for the moment */
static GHashTable *
-parse_channels_conf_from_file (GstElement * dvbbasebin, const gchar * filename,
- GError ** error)
+parse_channels_conf_from_zap_file (GstElement * dvbbasebin,
+ const gchar * filename, GError ** error)
{
gchar *contents;
gchar **lines;
@@ -607,7 +606,7 @@ parse_and_configure_from_zap_conf_file (GstElement * dvbbasebin,
* wrongly set here, just remove the offending
* g_object_set line and let dvbsrc work his magic out. */
- channels = parse_channels_conf_from_file (dvbbasebin, filename, error);
+ channels = parse_channels_conf_from_zap_file (dvbbasebin, filename, error);
if (!channels)
goto beach;