Cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2703 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackConstants.h

@@ -20,8 +20,6 @@
 #ifndef __JackConstants__
 #define __JackConstants__
 
-#include "types.h"
-
 namespace Jack
 {
 

common/JackEngineControl.cpp

@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "config.h"
 #endif
 
+#include "JackClientInterface.h"
 #include "JackEngineControl.h"
 #include "JackGraphManager.h"
 #include "JackClientControl.h"

common/JackTransportEngine.cpp

@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #endif
 
 #include "JackTransportEngine.h"
+#include "JackClientInterface.h"
 #include "JackClientControl.h"
 #include "JackError.h"
 #include "JackTime.h"
@@ -228,7 +229,7 @@ void JackTransportEngine::CycleEnd(JackClientInterface** table, jack_nframes_t f
     if (fPendingPos) {
         jack_log("New pos = %ld", request->frame);
         jack_position_t* pending = WriteNextStateStart(1);
-        TransportCopyPosition(request, pending);
+        CopyPosition(request, pending);
         WriteNextStateStop(1);
     }
 }
@@ -249,7 +250,7 @@ void JackTransportEngine::RequestNewPos(jack_position_t* pos)
 {
     jack_position_t* request = WriteNextStateStart(2);
     pos->unique_1 = pos->unique_2 = GenerateUniqueID();
-    TransportCopyPosition(pos, request);
+    CopyPosition(pos, request);
     jack_log("RequestNewPos pos = %ld", pos->frame);
     WriteNextStateStop(2);
 }
@@ -262,7 +263,7 @@ jack_transport_state_t JackTransportEngine::Query(jack_position_t* pos)
 }
 
 // RT, client
-void JackTransportEngine::TransportCopyPosition(jack_position_t* from, jack_position_t* to)
+void JackTransportEngine::CopyPosition(jack_position_t* from, jack_position_t* to)
 {
     int tries = 0;
     long timeout = 1000;

common/JackTransportEngine.h

@@ -21,9 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackTransportEngine__
 #define __JackTransportEngine__
 
-#include "JackClientInterface.h"
-#include "JackConstants.h"
 #include "JackAtomicArrayState.h"
+#include "JackExports.h"
+#include "types.h"
 
 namespace Jack
 {
@@ -87,6 +87,8 @@ We have:
         
 */
 
+class JackClientInterface;
+
 class EXPORT JackTransportEngine : public JackAtomicArrayState<jack_position_t>
 {
 
@@ -102,10 +104,9 @@ class EXPORT JackTransportEngine : public JackAtomicArrayState<jack_position_t>
         SInt32 fWriteCounter;
 
         bool CheckAllRolling(JackClientInterface** table);
-        
         void MakeAllStartingLocating(JackClientInterface** table);
         void MakeAllStopping(JackClientInterface** table);
-         void MakeAllLocating(JackClientInterface** table);
+        void MakeAllLocating(JackClientInterface** table);
         
         void SyncTimeout(jack_nframes_t frame_rate, jack_nframes_t buffer_size);
 
@@ -170,7 +171,7 @@ class EXPORT JackTransportEngine : public JackAtomicArrayState<jack_position_t>
         
         jack_transport_state_t Query(jack_position_t* pos);
 
-        static void TransportCopyPosition(jack_position_t* from, jack_position_t* to);
+        static void CopyPosition(jack_position_t* from, jack_position_t* to);
 
 };
 

macosx/Jackdmp.xcodeproj/project.pbxproj

@@ -1235,7 +1235,7 @@
 		4B3F49070AD8503300491C6E /* jack_cpu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jack_cpu.c; path = ../tests/jack_cpu.c; sourceTree = SOURCE_ROOT; };
 		4B4259E5076B635E00C1ECE1 /* JackMacEngineRPC.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMacEngineRPC.cpp; sourceTree = SOURCE_ROOT; };
 		4B44FAE50C7598370033A72C /* JackServerLaunch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackServerLaunch.cpp; path = ../common/JackServerLaunch.cpp; sourceTree = SOURCE_ROOT; };
-		4B464301076CAC7700E5077C /* Jack-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "Jack-Info.plist"; sourceTree = SOURCE_ROOT; };
+		4B464301076CAC7700E5077C /* Jack-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Jack-Info.plist"; sourceTree = SOURCE_ROOT; };
 		4B4CA9730E02CF9600F4BFDA /* JackRestartThreadedDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackRestartThreadedDriver.h; path = ../common/JackRestartThreadedDriver.h; sourceTree = SOURCE_ROOT; };
 		4B4CA9740E02CF9600F4BFDA /* JackRestartThreadedDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackRestartThreadedDriver.cpp; path = ../common/JackRestartThreadedDriver.cpp; sourceTree = SOURCE_ROOT; };
 		4B4F9C8A0DC20C0400706CB0 /* JackMessageBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackMessageBuffer.cpp; path = ../common/JackMessageBuffer.cpp; sourceTree = SOURCE_ROOT; };
@@ -1345,7 +1345,7 @@
 		4BD6240C0CBCF16600DE782F /* inprocess.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = inprocess.c; path = "../example-clients/inprocess.c"; sourceTree = SOURCE_ROOT; };
 		4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackTools.cpp; path = ../common/JackTools.cpp; sourceTree = SOURCE_ROOT; };
 		4BE4CC000CDA153400CCF5BB /* JackTools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackTools.h; path = ../common/JackTools.h; sourceTree = SOURCE_ROOT; };
-		4BE50F8F0B01EE8000C05E63 /* Jackwrapper-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Jackwrapper-Info.plist"; sourceTree = "<group>"; };
+		4BE50F8F0B01EE8000C05E63 /* Jackwrapper-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Jackwrapper-Info.plist"; sourceTree = "<group>"; };
 		4BE6C6A30A3E096F005A203A /* jack_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_test; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BE6C6AC0A3E0A65005A203A /* jack_test.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jack_test.cpp; path = ../tests/jack_test.cpp; sourceTree = SOURCE_ROOT; };
 		4BE99D300AD7A04800C59091 /* jack_cpu */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_cpu; sourceTree = BUILT_PRODUCTS_DIR; };