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

Construct path based on the API version, not $major.$minor version.

diff --git a/sys/dvb/parsechannels.c b/sys/dvb/parsechannels.c
index f2ffcef54b640626fe754f21b3739389b2c765de..d927ab8029f4cab11a7579ae03afbc5fd5d47b00 100644 (file)
--- a/sys/dvb/parsechannels.c
+++ b/sys/dvb/parsechannels.c
@@ -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-object.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>


@@ -56,6 +60,8 @@ parse_channels_conf_from_file (GstElement * dvbbasebin, const gchar * filename)
   GHashTable *res;
   GError *err = NULL;
 
   GHashTable *res;
   GError *err = NULL;
 

+  GST_INFO_OBJECT (dvbbasebin, "parsing '%s'", filename);
+

   if (!g_file_get_contents (filename, &contents, NULL, &err))
     goto open_fail;
 
   if (!g_file_get_contents (filename, &contents, NULL, &err))
     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"));
   if (filename == NULL) {
 
   filename = g_strdup (g_getenv ("GST_DVB_CHANNELS_CONF"));
   if (filename == NULL) {

-    guint major, minor, micro, nano;
-
-    gst_version (&major, &minor, &micro, &nano);
-    filename = g_strdup_printf ("%s/gstreamer-%d.%d/dvb-channels.conf",
-        g_get_user_config_dir (), major, minor);
+    filename = g_build_filename (g_get_user_config_dir (),
+        "gstreamer-" GST_API_VERSION, "dvb-channels.conf", NULL);

   }
   channels = parse_channels_conf_from_file (dvbbasebin, filename);
   g_free (filename);
   }
   channels = parse_channels_conf_from_file (dvbbasebin, filename);
   g_free (filename);