ext/timidity/gstwildmidi.c: If WILDMIDI_CFG is not defined, define it to the default...

Original commit message from CVS:
* ext/timidity/gstwildmidi.c:
If WILDMIDI_CFG is not defined, define it to the default
timidity configure file.

diff --git a/ChangeLog b/ChangeLog
index bc2a9b6c674fefc66d458e5919e54df7d48ea624..963d780ec617dfc1b5b524deb60f89849f9876f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * ext/timidity/gstwildmidi.c:
+       If WILDMIDI_CFG is not defined, define it to the default
+       timidity configure file.
+
 2008-02-22  Sebastian Dröge  <slomo@circular-chaos.org>
 
        Based on a patch by:

diff --git a/common b/common
index 2a19465fdb43a75f4d32950fd2beb1beb950eec2..84c6d3efac27669ad45856ebe84a17d33359dc36 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2a19465fdb43a75f4d32950fd2beb1beb950eec2
+Subproject commit 84c6d3efac27669ad45856ebe84a17d33359dc36

diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index e975a18ad9a1a28c90b4dc4d72ed6d2231c55457..80259a9096fb277e57f142db52a0d561e2c211f3 100644 (file)
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -58,6 +58,10 @@
 
 #include "gstwildmidi.h"
 
+#ifndef WILDMIDI_CFG
+#define WILDMIDI_CFG "/etc/timidity.cfg"
+#endif
+
 GST_DEBUG_CATEGORY_STATIC (gst_wildmidi_debug);
 #define GST_CAT_DEFAULT gst_wildmidi_debug
 
@@ -159,7 +163,7 @@ wildmidi_open_config ()
   }
 
   if (path == NULL) {
-    path = g_strdup (TIMIDITY_CFG);
+    path = g_strdup (WILDMIDI_CFG);
     GST_DEBUG ("trying %s", path);
     if (path && (g_access (path, R_OK) == -1)) {
       g_free (path);
@@ -179,7 +183,7 @@ wildmidi_open_config ()
   if (path == NULL) {
     /* I've created a symlink to get it playing
      * ln -s /usr/share/timidity/timidity.cfg /etc/wildmidi.cfg
-     * we could make it use : TIMIDITY_CFG
+     * we could make it use : WILDMIDI_CFG
      * but unfortunately it fails to create a proper filename if the config
      * has a redirect   
      * http://sourceforge.net/tracker/index.php?func=detail&aid=1657358&group_id=42635&atid=433744