dvb/parsechannels: rename ZAP parser for clarity

This function only does ZAP parsing. Additionally, remove redundant
comment while at it.
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-10-23 22:00:30 -07:00
parent 3551d61af5
commit 6e0eb266bd

View file

@ -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, static gboolean gst_dvb_base_bin_conf_set_modulation (GstElement * dvbbasebin,
const gchar * property, GKeyFile * kf, const gchar * channel_name, const gchar * property, GKeyFile * kf, const gchar * channel_name,
const gchar * key); 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); const gchar * filename, GError ** error);
static gboolean remove_channel_from_hash (gpointer key, gpointer value, static gboolean remove_channel_from_hash (gpointer key, gpointer value,
gpointer user_data); gpointer user_data);
@ -445,10 +445,9 @@ property_error:
} }
} }
/* this will do zap style channels.conf only for the moment */
static GHashTable * static GHashTable *
parse_channels_conf_from_file (GstElement * dvbbasebin, const gchar * filename, parse_channels_conf_from_zap_file (GstElement * dvbbasebin,
GError ** error) const gchar * filename, GError ** error)
{ {
gchar *contents; gchar *contents;
gchar **lines; gchar **lines;
@ -607,7 +606,7 @@ parse_and_configure_from_zap_conf_file (GstElement * dvbbasebin,
* wrongly set here, just remove the offending * wrongly set here, just remove the offending
* g_object_set line and let dvbsrc work his magic out. */ * 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) if (!channels)
goto beach; goto beach;