mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvbbasebin: fix path where to look for the dvb-channels.conf

Browse source 
Construct path based on the API version, not $major.$minor version.
This commit is contained in:
Tim-Philipp Müller 2013-04-21 14:04:11 +01:00
parent b40c9ff39a
commit 3bacb6312c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/dvb/parsechannels.c
View file

@ -21,6 +21,10 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <stdlib.h> #include <stdlib.h>
@ -56,6 +60,8 @@ parse_channels_conf_from_file (GstElement * dvbbasebin, const gchar * filename)
GHashTable *res; GHashTable *res;
GError *err = NULL; GError *err = NULL;
GST_INFO_OBJECT (dvbbasebin, "parsing '%s'", filename);
if (!g_file_get_contents (filename, &contents, NULL, &err)) if (!g_file_get_contents (filename, &contents, NULL, &err))
goto open_fail; goto open_fail;
@ -183,11 +189,8 @@ set_properties_for_channel (GstElement * dvbbasebin, const gchar * channel_name)
filename = g_strdup (g_getenv ("GST_DVB_CHANNELS_CONF")); filename = g_strdup (g_getenv ("GST_DVB_CHANNELS_CONF"));
if (filename == NULL) { if (filename == NULL) {
guint major, minor, micro, nano; filename = g_build_filename (g_get_user_config_dir (),
"gstreamer-" GST_API_VERSION, "dvb-channels.conf", NULL);
gst_version (&major, &minor, &micro, &nano);
filename = g_strdup_printf ("%s/gstreamer-%d.%d/dvb-channels.conf",
g_get_user_config_dir (), major, minor);
} }
channels = parse_channels_conf_from_file (dvbbasebin, filename); channels = parse_channels_conf_from_file (dvbbasebin, filename);
g_free (filename); g_free (filename);