Move NotifyQuit in JackServer::Stop.

jackaudio · 700489b429b0edb7046b169278e3e6751e3e59fc · sletz committed Oct 24, 2012 · Oct 24, 2012 · 700489b
1 parent aa02fee
commit 700489b429b0edb7046b169278e3e6751e3e59fc
Unified Split

Showing with 8 additions and 8 deletions.

+1 −1 common/JackLibAPI.cpp

+4 −4 common/JackLockedEngine.h

+1 −1 common/JackServer.cpp

+1 −1 common/JackServerAPI.cpp

+1 −1 posix/JackSocketServerChannel.cpp
diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
@@ -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 (...) {
diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h
@@ -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...");             \
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
@@ -134,7 +134,6 @@ int JackServer::Open(jack_driver_desc_t* driver_desc, JSList* driver_params)
 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();
diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp
@@ -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 (...) {
diff --git a/posix/JackSocketServerChannel.cpp b/posix/JackSocketServerChannel.cpp
@@ -97,7 +97,7 @@ int JackSocketServerChannel::Start()
 
 void JackSocketServerChannel::Stop()
 {
-    fThread.Kill();
+    fThread.Stop();
 }
 
 void JackSocketServerChannel::ClientCreate()