From b4df9973f5d3c0358ebbeff2b6650daab4fdea6f Mon Sep 17 00:00:00 2001
From: trasz <trasz@1236be98-edfb-4384-941c-bd23afbee59c>
Date: Sun, 12 Oct 2008 14:18:06 +0000
Subject: [PATCH] Make LASH support actually work.  Submitted by Nedko
 Arnaudov.

git-svn-id: https://jack-smf-utils.svn.sourceforge.net/svnroot/jack-smf-utils/trunk@3 1236be98-edfb-4384-941c-bd23afbee59c
---
 src/jack-smf-player.c   | 18 +++++++++---------
 src/jack-smf-recorder.c | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/jack-smf-player.c b/src/jack-smf-player.c
index 3745894..abf4852 100644
--- a/src/jack-smf-player.c
+++ b/src/jack-smf-player.c
@@ -48,7 +48,7 @@
 #include "config.h"
 #include "smf.h"
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 #include <lash/lash.h>
 #endif
 
@@ -71,7 +71,7 @@ int		be_quiet = 0;
 volatile int	playback_started = -1, song_position = 0, ctrl_c_pressed = 0;
 smf_t		*smf = NULL;
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 lash_client_t	*lash_client;
 #endif
 
@@ -492,7 +492,7 @@ init_jack(void)
 {
 	int i, err;
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	lash_event_t *event;
 #endif
 
@@ -503,7 +503,7 @@ init_jack(void)
 		exit(EX_UNAVAILABLE);
 	}
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	event = lash_event_new_with_type(LASH_Client_Name);
 	assert (event); /* Documentation does not say anything about return value. */
 	lash_event_set_string(event, jack_get_client_name(jack_client));
@@ -561,7 +561,7 @@ init_jack(void)
 	}
 }
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 
 static gboolean
 lash_callback(gpointer notused)
@@ -605,7 +605,7 @@ init_lash(lash_args_t *args)
 	g_timeout_add(100, lash_callback, NULL);
 }
 
-#endif /* WITH_LASH */
+#endif /* HAVE_LASH */
 
 /*
  * This is neccessary for exiting due to jackd being killed, when exit(0)
@@ -654,13 +654,13 @@ main(int argc, char *argv[])
 	int		ch;
 	char		*file_name, *autoconnect_port_name = NULL;
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	lash_args_t *lash_args;
 #endif
 
 	g_thread_init(NULL);
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	lash_args = lash_extract_args(&argc, &argv);
 #endif
 
@@ -738,7 +738,7 @@ main(int argc, char *argv[])
 		just_one_output = 1;
 	}
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	init_lash(lash_args);
 #endif
 
diff --git a/src/jack-smf-recorder.c b/src/jack-smf-recorder.c
index b599964..d20bd58 100644
--- a/src/jack-smf-recorder.c
+++ b/src/jack-smf-recorder.c
@@ -48,7 +48,7 @@
 #include "config.h"
 #include "smf.h"
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 #include <lash/lash.h>
 #endif
 
@@ -62,7 +62,7 @@ volatile int	ctrl_c_pressed = 0;
 smf_t		*smf = NULL;
 smf_track_t	*tracks[16]; /* We allocate one track per MIDI channel. */
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 lash_client_t	*lash_client;
 #endif
 
@@ -264,7 +264,7 @@ init_jack(void)
 {
 	int err;
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	lash_event_t *event;
 #endif
 
@@ -275,7 +275,7 @@ init_jack(void)
 		exit(EX_UNAVAILABLE);
 	}
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	event = lash_event_new_with_type(LASH_Client_Name);
 	assert (event); /* Documentation does not say anything about return value. */
 	lash_event_set_string(event, jack_get_client_name(jack_client));
@@ -304,7 +304,7 @@ init_jack(void)
 	}
 }
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 
 static gboolean
 lash_callback(gpointer notused)
@@ -348,7 +348,7 @@ init_lash(lash_args_t *args)
 	g_timeout_add(100, lash_callback, NULL);
 }
 
-#endif /* WITH_LASH */
+#endif /* HAVE_LASH */
 
 gboolean
 writer_timeout(gpointer file_name_gpointer)
@@ -423,13 +423,13 @@ main(int argc, char *argv[])
 	int		ch, i;
 	char		*file_name, *autoconnect_port_name = NULL;
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	lash_args_t *lash_args;
 #endif
 
 	g_thread_init(NULL);
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	lash_args = lash_extract_args(&argc, &argv);
 #endif
 
@@ -471,7 +471,7 @@ main(int argc, char *argv[])
 		smf_add_track(smf, tracks[i]);
 	}
 
-#ifdef WITH_LASH
+#ifdef HAVE_LASH
 	init_lash(lash_args);
 #endif
 
-- 
2.11.4.GIT