[0.101.4] misc minor cleanup:

man page updates
fix bug with --name parameter
add freebob to "jackd --help" list of backends
make "alsa" the default backend when it and "freebob" both present


git-svn-id: svn+ssh://jackaudio.org/trunk/jack@943 0c269be4-1314-0410-8aa9-9f06e86f4224

configure.ac

@@ -15,7 +15,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=101
-JACK_MICRO_VERSION=3
+JACK_MICRO_VERSION=4
 
 dnl ---
 dnl HOWTO: updating the jack protocol version
@@ -446,7 +446,7 @@ if test "x$USE_BARRIER" = "xyes"; then
 		AC_DEFINE(USE_BARRIER, 1, [Use pthread barrier functions]))
 fi
 
-# Check which drivers can be built.  The last one successfully
+# Check which backend drivers can be built.  The last one successfully
 # configured becomes the default JACK driver; so the order of
 # precedence is: alsa, oss, coreaudio, portaudio, dummy.
 
@@ -494,6 +494,23 @@ then
 fi
 AM_CONDITIONAL(HAVE_OSS, $HAVE_OSS)
 
+AC_ARG_ENABLE(freebob, [  --disable-freebob          ignore FreeBob driver ],
+			TRY_FREEBOB=$enableval , TRY_FREEBOB=yes ) 
+HAVE_FREEBOB="false"
+if test "x$TRY_FREEBOB" = "xyes"
+then
+	# check for FreeBob libraries
+	PKG_CHECK_MODULES(LIBFREEBOB, libfreebob >= 0.5.1,
+	     [HAVE_FREEBOB="true"
+              JACK_DEFAULT_DRIVER=\"freebob\"
+	     ], AC_MSG_RESULT([no]))
+
+	AC_SUBST([LIBFREEBOB_CFLAGS])
+	AC_SUBST([LIBFREEBOB_LIBS])
+
+fi
+AM_CONDITIONAL(HAVE_FREEBOB,$HAVE_FREEBOB)
+
 AC_ARG_ENABLE(alsa, [  --disable-alsa          ignore ALSA driver ],
 			TRY_ALSA=$enableval , TRY_ALSA=yes ) 
 HAVE_ALSA="false"
@@ -504,27 +521,12 @@ then
 	     [HAVE_ALSA="true"
               ALSA_LIBS=-lasound
               JACK_DEFAULT_DRIVER=\"alsa\"
-             ], [true], [-lm]
+             ], AC_MSG_RESULT([no]), [-lm]
 	)
 	AC_SUBST(ALSA_LIBS)
 fi
 AM_CONDITIONAL(HAVE_ALSA, $HAVE_ALSA)
 
-AC_ARG_ENABLE(freebob, [  --disable-freebob          ignore FreeBob driver ],
-			TRY_FREEBOB=$enableval , TRY_FREEBOB=yes ) 
-HAVE_FREEBOB="false"
-if test "x$TRY_FREEBOB" = "xyes"
-then
-	# check for FreeBob libraries
-	PKG_CHECK_MODULES(LIBFREEBOB, libfreebob >= 0.5.1,
-	     [HAVE_FREEBOB="true"], AC_MSG_RESULT([no]))
-
-	AC_SUBST([LIBFREEBOB_CFLAGS])
-	AC_SUBST([LIBFREEBOB_LIBS])
-
-fi
-AM_CONDITIONAL(HAVE_FREEBOB,$HAVE_FREEBOB)
-
 if test "$JACK_DEFAULT_DRIVER" = \"dummy\"; then
   AC_MSG_WARN([Only the dummy driver can be built])
 fi
@@ -605,10 +607,10 @@ echo
 echo $PACKAGE $VERSION :
 echo
 echo \| Build with ALSA support............................... : $HAVE_ALSA
+echo \| Build with FreeBob support............................ : $HAVE_FREEBOB
 echo \| Build with OSS support................................ : $HAVE_OSS
 echo \| Build with CoreAudio support.......................... : $HAVE_COREAUDIO
 echo \| Build with PortAudio support.......................... : $HAVE_PA
-echo \| Build with FreeBob support............................ : $HAVE_FREEBOB
 echo \|
 echo \| Default driver backend................................ : $JACK_DEFAULT_DRIVER
 echo \| Shared memory interface............................... : $JACK_SHM_TYPE

jackd/jackd.1.in

