git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3469 0c269be4-1314-0410-8aa9-9f06e86f4224tags/v1.9.3
| @@ -184,11 +184,6 @@ class JackClient : public JackClientInterface, public JackRunnableInterface | |||||
| bool Execute(); | bool Execute(); | ||||
| }; | }; | ||||
| // Each "side" server and client will implement this to get the shared graph manager, engine control and inter-process synchro table. | |||||
| extern JackGraphManager* GetGraphManager(); | |||||
| extern JackEngineControl* GetEngineControl(); | |||||
| extern JackSynchro* GetSynchroTable(); | |||||
| } // end of namespace | } // end of namespace | ||||
| #endif | #endif | ||||
| @@ -22,13 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |||||
| #include "JackPlatformPlug.h" | #include "JackPlatformPlug.h" | ||||
| #include "JackConstants.h" | #include "JackConstants.h" | ||||
| #include "JackClient.h" | |||||
| namespace Jack | namespace Jack | ||||
| { | { | ||||
| // Globals used for client management on server or libray side. | // Globals used for client management on server or libray side. | ||||
| struct JackGlobals { | struct JackGlobals { | ||||
| static jack_tls_key fRealTime; | static jack_tls_key fRealTime; | ||||
| @@ -42,6 +40,11 @@ struct JackGlobals { | |||||
| }; | }; | ||||
| // Each "side" server and client will implement this to get the shared graph manager, engine control and inter-process synchro table. | |||||
| extern EXPORT JackGraphManager* GetGraphManager(); | |||||
| extern EXPORT JackEngineControl* GetEngineControl(); | |||||
| extern EXPORT JackSynchro* GetSynchroTable(); | |||||
| } // end of namespace | } // end of namespace | ||||
| #endif | #endif | ||||
| @@ -90,17 +90,17 @@ JackGraphManager* JackInternalClient::fGraphManager = NULL; | |||||
| JackEngineControl* JackInternalClient::fEngineControl = NULL; | JackEngineControl* JackInternalClient::fEngineControl = NULL; | ||||
| // Used for external C API (JackAPI.cpp) | // Used for external C API (JackAPI.cpp) | ||||
| JackGraphManager* GetGraphManager() | |||||
| EXPORT JackGraphManager* GetGraphManager() | |||||
| { | { | ||||
| return JackServerGlobals::fInstance->GetGraphManager(); | return JackServerGlobals::fInstance->GetGraphManager(); | ||||
| } | } | ||||
| JackEngineControl* GetEngineControl() | |||||
| EXPORT JackEngineControl* GetEngineControl() | |||||
| { | { | ||||
| return JackServerGlobals::fInstance->GetEngineControl(); | return JackServerGlobals::fInstance->GetEngineControl(); | ||||
| } | } | ||||
| JackSynchro* GetSynchroTable() | |||||
| EXPORT JackSynchro* GetSynchroTable() | |||||
| { | { | ||||
| return JackServerGlobals::fInstance->GetSynchroTable(); | return JackServerGlobals::fInstance->GetSynchroTable(); | ||||
| } | } | ||||
| @@ -226,11 +226,9 @@ namespace Jack | |||||
| SetAdaptedSampleRate ( fParams.fSampleRate ); | SetAdaptedSampleRate ( fParams.fSampleRate ); | ||||
| // Will do "something" on OSX only... | // Will do "something" on OSX only... | ||||
| fThread.SetParams(JackServerGlobals::fInstance->GetEngineControl()->fPeriod, | |||||
| JackServerGlobals::fInstance->GetEngineControl()->fComputation, | |||||
| JackServerGlobals::fInstance->GetEngineControl()->fConstraint); | |||||
| fThread.SetParams(GetEngineControl()->fPeriod, GetEngineControl()->fComputation, GetEngineControl()->fConstraint); | |||||
| if (fThread.AcquireRealTime ( JackServerGlobals::fInstance->GetEngineControl()->fClientPriority ) < 0) { | |||||
| if (fThread.AcquireRealTime(GetEngineControl()->fClientPriority) < 0) { | |||||
| jack_error("AcquireRealTime error"); | jack_error("AcquireRealTime error"); | ||||
| } else { | } else { | ||||
| set_threaded_log_function(); | set_threaded_log_function(); | ||||
| @@ -22,7 +22,6 @@ | |||||
| #include "JackThreadedDriver.h" | #include "JackThreadedDriver.h" | ||||
| #include "JackError.h" | #include "JackError.h" | ||||
| #include "JackGlobals.h" | #include "JackGlobals.h" | ||||
| #include "JackClient.h" | |||||
| #include "JackEngineControl.h" | #include "JackEngineControl.h" | ||||
| namespace Jack | namespace Jack | ||||