From af0d827db833bc4dab545b3b615a66cd66a13648 Mon Sep 17 00:00:00 2001 From: sletz Date: Mon, 9 Feb 2009 12:54:57 +0000 Subject: [PATCH] Now correctly return an error if JackServer::SetBufferSize could not change the buffer size (and was just restoring the current one). git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3298 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 1 + common/JackServer.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e60c55a..322f1654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ Michael Voigt 2009-02-09 Stephane Letz * Use PRIu32 kind of macro in JackAlsaDriver again. + * Now correctly return an error if JackServer::SetBufferSize could not change the buffer size (and was just restoring the current one). 2009-02-05 Stephane Letz diff --git a/common/JackServer.cpp b/common/JackServer.cpp index c82b9b9d..39f9cb0e 100644 --- a/common/JackServer.cpp +++ b/common/JackServer.cpp @@ -228,7 +228,9 @@ int JackServer::SetBufferSize(jack_nframes_t buffer_size) jack_error("Cannot SetBufferSize for audio driver, restore current value %ld", current_buffer_size); fFreewheelDriver->SetBufferSize(current_buffer_size); fEngineControl->InitFrameTime(); - return fAudioDriver->Start(); + fAudioDriver->Start(); + // SetBufferSize actually failed, so return an error... + return -1; } }