LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move NotifyQuit in JackServer::Stop.

This commit is contained in:
Stephane Letz 2012-10-24 13:02:04 +02:00
parent aa02feeacf
commit 700489b429
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/JackLibAPI.cpp
View File

@ -177,7 +177,7 @@ LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_opt
va_end(ap);
JackGlobals::fOpenMutex->Unlock();
return res;
} catch(std::bad_alloc& e) {
} catch (std::bad_alloc& e) {
jack_error("Memory allocation error...");
return NULL;
} catch (...) {

8
common/JackLockedEngine.h
View File

@ -41,7 +41,7 @@ catch (...) {
*/
#define CATCH_EXCEPTION_RETURN \
} catch(std::bad_alloc& e) { \
} catch (std::bad_alloc& e) { \
jack_error("Memory allocation error..."); \
return -1; \
} catch (...) { \
@ -50,10 +50,10 @@ catch (...) {
} \
#define CATCH_CLOSE_EXCEPTION_RETURN \
} catch(std::bad_alloc& e) { \
} catch (std::bad_alloc& e) { \
jack_error("Memory allocation error..."); \
return -1; \
} catch(JackTemporaryException& e) { \
} catch (JackTemporaryException& e) { \
jack_error("JackTemporaryException : now quits..."); \
JackTools::KillServer(); \
return 0; \
@ -63,7 +63,7 @@ catch (...) {
}
#define CATCH_EXCEPTION \
} catch(std::bad_alloc& e) { \
} catch (std::bad_alloc& e) { \
jack_error("Memory allocation error..."); \
} catch (...) { \
jack_error("Unknown error..."); \

2
common/JackServer.cpp
View File

@ -134,7 +134,6 @@ fail_close1:
int JackServer::Close()
{
jack_log("JackServer::Close");
fEngine->NotifyQuit();
fChannel.Close();
fAudioDriver->Detach();
fAudioDriver->Close();
@ -190,6 +189,7 @@ int JackServer::Start()
int JackServer::Stop()
{
jack_log("JackServer::Stop");
fEngine->NotifyQuit();
fChannel.Stop();
fEngine->ShutDown();

2
common/JackServerAPI.cpp
View File

@ -162,7 +162,7 @@ SERVER_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_
va_end(ap);
JackGlobals::fOpenMutex->Unlock();
return res;
} catch(std::bad_alloc& e) {
} catch (std::bad_alloc& e) {
jack_error("Memory allocation error...");
return NULL;
} catch (...) {

2
posix/JackSocketServerChannel.cpp
View File

@ -97,7 +97,7 @@ int JackSocketServerChannel::Start()
void JackSocketServerChannel::Stop()
{
fThread.Kill();
fThread.Stop();
}
void JackSocketServerChannel::ClientCreate()