Merge branch 'js-rebase' of ssh://repo.or.cz/srv/git/jack2 into js-rebase

common/JackAPI.cpp

@@ -1966,7 +1966,7 @@ EXPORT int jack_reserve_client_name( jack_client_t *ext_client, const char *name
 
 EXPORT void jack_session_commands_free( jack_session_command_t *cmds )
 {
-    if(!cmds)
+    if (!cmds)
         return;
 
     int i=0;

common/JackChannel.h

@@ -133,17 +133,19 @@ class JackClientChannelInterface
         virtual void SessionReply(int refnum, int *result)
         {}
 
-        virtual void GetUUIDForClientName( int refnum, const char *client_name, char *uuid_res, int *result )
+        virtual void GetUUIDForClientName(int refnum, const char *client_name, char *uuid_res, int *result)
         {}
 
-        virtual void GetClientNameForUUID( int refnum, const char *uuid, char *name_res, int *result )
+        virtual void GetClientNameForUUID(int refnum, const char *uuid, char *name_res, int *result)
         {}
 
-        virtual void ReserveClientName( int refnum, const char *client_name, const char *uuid, int *result )
+        virtual void ReserveClientName(int refnum, const char *client_name, const char *uuid, int *result)
         {}
 
         virtual bool IsChannelThread()
-        { return false; }
+        { 
+            return false; 
+        }
 };
 
 }

common/JackClient.cpp

@@ -1110,7 +1110,7 @@ char* JackClient::GetUUIDForClientName(const char* client_name)
     int result = -1;
     fChannel->GetUUIDForClientName( GetClientControl()->fRefNum, client_name, uuid_res, &result);
 
-    if(result)
+    if (result)
         return NULL;
 
     return strdup(uuid_res);
@@ -1122,7 +1122,7 @@ char* JackClient::GetClientNameForUUID(const char* uuid)
     int result = -1;
     fChannel->GetClientNameForUUID(GetClientControl()->fRefNum, uuid, name_res, &result);
 
-    if(result)
+    if (result)
         return NULL;
 
     return strdup(name_res);

common/JackEngine.cpp

@@ -44,12 +44,15 @@ JackEngine::JackEngine(JackGraphManager* manager,
     fEngineControl = control;
     for (int i = 0; i < CLIENT_NUM; i++)
         fClientTable[i] = NULL;
+    fLastSwitchUsecs = 0;
+    fMaxUUID = 0;
+    fSessionPendingReplies = 0;
+    fSessionTransaction = NULL;
+    fSessionResult = NULL;
 }
 
 JackEngine::~JackEngine()
-{
-    jack_log("JackEngine::~JackEngine");
-}
+{}
 
 int JackEngine::Open()
 {
@@ -903,7 +906,7 @@ int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name)
     return 0;
 }
 
-void JackEngine::SessionNotify(int refnum, const char *target, jack_session_event_type_t type, const char *path, JackChannelTransaction *socket )
+void JackEngine::SessionNotify(int refnum, const char *target, jack_session_event_type_t type, const char *path, JackChannelTransaction *socket)
 {
     if (fSessionPendingReplies != 0) {
         JackSessionNotifyResult res(-1);

common/JackEngine.h

@@ -58,7 +58,6 @@ class SERVER_EXPORT JackEngine : public JackLockAble
         std::map<int,std::string> fReservationMap;
         int fMaxUUID;
 
-
         int ClientCloseAux(int refnum, JackClientInterface* client, bool wait);
         void CheckXRun(jack_time_t callback_usecs);