From bb703779620fc8a74895adc8040b460e935a46cf Mon Sep 17 00:00:00 2001
From: node <node@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 1 Nov 2003 00:48:55 +0000
Subject: [PATCH] [0.89.2] add --silent option to jackd and made distclean work

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@543 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 jack/engine.h     | 2 +-
 jack/internal.h   | 2 ++
 jackd/Makefile.am | 8 +++-----
 jackd/jackd.c     | 8 +++++++-
 libjack/client.c  | 4 ++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/jack/engine.h b/jack/engine.h
index adb25eb..e4dc6c4 100644
--- a/jack/engine.h
+++ b/jack/engine.h
@@ -27,7 +27,7 @@
 #include <jack/driver_interface.h>
 
 #define VERBOSE(engine,format,args...) \
-	if ((engine)->verbose) fprintf (stderr, format, ## args)
+	if ((engine)->verbose) jack_error (format, ## args)
 
 struct _jack_driver;
 struct _jack_client_internal;
diff --git a/jack/internal.h b/jack/internal.h
index d81a32d..81bd6e6 100644
--- a/jack/internal.h
+++ b/jack/internal.h
@@ -374,5 +374,7 @@ extern void jack_call_timebase_master (jack_client_t *client);
 extern int jack_acquire_real_time_scheduling (pthread_t, int priority);
 extern int jack_drop_real_time_scheduling (pthread_t);
 
+void silent_jack_error_callback (const char *desc);
+
 #endif /* __jack_internal_h__ */
 
diff --git a/jackd/Makefile.am b/jackd/Makefile.am
index 1919a95..cb91bd1 100644
--- a/jackd/Makefile.am
+++ b/jackd/Makefile.am
@@ -21,14 +21,12 @@ endif
 
 bin_PROGRAMS = jackd $(CAP_PROGS)
 
-AM_CFLAGS = $(JACK_CFLAGS) -DJACKD_LOCATION=\"$(bindir)/jackd\" 
+AM_CFLAGS = $(JACK_CFLAGS) -DJACKD_LOCATION=\"$(bindir)/jackd\"
 
 jackd_SOURCES = jackd.c engine.c transengine.c
 jackd_LDADD = ../libjack/libjack.la -lm -ldl -lrt -lpthread $(CAP_LIBS)
 
-noinst_HEADERS = jack_md5.h md5.h md5_loc.h transengine.h
-
-BUILT_SOURCES = jack_md5.h
+noinst_HEADERS = md5.h md5_loc.h transengine.h
 
 jack_md5.h: jackd
 if STRIPPED_JACKD
@@ -36,7 +34,7 @@ if STRIPPED_JACKD
 endif
 	echo "#define JACKD_MD5_SUM \"`md5sum .libs/jackd | awk '{print $$1}'`\"" > jack_md5.h
 
-jackstart_SOURCES = jackstart.c md5.c
+jackstart_SOURCES = jackstart.c md5.c jack_md5.h
 jackstart_LDFLAGS = -lcap
 
 man_MANS = jackd.1 jackstart.1
diff --git a/jackd/jackd.c b/jackd/jackd.c
index c8e6263..e86790a 100644
--- a/jackd/jackd.c
+++ b/jackd/jackd.c
@@ -349,6 +349,7 @@ static void usage (FILE *file)
 "             [ --realtime OR -R [ --realtime-priority OR -P priority ] ]\n"
 "             [ --timeout OR -t client-timeout-in-msecs ]\n"
 "             [ --verbose OR -v ]\n"
+"             [ --silent OR -s ]\n"
 "             [ --tmpdir OR -D directory-for-temporary-files ]\n"
 "             [ --version OR -V ]\n"
 "         -d driver [ ... driver args ... ]\n");
@@ -378,7 +379,7 @@ main (int argc, char *argv[])
 
 {
         jack_driver_desc_t * desc;
-	const char *options = "-ad:D:P:vhVRFl:t:";
+	const char *options = "-ad:D:P:vshVRFl:t:";
 	struct option long_options[] = 
 	{ 
 		{ "asio", 0, 0, 'a' },
@@ -390,6 +391,7 @@ main (int argc, char *argv[])
 		{ "realtime-priority", 1, 0, 'P' },
 		{ "timeout", 1, 0, 't' },
 		{ "version", 0, 0, 'V' },
+		{ "silent", 0, 0, 's' },
 		{ 0, 0, 0, 0 }
 	};
 	int option_index;
@@ -462,6 +464,10 @@ main (int argc, char *argv[])
 			verbose = 1;
 			break;
 
+		case 's':
+			jack_set_error_function (silent_jack_error_callback);
+			break;
+
 		case 'P':
 			realtime_priority = atoi (optarg);
 			break;
diff --git a/libjack/client.c b/libjack/client.c
index d5bfbdb..977e3c5 100644
--- a/libjack/client.c
+++ b/libjack/client.c
@@ -105,6 +105,10 @@ void default_jack_error_callback (const char *desc)
     fprintf(stderr, "%s\n", desc);
 }
 
+void silent_jack_error_callback (const char *desc)
+{
+}
+
 void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
 
 static int