summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-02-22 06:31:44 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-02-22 06:31:44 +0000
commit9ab72bf599f25e4b26034611faf5b8c78b072170 (patch)
treeb9c372c2dc0f6a8e3b1a821f5628fb1380683967
parentb750dbd5efb93ec58f4d85aee0709069fe4385f6 (diff)
downloadgst-plugins-bad-9ab72bf599f25e4b26034611faf5b8c78b072170.tar.gz
gst-plugins-bad-9ab72bf599f25e4b26034611faf5b8c78b072170.tar.bz2
gst-plugins-bad-9ab72bf599f25e4b26034611faf5b8c78b072170.zip
ext/timidity/gstwildmidi.c: If WILDMIDI_CFG is not defined, define it to the default timidity configure file.
Original commit message from CVS: * ext/timidity/gstwildmidi.c: If WILDMIDI_CFG is not defined, define it to the default timidity configure file.
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--ext/timidity/gstwildmidi.c8
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bc2a9b6c..963d780e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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:
Hans de Goede <j dot w dot r dot degoede at hhs dot nl>
diff --git a/common b/common
-Subproject 2a19465fdb43a75f4d32950fd2beb1beb950eec
+Subproject 84c6d3efac27669ad45856ebe84a17d33359dc3
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index e975a18a..80259a90 100644
--- 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