@@ -1,4 +1,4 @@
-.TH "JACKD" "1" "@VERSION@" "November 2004" ""
+.TH "JACKD" "1" "@VERSION@" "April 2006" ""
 .SH "NAME"
 jackd, jackstart \- JACK Audio Connection Kit sound server
 .SH "SYNOPSYS"
@@ -10,9 +10,10 @@ jackd, jackstart \- JACK Audio Connection Kit sound server
 .br
 \fBjackd \-\-help\fR
 .SH "DESCRIPTION"
-\fBjackd\fR invokes the JACK audio server daemon.  When using JACK's
-built\-in support for realtime capabilities, use the \fBjackstart\fR
-command, instead.  All parameters are the same.
+\fBjackd\fR invokes the JACK audio server daemon.  The \fBjackstart\fR
+command provides JACK's built\-in support for Linux 2.4.x kernels with
+the realtime capabilities patch.  Use \fBjackd\fR for Linux 2.6.x and
+all other systems.  All parameters are the same.
 
 JACK is a low\-latency audio server.  Originally written for the
 GNU/Linux operating system, it also supports Mac OS X and various Unix
@@ -27,15 +28,16 @@ ground up for professional audio work.  It focuses on two key areas:
 synchronous execution of all clients, and low latency operation.
 
 For the latest JACK information, please consult the web site,
-<\fBhttp://jackit.sourceforge.net\fR>.
+<\fBhttp://www.jackaudio.org\fR>.
 .SH "OPTIONS"
 .TP
 \fB\-d, \-\-driver \fIbackend\fR [\fIbackend\-parameters\fR ]
 .br
 Select the audio interface backend.  The current list of supported
-backends is: \fBalsa\fR, \fBcoreaudio\fR, \fBdummy\fR, \fBoss\fR and
-\fBportaudio\fR.  They are not all available on all platforms.  All
-\fIbackend\-parameters\fR are optional.
+backends is: \fBalsa\fR, \fBcoreaudio\fR, \fBdummy\fR, \fBfreebob\fR,
+\fBoss\fR and \fBportaudio\fR.  They are not all available on all
+platforms.  All \fIbackend\-parameters\fR are optional.
+
 .TP
 \fB\-h, \-\-help\fR
 .br
@@ -321,6 +323,8 @@ Print usage message for the parameters specific to each backend.
 .br
 \fBjackd \-d dummy \-\-help\fR
 .br
+\fBjackd \-d freebob \-\-help\fR
+.br
 \fBjackd \-d oss \-\-help\fR
 .br
 \fBjackd \-d portaudio \-\-help\fR
@@ -387,7 +391,7 @@ name to \fBjack_client_open()\fR.
 
 .SH "SEE ALSO:"
 .PP
-.I http://jackit.sourceforge.net
+.I http://www.jackaudio.org
 .br
 The official JACK website with news, docs and a list of JACK clients.
 .PP
@@ -395,7 +399,7 @@ The official JACK website with news, docs and a list of JACK clients.
 .br
 The JACK developers' mailing list.  Subscribe, to take part in
 development of JACK or JACK clients.  User questions are also welcome,
-there is currently no user-specific mailing list.
+there is no user-specific mailing list.
 .PP
 .I http://www.jackosx.com/
 .br

jackd/jackd.c

@@ -368,11 +368,11 @@ static void usage (FILE *file)
 "             [ --verbose OR -v ]\n"
 "             [ --silent OR -s ]\n"
 "             [ --version OR -V ]\n"
-"         -d driver [ ... driver args ... ]\n"
-"             where driver can be `alsa', `coreaudio', `dummy',\n"
-"                                 `oss' or `portaudio'\n\n"
-"       jackd -d driver --help\n"
-"             to display options for each driver\n\n");
+"         -d backend [ ... backend args ... ]\n"
+"             The backend can be `alsa', `coreaudio', `dummy',\n"
+"                                `freebob', `oss' or `portaudio'.\n\n"
+"       jackd -d backend --help\n"
+"             to display options for each backend\n\n");
 }	
 
 static jack_driver_desc_t *
@@ -471,7 +471,7 @@ main (int argc, char *argv[])
 		{ "help", 0, 0, 'h' },
 		{ "port-max", 1, 0, 'p' },
 		{ "no-mlock", 0, 0, 'm' },
-		{ "name", 0, 0, 'n' },
+		{ "name", 1, 0, 'n' },
 		{ "unlock", 0, 0, 'u' },
 		{ "realtime", 0, 0, 'R' },
 		{ "realtime-priority", 1, 0, 'P' },