From 2f75c8e768de0b1a8b9b12183a5654078d97c1b4 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Thu, 18 Jan 2007 21:35:39 +0000
Subject: [PATCH] Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1355 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackWinNamedPipe.cpp | 35 +++++++++++++++----------------
 windows/JackWinThread.cpp    | 40 ++++--------------------------------
 2 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/windows/JackWinNamedPipe.cpp b/windows/JackWinNamedPipe.cpp
index c5477e2c..e2d0b5f9 100755
--- a/windows/JackWinNamedPipe.cpp
+++ b/windows/JackWinNamedPipe.cpp
@@ -96,12 +96,12 @@ int JackWinNamedPipeClient::Connect(const char* dir, const char* name, int which
 
 int JackWinNamedPipeClient::Close()
 {
-	if (fNamedPipe != INVALID_HANDLE_VALUE) {
-		CloseHandle(fNamedPipe);
-		fNamedPipe = INVALID_HANDLE_VALUE;
-		return 0;
+	if (fNamedPipe != INVALID_HANDLE_VALUE) {
+		CloseHandle(fNamedPipe);
+		fNamedPipe = INVALID_HANDLE_VALUE;
+		return 0;
 	} else {
-		return -1;
+		return -1;
 	}
 }
 
@@ -111,7 +111,6 @@ void JackWinNamedPipeClient::SetReadTimeOut(long sec)
 void JackWinNamedPipeClient::SetWriteTimeOut(long sec)
 {}
 
-
 JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient()
         : JackWinNamedPipeClient(), fIOState(kIdle), fPendingIO(false)
 {
@@ -281,8 +280,8 @@ bool JackWinNamedPipeServer::Accept()
 
 JackWinNamedPipeClient* JackWinNamedPipeServer::AcceptClient()
 {
-    if (ConnectNamedPipe(fNamedPipe, NULL)) {
-		JackWinNamedPipeClient* client = new JackWinNamedPipeClient(fNamedPipe);
+    if (ConnectNamedPipe(fNamedPipe, NULL)) {
+		JackWinNamedPipeClient* client = new JackWinNamedPipeClient(fNamedPipe);
 		// Init the pipe to the default value
         fNamedPipe = INVALID_HANDLE_VALUE;
     } else {
@@ -300,16 +299,16 @@ JackWinNamedPipeClient* JackWinNamedPipeServer::AcceptClient()
 }
 
 int JackWinNamedPipeServer::Close()
-{
-	JackLog("JackWinNamedPipeServer::Close\n");
-
-	if (fNamedPipe != INVALID_HANDLE_VALUE) {
-		DisconnectNamedPipe(fNamedPipe);
-		CloseHandle(fNamedPipe);
-		fNamedPipe = INVALID_HANDLE_VALUE;
-		return 0;
-	} else {
-		return -1;
+{
+	JackLog("JackWinNamedPipeServer::Close\n");
+
+	if (fNamedPipe != INVALID_HANDLE_VALUE) {
+		DisconnectNamedPipe(fNamedPipe);
+		CloseHandle(fNamedPipe);
+		fNamedPipe = INVALID_HANDLE_VALUE;
+		return 0;
+	} else {
+		return -1;
 	}
 }
 
diff --git a/windows/JackWinThread.cpp b/windows/JackWinThread.cpp
index 07fdaa3c..fff76f65 100644
--- a/windows/JackWinThread.cpp
+++ b/windows/JackWinThread.cpp
@@ -87,7 +87,7 @@ int JackWinThread::Start()
 	}
 }
 
-int JackWinThread::StartImp(pthread_t* thread, int priority, int realtime, ThreadCallback start_routine, void* arg)
+int JackWinThread::StartImp(pthread_t* thread, int priority, int realtime, ThreadCallback start_routine, void* arg)
 {
     DWORD id;
 
@@ -206,29 +206,12 @@ int JackWinThread::Stop()
 
 int JackWinThread::AcquireRealTime()
 {
-	/*
-    JackLog("JackWinThread::AcquireRealTime\n");
-
-    if (fThread) {
-        if (!SetThreadPriority(fThread, THREAD_PRIORITY_TIME_CRITICAL)) {
-            jack_error("Cannot set thread priority = %d", GetLastError());
-            return -1;
-        }
-        JackLog("JackWinThread::AcquireRealTime OK\n");
-        return 0;
-    } else {
-        return -1;
-    }
-	*/
 	return (fThread) ? AcquireRealTimeImp(fThread, fPriority) : -1;
 }
 
 int JackWinThread::AcquireRealTime(int priority)
 {
-    //JackLog("JackWinThread::AcquireRealTime priority = %ld\n", priority);
-    //return AcquireRealTime();
-	
-	fPriority = priority;
+ 	fPriority = priority;
 	return AcquireRealTime();
 }
 
@@ -244,21 +227,6 @@ int JackWinThread::AcquireRealTimeImp(pthread_t thread, int priority)
 		return -1;
 	}
 }
-
-/*
-int JackWinThread::DropRealTime()
-{
-    if (fThread) {
-        if (!SetThreadPriority(fThread, THREAD_PRIORITY_NORMAL)) {
-            jack_error("Cannot set thread priority = %d", GetLastError());
-            return -1;
-        }
-        return 0;
-    } else {
-        return -1;
-    }
-}
-*/
 int JackWinThread::DropRealTime()
 {
 	return DropRealTimeImp(fThread);
@@ -270,8 +238,8 @@ int JackWinThread::DropRealTimeImp(pthread_t thread)
 		return 0;
 	} else {
 		jack_error("Cannot set thread priority = %d", GetLastError());
-		return -1;
-	}
+		return -1;
+	}
 }
 
 pthread_t JackWinThread::GetThreadID()