summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/JackNetOneDriver.cpp2
-rw-r--r--common/JackProxyDriver.h8
-rw-r--r--dbus/sigsegv.c2
-rw-r--r--example-clients/wait.c2
-rw-r--r--linux/alsa/JackAlsaAdapter.h4
5 files changed, 9 insertions, 9 deletions
diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp
index a7fc083e..90731c20 100644
--- a/common/JackNetOneDriver.cpp
+++ b/common/JackNetOneDriver.cpp
@@ -959,7 +959,7 @@ extern "C"
jack_driver_descriptor_add_parameter(desc, &filler, "redundancy", 'R', JackDriverParamUInt, &value, NULL, "Send packets N times", NULL);
value.ui = false;
- jack_driver_descriptor_add_parameter(desc, &filler, "native-endian", 'e', JackDriverParamBool, &value, NULL, "Dont convert samples to network byte order", NULL);
+ jack_driver_descriptor_add_parameter(desc, &filler, "native-endian", 'e', JackDriverParamBool, &value, NULL, "Don't convert samples to network byte order", NULL);
value.i = 0;
jack_driver_descriptor_add_parameter(desc, &filler, "jitterval", 'J', JackDriverParamInt, &value, NULL, "Attempted jitterbuffer microseconds on master", NULL);
diff --git a/common/JackProxyDriver.h b/common/JackProxyDriver.h
index 82156555..74b8ba20 100644
--- a/common/JackProxyDriver.h
+++ b/common/JackProxyDriver.h
@@ -73,10 +73,10 @@ namespace Jack
int* fUpstreamCapturePortConnected; /*<! map of capture ports connected upstream, for optimization purpose */
int* fUpstreamPlaybackPortConnected; /*<! map of playback ports connected upstream, for optimization purpose */
- bool fAutoSave; /*<! wether the local connections should be saved/restored when upstream connection is restarted */
- bool fAutoConnect; /*<! wether the upstream ports should be automatically connected to upstream physical ports */
- bool fDetectPlaybackChannels; /*<! wether the number of playback ports registered should match the number of upstream physical playback ports */
- bool fDetectCaptureChannels; /*<! wether the number of capture ports registered should match the number of upstream physical capture ports */
+ bool fAutoSave; /*<! whether the local connections should be saved/restored when upstream connection is restarted */
+ bool fAutoConnect; /*<! whether the upstream ports should be automatically connected to upstream physical ports */
+ bool fDetectPlaybackChannels; /*<! whether the number of playback ports registered should match the number of upstream physical playback ports */
+ bool fDetectCaptureChannels; /*<! whether the number of capture ports registered should match the number of upstream physical capture ports */
bool Initialize(); /*<! establish upstream connection and register the client callbacks */
diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c
index ead08e7d..c5321f1d 100644
--- a/dbus/sigsegv.c
+++ b/dbus/sigsegv.c
@@ -94,7 +94,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
}
else
{
- jack_error("Unknown bad signal catched!");
+ jack_error("Unknown bad signal caught!");
}
if (info->si_code >= 0 && info->si_code < 3)
diff --git a/example-clients/wait.c b/example-clients/wait.c
index 667343aa..2d5ff1c6 100644
--- a/example-clients/wait.c
+++ b/example-clients/wait.c
@@ -19,7 +19,7 @@ show_usage(void)
fprintf(stderr, " -s, --server <name> Connect to the jack server named <name>\n");
fprintf(stderr, " -w, --wait Wait for server to become available\n");
fprintf(stderr, " -q, --quit Wait until server is quit\n");
- fprintf(stderr, " -c, --check Check wether server is running\n");
+ fprintf(stderr, " -c, --check Check whether server is running\n");
fprintf(stderr, " -t, --timeout Wait timeout in seconds\n");
fprintf(stderr, " -h, --help Display this help message\n");
fprintf(stderr, "For more information see http://jackaudio.org/\n");
diff --git a/linux/alsa/JackAlsaAdapter.h b/linux/alsa/JackAlsaAdapter.h
index 67733718..c5dc3104 100644
--- a/linux/alsa/JackAlsaAdapter.h
+++ b/linux/alsa/JackAlsaAdapter.h
@@ -421,7 +421,7 @@ namespace Jack
}
break;
default :
- check_error_msg ( -10000, "unknow access mode" );
+ check_error_msg ( -10000, "unknown access mode" );
break;
}
return 0;
@@ -507,7 +507,7 @@ namespace Jack
}
break;
default :
- check_error_msg ( -10000, "unknow access mode" );
+ check_error_msg ( -10000, "unknown access mode" );
break;
}
return 0;