git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4213 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.9.7
| @@ -450,21 +450,21 @@ sigset_t | |||||
| jackctl_setup_signals( | jackctl_setup_signals( | ||||
| unsigned int flags) | unsigned int flags) | ||||
| { | { | ||||
| if ((waitEvent = CreateEvent(NULL, FALSE, FALSE, NULL)) == NULL) { | |||||
| if ((waitEvent = CreateEvent(NULL, FALSE, FALSE, NULL)) == NULL) { | |||||
| jack_error("CreateEvent fails err = %ld", GetLastError()); | jack_error("CreateEvent fails err = %ld", GetLastError()); | ||||
| return 0; | return 0; | ||||
| } | } | ||||
| (void) signal(SIGINT, do_nothing_handler); | |||||
| (void) signal(SIGINT, do_nothing_handler); | |||||
| (void) signal(SIGABRT, do_nothing_handler); | (void) signal(SIGABRT, do_nothing_handler); | ||||
| (void) signal(SIGTERM, do_nothing_handler); | (void) signal(SIGTERM, do_nothing_handler); | ||||
| return (sigset_t)waitEvent; | |||||
| return (sigset_t)waitEvent; | |||||
| } | } | ||||
| void jackctl_wait_signals(sigset_t signals) | void jackctl_wait_signals(sigset_t signals) | ||||
| { | { | ||||
| if (WaitForSingleObject(waitEvent, INFINITE) != WAIT_OBJECT_0) { | |||||
| if (WaitForSingleObject(waitEvent, INFINITE) != WAIT_OBJECT_0) { | |||||
| jack_error("WaitForSingleObject fails err = %ld", GetLastError()); | jack_error("WaitForSingleObject fails err = %ld", GetLastError()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -539,7 +539,7 @@ jackctl_setup_signals( | |||||
| * explicitly reset it | * explicitly reset it | ||||
| */ | */ | ||||
| pthread_sigmask(SIG_BLOCK, &signals, 0); | |||||
| pthread_sigmask(SIG_BLOCK, &signals, 0); | |||||
| /* install a do-nothing handler because otherwise pthreads | /* install a do-nothing handler because otherwise pthreads | ||||
| behaviour is undefined when we enter sigwait. | behaviour is undefined when we enter sigwait. | ||||
| @@ -119,7 +119,7 @@ jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSL | |||||
| desc->name); | desc->name); | ||||
| } | } | ||||
| printf ("Parameters for driver '%s' (all parameters are optional):\n", desc->name); | |||||
| jack_log("Parameters for driver '%s' (all parameters are optional):", desc->name); | |||||
| jack_print_driver_options (desc, stdout); | jack_print_driver_options (desc, stdout); | ||||
| return 1; | return 1; | ||||
| } | } | ||||
| @@ -263,7 +263,7 @@ jackctl_parse_driver_params (jackctl_driver *driver_ptr, int argc, char* argv[]) | |||||
| desc->name); | desc->name); | ||||
| } | } | ||||
| printf ("Parameters for driver '%s' (all parameters are optional):\n", desc->name); | |||||
| jack_log("Parameters for driver '%s' (all parameters are optional):", desc->name); | |||||
| jack_print_driver_options (desc, stdout); | jack_print_driver_options (desc, stdout); | ||||
| return 1; | return 1; | ||||
| } | } | ||||
| @@ -402,8 +402,6 @@ error: | |||||
| void JackServerGlobals::Destroy() | void JackServerGlobals::Destroy() | ||||
| { | { | ||||
| printf("JackServerGlobals Destroy %d\n", fUserCount); | |||||
| if (--fUserCount == 0) { | if (--fUserCount == 0) { | ||||
| jack_log("JackServerGlobals Destroy"); | jack_log("JackServerGlobals Destroy"); | ||||
| Stop(); | Stop(); | ||||
| @@ -237,7 +237,6 @@ int JackCoreAudioDriver::Write() | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| OSStatus JackCoreAudioDriver::SRNotificationCallback(AudioDeviceID inDevice, | OSStatus JackCoreAudioDriver::SRNotificationCallback(AudioDeviceID inDevice, | ||||
| UInt32 inChannel, | UInt32 inChannel, | ||||
| Boolean isInput, | Boolean isInput, | ||||