From e3bbd5cdbaee8a0a13fece93327662e344fb21bf Mon Sep 17 00:00:00 2001 From: Yasuhiro Fujii Date: Fri, 16 Jun 2017 21:59:53 +0900 Subject: [PATCH] Change JackPortAudioDriver::Open() to permit a long device name and use truncated name for the most other parts. --- windows/portaudio/JackPortAudioDriver.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp index 994c3f17..9a3b06d4 100644 --- a/windows/portaudio/JackPortAudioDriver.cpp +++ b/windows/portaudio/JackPortAudioDriver.cpp @@ -196,8 +196,12 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size, } // Generic JackAudioDriver Open + char capture_driver_name[JACK_CLIENT_NAME_SIZE]; + char playback_driver_name[JACK_CLIENT_NAME_SIZE]; + snprintf(capture_driver_name, sizeof(capture_driver_name), "%s", capture_driver_uid); + snprintf(playback_driver_name, sizeof(playback_driver_name), "%s", playback_driver_uid); if (JackAudioDriver::Open(buffer_size, samplerate, capturing, playing, inchannels, outchannels, monitor, - capture_driver_uid, playback_driver_uid, capture_latency, playback_latency) != 0) { + capture_driver_name, playback_driver_name, capture_latency, playback_latency) != 0) { return -1; } @@ -239,12 +243,6 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size, fEngineControl->fConstraint = fEngineControl->fPeriodUsecs * 1000; #endif - assert(strlen(capture_driver_uid) < JACK_CLIENT_NAME_SIZE); - assert(strlen(playback_driver_uid) < JACK_CLIENT_NAME_SIZE); - - strcpy(fCaptureDriverName, capture_driver_uid); - strcpy(fPlaybackDriverName, playback_driver_uid); - return 0; error: