From 5e5da014fbfcad5ddbbd8d2fcaed8d365d54325d Mon Sep 17 00:00:00 2001 From: sletz Date: Sun, 25 Oct 2009 09:36:36 +0000 Subject: [PATCH] Typo(s). git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3667 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 2 +- common/JackServerGlobals.h | 2 +- common/Jackdmp.cpp | 2 +- windows/Setup/src/README | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94ded717..2d82539f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,7 +25,7 @@ Paul Davis Jackdmp changes log --------------------------- -2009-10-22 Stephane Letz +2009-10-23 Stephane Letz * Correct JackProcessSync::LockedTimedWait. * Correct JACK_MESSAGE_SIZE value, particularly in OSX RPC code. diff --git a/common/JackServerGlobals.h b/common/JackServerGlobals.h index 0b842dfc..e037f69b 100644 --- a/common/JackServerGlobals.h +++ b/common/JackServerGlobals.h @@ -47,7 +47,7 @@ struct SERVER_EXPORT JackServerGlobals static bool Init(); static void Destroy(); - static int Start (const char* server_name, + static int Start(const char* server_name, jack_driver_desc_t* driver_desc, JSList* driver_params, int sync, diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp index d82ad3df..a414b8b4 100644 --- a/common/Jackdmp.cpp +++ b/common/Jackdmp.cpp @@ -450,7 +450,7 @@ int main(int argc, char* argv[]) notify_server_stop(server_name); return 0; -fail_free1 : +fail_free1: jackctl_server_destroy(server_ctl); return -1; diff --git a/windows/Setup/src/README b/windows/Setup/src/README index e9424a26..a33ec512 100644 --- a/windows/Setup/src/README +++ b/windows/Setup/src/README @@ -20,9 +20,9 @@ It is compiled from the latest CVS version which is using QT4 framework. To uses - in Setup/Misc, check the "Start JACK audio server at application startup" box -- quit qjackctl.exe and start is again, it should now launch the jack server. Quitting the qjackctl.exe will now close the jack server. +- quit QJACKCTL and start is again, it should now launch the jack server. Quitting QJACKCTL will now close the jack server. -Starting the jack server with another audio device installed on the machine (like an ASIO card) can now be done directly in qjackctl. +Starting the jack server with another audio device installed on the machine (like an ASIO card) can now be done directly in QJACKCTL. A ">" button at the right of the interface button allows to list the name of all available devices, driven either by "MME", "DirectSound", or "ASIO". Alternatively using the following command allows to display the names of available devices: @@ -30,7 +30,7 @@ Alternatively using the following command allows to display the names of availab Then start jackd with the device you want, by using its name, for example: -- jackd -R -S -d portaudio -d "ASIO::MOTU Audio ASIO", then start qjackctl. qjackctl will see the jackd server already running and then can be used normally. +- jackd -R -S -d portaudio -d "ASIO::MOTU Audio ASIO", then start QJACKCTL. QJACKCTL will see the jackd server already running and then can be used normally. ============================================= @@ -47,9 +47,9 @@ QJACKCTL MIDI connection windows can then be used. JackRouter JACK/ASIO driver ============================================= -JackRouter is an ASIO driver that allows any ASIO compatible application to become a JACK client, thus exchange audio with any other "native" or "Jackified" application. This driver is registered in the system by the installer and becomes available in the list of ASIO drivers when the JACK server is running. A "JackRouter.ini" configuration file allows the application to confgiure how the JackRouter driver behaves. +JackRouter is an ASIO driver that allows any ASIO compatible application to become a JACK client, thus exchange audio with any other "native" or "Jackified" application. This driver is registered in the system by the installer and becomes available in the list of ASIO drivers when the JACK server is running. A "JackRouter.ini" configuration file allows the application to configure how the JackRouter driver behaves. - - [IO]: the application can obtain any number if JACK input/output ports (not necessarilly equal to the audio card input/output number). [Note that some applications force their input/output channel number]. + - [IO]: the application can obtain any number if JACK input/output ports (not necessarily equal to the audio card input/output number). [Note that some applications force their input/output channel number]. - [AUTO_CONNECT] : when 1, the application JACK port will automatically be connected to the machine input/output JACK ports. -- 2.11.4.GIT