diff options
-rw-r--r-- | common/JackAC3Encoder.h | 24 | ||||
-rw-r--r-- | common/JackAtomicArrayState.h | 10 | ||||
-rw-r--r-- | common/JackAtomicState.h | 22 | ||||
-rw-r--r-- | common/JackChannel.h | 4 | ||||
-rw-r--r-- | common/JackDebugClient.h | 2 | ||||
-rw-r--r-- | common/JackDriver.h | 4 | ||||
-rw-r--r-- | common/JackEngine.h | 8 | ||||
-rw-r--r-- | common/JackEngineControl.h | 4 | ||||
-rw-r--r-- | common/JackEngineProfiling.h | 24 | ||||
-rw-r--r-- | common/JackLockedEngine.h | 6 | ||||
-rw-r--r-- | common/JackNetAdapter.h | 2 | ||||
-rw-r--r-- | common/JackNetDriver.h | 16 | ||||
-rw-r--r-- | common/JackNetInterface.h | 12 | ||||
-rw-r--r-- | common/JackNetManager.h | 8 | ||||
-rw-r--r-- | common/JackNetTool.h | 10 | ||||
-rw-r--r-- | common/JackProfiler.h | 10 | ||||
-rw-r--r-- | common/JackRequest.h | 42 | ||||
-rw-r--r-- | common/JackResampler.h | 2 | ||||
-rw-r--r-- | common/JackServer.h | 10 | ||||
-rw-r--r-- | common/JackShmMem.h | 6 | ||||
-rw-r--r-- | common/netjack.h | 2 | ||||
-rw-r--r-- | common/shm.h | 10 |
22 files changed, 119 insertions, 119 deletions
diff --git a/common/JackAC3Encoder.h b/common/JackAC3Encoder.h index b31ca4e2..45d629c4 100644 --- a/common/JackAC3Encoder.h +++ b/common/JackAC3Encoder.h @@ -53,41 +53,41 @@ class JackAC3Encoder private: - AftenContext fAftenContext; + AftenContext fAftenContext; jack_ringbuffer_t* fRingBuffer; - + float* fSampleBuffer; unsigned char* fAC3Buffer; unsigned char* fZeroBuffer; - - int fOutSizeByte; - + + int fOutSizeByte; + jack_nframes_t fFramePos; jack_nframes_t fSampleRate; jack_nframes_t fByteRate; - + void FillSpdifHeader(unsigned char* buf, int outsize); int Output2Driver(float** outputs, jack_nframes_t nframes); - + void sample_move_dS_s16(jack_default_audio_sample_t* dst, char *src, jack_nframes_t nsamples, unsigned long src_skip); void sample_move_dS_s16_24ph(jack_default_audio_sample_t* dst, char *src, jack_nframes_t nsamples, unsigned long src_skip); public: - + #ifdef __ppc__ JackAC3Encoder(const JackAC3EncoderParams& params) {} virtual ~JackAC3Encoder() {} - + bool Init(jack_nframes_t sample_rate) {return false;} - + void Process(float** inputs, float** outputs, int nframes) {} void GetChannelName(const char* name, const char* alias, char* portname, int channel) {} #else JackAC3Encoder(const JackAC3EncoderParams& params); virtual ~JackAC3Encoder(); - + bool Init(jack_nframes_t sample_rate); - + void Process(float** inputs, float** outputs, int nframes); void GetChannelName(const char* name, const char* alias, char* portname, int channel); #endif diff --git a/common/JackAtomicArrayState.h b/common/JackAtomicArrayState.h index a2c0139d..7113da5c 100644 --- a/common/JackAtomicArrayState.h +++ b/common/JackAtomicArrayState.h @@ -40,18 +40,18 @@ struct AtomicArrayCounter scounter; UInt32 fLongVal; }info; - + AtomicArrayCounter() { info.fLongVal = 0; } - AtomicArrayCounter(volatile const AtomicArrayCounter& obj) + AtomicArrayCounter(volatile const AtomicArrayCounter& obj) { info.fLongVal = obj.info.fLongVal; } - AtomicArrayCounter(volatile AtomicArrayCounter& obj) + AtomicArrayCounter(volatile AtomicArrayCounter& obj) { info.fLongVal = obj.info.fLongVal; } @@ -67,7 +67,7 @@ struct AtomicArrayCounter info.fLongVal = obj.info.fLongVal; return *this; } - + } POST_PACKED_STRUCTURE; #define Counter1(e) (e).info.fLongVal @@ -243,7 +243,7 @@ class JackAtomicArrayState /*! \brief Stop write operation : make the next state ready to be used by the RT thread */ - + void WriteNextStateStop(int state) { WriteNextStateStopAux(state); diff --git a/common/JackAtomicState.h b/common/JackAtomicState.h index 1eef4e11..6f90d66a 100644 --- a/common/JackAtomicState.h +++ b/common/JackAtomicState.h @@ -48,12 +48,12 @@ struct AtomicCounter info.fLongVal = 0; } - AtomicCounter(volatile const AtomicCounter& obj) + AtomicCounter(volatile const AtomicCounter& obj) { info.fLongVal = obj.info.fLongVal; } - - AtomicCounter(volatile AtomicCounter& obj) + + AtomicCounter(volatile AtomicCounter& obj) { info.fLongVal = obj.info.fLongVal; } @@ -139,7 +139,7 @@ class JackAtomicState {} /*! - \brief Returns the current state : only valid in the RT reader thread + \brief Returns the current state : only valid in the RT reader thread */ T* ReadCurrentState() { @@ -212,7 +212,7 @@ class JackAtomicState /* // Single writer : write methods get the *next* state to be updated - void TestWriteMethod() + void TestWriteMethod() { T* state = WriteNextStateStart(); ...... @@ -221,7 +221,7 @@ class JackAtomicState } // First RT call possibly switch state - void TestReadRTMethod1() + void TestReadRTMethod1() { T* state = TrySwitchState(); ...... @@ -235,25 +235,25 @@ class JackAtomicState ...... ...... } - + // Non RT read methods : must check state coherency - void TestReadMethod() + void TestReadMethod() { T* state; UInt16 cur_index; UInt16 next_index = GetCurrentIndex(); do { - cur_index = next_index; + cur_index = next_index; state = ReadCurrentState(); ...... ...... - + next_index = GetCurrentIndex(); } while (cur_index != next_index); } */ - + } POST_PACKED_STRUCTURE; } // end of namespace diff --git a/common/JackChannel.h b/common/JackChannel.h index 6b0bca79..c4188b3c 100644 --- a/common/JackChannel.h +++ b/common/JackChannel.h @@ -75,10 +75,10 @@ class JackClientRequestInterface : public JackChannelTransactionInterface, publi {} virtual ~JackClientRequestInterface() {} - + virtual int Read(void* data, int len) { return -1; } virtual int Write(void* data, int len) { return -1; } - + virtual int Connect(const char* dir, const char* name, int which) { return -1; } virtual int Close() { return -1; } diff --git a/common/JackDebugClient.h b/common/JackDebugClient.h index 541c8cd8..efe71dee 100644 --- a/common/JackDebugClient.h +++ b/common/JackDebugClient.h @@ -131,7 +131,7 @@ class JackDebugClient : public JackClient int InternalClientHandle(const char* client_name, jack_status_t* status); int InternalClientLoad(const char* client_name, jack_options_t options, jack_status_t* status, jack_varargs_t* va); void InternalClientUnload(int ref, jack_status_t* status); - + // RT Thread int SetProcessThread(JackThreadCallback fun, void *arg); diff --git a/common/JackDriver.h b/common/JackDriver.h index 3dd88e81..c66e2500 100644 --- a/common/JackDriver.h +++ b/common/JackDriver.h @@ -162,14 +162,14 @@ class SERVER_EXPORT JackDriver : public JackDriverClientInterface jack_port_id_t fPlaybackPortList[DRIVER_PORT_NUM]; jack_port_id_t fMonitorPortList[DRIVER_PORT_NUM]; - driver_connections_list_t fConnections; // Connections list + driver_connections_list_t fConnections; // Connections list void CycleIncTime(); void CycleTakeBeginTime(); void CycleTakeEndTime(); void SetupDriverSync(int ref, bool freewheel); - + void NotifyXRun(jack_time_t callback_usecs, float delayed_usecs); // XRun notification sent by the driver void NotifyBufferSize(jack_nframes_t buffer_size); // BufferSize notification sent by the driver void NotifySampleRate(jack_nframes_t sample_rate); // SampleRate notification sent by the driver diff --git a/common/JackEngine.h b/common/JackEngine.h index 5ef115bd..302f1698 100644 --- a/common/JackEngine.h +++ b/common/JackEngine.h @@ -78,7 +78,7 @@ class SERVER_EXPORT JackEngine : public JackLockAble void ReleaseRefnum(int refnum); int ClientNotify(JackClientInterface* client, int refnum, const char* name, int notify, int sync, const char* message, int value1, int value2); - + void NotifyClient(int refnum, int event, int sync, const char* message, int value1, int value2); void NotifyClients(int event, int sync, const char* message, int value1, int value2); @@ -104,10 +104,10 @@ class SERVER_EXPORT JackEngine : public JackLockAble int Open(); int Close(); - + // Client management int ClientCheck(const char* name, int uuid, char* name_res, int protocol, int options, int* status); - + int ClientExternalOpen(const char* name, int pid, int uuid, int* ref, int* shared_engine, int* shared_client, int* shared_graph_manager); int ClientInternalOpen(const char* name, int* ref, JackEngineControl** shared_engine, JackGraphManager** shared_manager, JackClientInterface* client, bool wait); @@ -116,7 +116,7 @@ class SERVER_EXPORT JackEngine : public JackLockAble int ClientActivate(int refnum, bool is_real_time); int ClientDeactivate(int refnum); - + void ClientKill(int refnum); int GetClientPID(const char* name); diff --git a/common/JackEngineControl.h b/common/JackEngineControl.h index 5e499525..21ae3599 100644 --- a/common/JackEngineControl.h +++ b/common/JackEngineControl.h @@ -104,7 +104,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem fRealTime = rt; fSavedRealTime = false; fServerPriority = priority; - + #ifdef WIN32 fClientPriority = (rt) ? priority - 3 : 0; #else @@ -130,7 +130,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem ~JackEngineControl() {} - + void UpdateTimeOut() { fPeriodUsecs = jack_time_t(1000000.f / fSampleRate * fBufferSize); // In microsec diff --git a/common/JackEngineProfiling.h b/common/JackEngineProfiling.h index 04fdb953..949e2573 100644 --- a/common/JackEngineProfiling.h +++ b/common/JackEngineProfiling.h @@ -45,7 +45,7 @@ struct JackTimingMeasureClient jack_time_t fAwakeAt; jack_time_t fFinishedAt; jack_client_state_t fStatus; - + JackTimingMeasureClient() :fRefNum(-1), fSignaledAt(0), @@ -53,7 +53,7 @@ struct JackTimingMeasureClient fFinishedAt(0), fStatus((jack_client_state_t)0) {} - + } POST_PACKED_STRUCTURE; /*! @@ -67,13 +67,13 @@ struct JackTimingClientInterval char fName[JACK_CLIENT_NAME_SIZE + 1]; int fBeginInterval; int fEndInterval; - + JackTimingClientInterval() :fRefNum(-1), fBeginInterval(-1), fEndInterval(-1) {} - + } POST_PACKED_STRUCTURE; /*! @@ -88,14 +88,14 @@ struct JackTimingMeasure jack_time_t fCurCycleBegin; jack_time_t fPrevCycleEnd; JackTimingMeasureClient fClientTable[CLIENT_NUM]; - + JackTimingMeasure() :fAudioCycle(0), fPeriodUsecs(0), fCurCycleBegin(0), fPrevCycleEnd(0) {} - + } POST_PACKED_STRUCTURE; /*! @@ -110,20 +110,20 @@ class SERVER_EXPORT JackEngineProfiling { private: - + JackTimingMeasure fProfileTable[TIME_POINTS]; JackTimingClientInterval fIntervalTable[MEASURED_CLIENTS]; - + unsigned int fAudioCycle; unsigned int fMeasuredClient; - + bool CheckClient(const char* name, int cur_point); - + public: - + JackEngineProfiling(); ~JackEngineProfiling(); - + void Profile(JackClientInterface** table, JackGraphManager* manager, jack_time_t period_usecs, diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h index 7cc0f401..a07eb38e 100644 --- a/common/JackLockedEngine.h +++ b/common/JackLockedEngine.h @@ -88,11 +88,11 @@ class SERVER_EXPORT JackLockedEngine {} ~JackLockedEngine() {} - + bool Lock() { return fEngine.Lock(); } bool Unlock() { return fEngine.Unlock(); } bool Trylock() { return fEngine.Trylock(); } - + int Open() { // No lock needed @@ -107,7 +107,7 @@ class SERVER_EXPORT JackLockedEngine return fEngine.Close(); CATCH_EXCEPTION_RETURN } - + // Client management int ClientCheck(const char* name, int uuid, char* name_res, int protocol, int options, int* status) { diff --git a/common/JackNetAdapter.h b/common/JackNetAdapter.h index ff7a1e12..05de4632 100644 --- a/common/JackNetAdapter.h +++ b/common/JackNetAdapter.h @@ -50,7 +50,7 @@ namespace Jack //adapter thread JackThread fThread; - + //transport void EncodeTransportData(); void DecodeTransportData(); diff --git a/common/JackNetDriver.h b/common/JackNetDriver.h index f1f7d509..da65a13b 100644 --- a/common/JackNetDriver.h +++ b/common/JackNetDriver.h @@ -43,16 +43,16 @@ namespace Jack //transport int fLastTransportState; int fLastTimebaseMaster; - + // The wanted value at creation time (may be different than the value actually returned by the master) - int fWantedAudioCaptureChannels; - int fWantedAudioPlaybackChannels; - + int fWantedAudioCaptureChannels; + int fWantedAudioPlaybackChannels; + int fWantedMIDICaptureChannels; int fWantedMIDIPlaybackChannels; - + bool fAutoSave; - + //monitoring #ifdef JACK_MONITOR JackGnuPlotMonitor<float>* fNetTimeMon; @@ -73,14 +73,14 @@ namespace Jack JackMidiBuffer* GetMidiOutputBuffer(int port_index); void SaveConnections(int alias); - + void UpdateLatencies(); public: JackNetDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table, const char* ip, int port, int mtu, int midi_input_ports, int midi_output_ports, - char* net_name, uint transport_sync, int network_latency, int celt_encoding, + char* net_name, uint transport_sync, int network_latency, int celt_encoding, int opus_encoding, bool auto_save); virtual ~JackNetDriver(); diff --git a/common/JackNetInterface.h b/common/JackNetInterface.h index dce0f19e..c05979b0 100644 --- a/common/JackNetInterface.h +++ b/common/JackNetInterface.h @@ -38,7 +38,7 @@ namespace Jack #define SLAVE_INIT_TIMEOUT 1000000 * 1 // in usec #define PACKET_TIMEOUT 1000000 // in usec -#define NETWORK_DEFAULT_LATENCY 2 +#define NETWORK_DEFAULT_LATENCY 2 #define NETWORK_MAX_LATENCY 30 // maximum possible latency in network master/slave loop /** @@ -49,9 +49,9 @@ namespace Jack { friend class JackNetExt; - + protected: - + bool fSetTimeOut; int fPacketTimeOut; @@ -115,7 +115,7 @@ namespace Jack int AudioRecv(packet_header_t* rx_head, NetAudioBuffer* buffer); int FinishRecv(NetAudioBuffer* buffer); - + void SetRcvTimeOut(); void SetPacketTimeOut(int time_out) { @@ -149,7 +149,7 @@ namespace Jack int fCurrentCycleOffset; int fMaxCycleOffset; bool fSynched; - + bool Init(); bool SetParams(); @@ -207,7 +207,7 @@ namespace Jack bool InitConnection(int time_out_sec); bool InitRendering(); - net_status_t SendAvailableToMaster(int count = INT_MAX); + net_status_t SendAvailableToMaster(int count = INT_MAX); net_status_t SendStartToMaster(); bool SetParams(); diff --git a/common/JackNetManager.h b/common/JackNetManager.h index 31e81827..80a66070 100644 --- a/common/JackNetManager.h +++ b/common/JackNetManager.h @@ -32,7 +32,7 @@ namespace Jack /** \Brief This class describes a Net Master */ - + typedef std::list<std::pair<std::string, std::string> > connections_list_t; class JackNetMaster : public JackNetMasterInterface @@ -40,7 +40,7 @@ namespace Jack friend class JackNetMasterManager; private: - + static int SetProcess(jack_nframes_t nframes, void* arg); static int SetBufferSize(jack_nframes_t nframes, void* arg); static int SetSampleRate(jack_nframes_t nframes, void* arg); @@ -60,7 +60,7 @@ namespace Jack //sync and transport int fLastTransportState; - + //monitoring #ifdef JACK_MONITOR jack_time_t fPeriodUsecs; @@ -79,7 +79,7 @@ namespace Jack void TimebaseCallback(jack_position_t* pos); void ConnectPorts(); void ConnectCallback(jack_port_id_t a, jack_port_id_t b, int connect); - + void SaveConnections(connections_list_t& connections); void LoadConnections(const connections_list_t& connections); diff --git a/common/JackNetTool.h b/common/JackNetTool.h index fb469fe2..b22061c3 100644 --- a/common/JackNetTool.h +++ b/common/JackNetTool.h @@ -342,8 +342,8 @@ namespace Jack int fPacketSize; void UpdateParams(int active_ports); - - + + void RenderFromNetwork(char* net_buffer, int active_port, int sub_cycle); void RenderToNetwork(char* net_buffer, int active_port, int sub_cycle); @@ -379,7 +379,7 @@ namespace Jack int fCompressedSizeByte; unsigned char** fCompressedBuffer; - + size_t fLastSubPeriodBytesSize; void FreeCelt(); @@ -422,7 +422,7 @@ namespace Jack int fCompressedMaxSizeByte; unsigned short* fCompressedSizesByte; - + size_t fLastSubPeriodBytesSize; unsigned char** fCompressedBuffer; @@ -456,7 +456,7 @@ namespace Jack private: int fCompressedSizeByte; - + size_t fLastSubPeriodBytesSize; short** fIntBuffer; diff --git a/common/JackProfiler.h b/common/JackProfiler.h index bdf3419f..6ce93921 100644 --- a/common/JackProfiler.h +++ b/common/JackProfiler.h @@ -40,21 +40,21 @@ struct JackProfilerClient { jack_client_t* fClient; jack_port_t* fSchedulingPort; jack_port_t* fDurationPort; - + JackProfilerClient(jack_client_t* client, const char* name); ~JackProfilerClient(); - + }; /*! \brief Server real-time monitoring */ -class JackProfiler +class JackProfiler { private: - + jack_client_t* fClient; jack_port_t* fCPULoadPort; jack_port_t* fDriverPeriodPort; @@ -64,7 +64,7 @@ class JackProfiler std::map<std::string, JackProfilerClient*> fClientTable; JackMutex fMutex; #endif - + public: JackProfiler(jack_client_t* jack_client, const JSList* params); diff --git a/common/JackRequest.h b/common/JackRequest.h index 18462af0..314f84fc 100644 --- a/common/JackRequest.h +++ b/common/JackRequest.h @@ -111,14 +111,14 @@ struct JackRequest } virtual int Write(detail::JackChannelTransactionInterface* trans) { return -1; } - + virtual int Write(detail::JackChannelTransactionInterface* trans, int size) { fSize = size; CheckRes(trans->Write(&fType, sizeof(RequestType))); return trans->Write(&fSize, sizeof(int)); } - + virtual int Size() { return 0; } }; @@ -194,7 +194,7 @@ struct JackClientCheckRequest : public JackRequest CheckRes(trans->Write(&fUUID, sizeof(int))); return trans->Write(&fOpen, sizeof(int)); } - + int Size() { return sizeof(fName) + 4 * sizeof(int); } }; @@ -278,7 +278,7 @@ struct JackClientOpenRequest : public JackRequest } int Size() { return 2 * sizeof(int) + sizeof(fName); } - + }; /*! @@ -458,7 +458,7 @@ struct JackPortRegisterRequest : public JackRequest CheckRes(trans->Write(&fBufferSize, sizeof(unsigned int))); return 0; } - + int Size() { return sizeof(int) + sizeof(fName) + sizeof(fPortType) + 2 * sizeof(unsigned int); } }; @@ -566,7 +566,7 @@ struct JackPortConnectNameRequest : public JackRequest CheckRes(trans->Write(&fDst, sizeof(fDst))); return 0; } - + int Size() { return sizeof(int) + sizeof(fSrc) + sizeof(fDst); } }; @@ -615,7 +615,7 @@ struct JackPortDisconnectNameRequest : public JackRequest } int Size() { return sizeof(int) + sizeof(fSrc) + sizeof(fDst); } - + }; /*! @@ -733,7 +733,7 @@ struct JackPortRenameRequest : public JackRequest CheckRes(trans->Write(&fName, sizeof(fName))); return 0; } - + int Size() { return sizeof(int) + sizeof(jack_port_id_t) + sizeof(fName); } }; @@ -794,7 +794,7 @@ struct JackSetFreeWheelRequest : public JackRequest CheckRes(JackRequest::Write(trans, Size())); return trans->Write(&fOnOff, sizeof(int)); } - + int Size() { return sizeof(int); } }; @@ -851,7 +851,7 @@ struct JackReleaseTimebaseRequest : public JackRequest CheckRes(JackRequest::Write(trans, Size())); return trans->Write(&fRefNum, sizeof(int)); } - + int Size() { return sizeof(int); } }; @@ -1156,7 +1156,7 @@ struct JackInternalClientUnloadRequest : public JackRequest CheckRes(trans->Write(&fRefNum, sizeof(int))); return trans->Write(&fIntRefNum, sizeof(int)); } - + int Size() { return sizeof(int) + sizeof(int); } }; @@ -1226,7 +1226,7 @@ struct JackClientNotificationRequest : public JackRequest CheckRes(trans->Write(&fValue, sizeof(int))); return 0; } - + int Size() { return 3 * sizeof(int); } }; @@ -1420,7 +1420,7 @@ struct JackSessionReplyRequest : public JackRequest } int Size() { return sizeof(int); } - + }; struct JackClientNameResult : public JackResult @@ -1451,7 +1451,7 @@ struct JackClientNameResult : public JackResult CheckRes(trans->Write(&fName, sizeof(fName))); return 0; } - + }; struct JackUUIDResult : public JackResult @@ -1516,7 +1516,7 @@ struct JackGetUUIDRequest : public JackRequest } int Size() { return sizeof(fName); } - + }; struct JackGetClientNameRequest : public JackRequest @@ -1536,7 +1536,7 @@ struct JackGetClientNameRequest : public JackRequest } int Read(detail::JackChannelTransactionInterface* trans) - { + { CheckSize(); CheckRes(trans->Read(&fUUID, sizeof(fUUID))); return 0; @@ -1550,7 +1550,7 @@ struct JackGetClientNameRequest : public JackRequest } int Size() { return sizeof(fUUID); } - + }; struct JackReserveNameRequest : public JackRequest @@ -1593,7 +1593,7 @@ struct JackReserveNameRequest : public JackRequest } int Size() { return sizeof(fUUID) + sizeof(fName) + sizeof(fRefNum); } - + }; struct JackClientHasSessionCallbackRequest : public JackRequest @@ -1627,7 +1627,7 @@ struct JackClientHasSessionCallbackRequest : public JackRequest } int Size() { return sizeof(fName); } - + }; @@ -1678,7 +1678,7 @@ struct JackPropertyChangeNotifyRequest : public JackRequest struct JackClientNotification { - int fSize; + int fSize; char fName[JACK_CLIENT_NAME_SIZE+1]; int fRefNum; int fNotify; @@ -1727,7 +1727,7 @@ struct JackClientNotification CheckRes(trans->Write(&fMessage, sizeof(fMessage))); return 0; } - + int Size() { return sizeof(int) + sizeof(fName) + 5 * sizeof(int) + sizeof(fMessage); } }; diff --git a/common/JackResampler.h b/common/JackResampler.h index f1f78a92..74c75a26 100644 --- a/common/JackResampler.h +++ b/common/JackResampler.h @@ -82,7 +82,7 @@ class JackResampler : public JackRingBuffer protected: double fRatio; - + public: JackResampler():JackRingBuffer(),fRatio(1) diff --git a/common/JackServer.h b/common/JackServer.h index 9cfc9605..c1b5b0d8 100644 --- a/common/JackServer.h +++ b/common/JackServer.h @@ -73,23 +73,23 @@ class SERVER_EXPORT JackServer int Start(); int Stop(); - + bool IsRunning(); // RT thread void Notify(int refnum, int notify, int value); - // From request thread : API + // From request thread : API int SetBufferSize(jack_nframes_t buffer_size); int SetFreewheel(bool onoff); - + // Internals clients int InternalClientLoad1(const char* client_name, const char* so_name, const char* objet_data, int options, int* int_ref, int uuid, int* status); int InternalClientLoad2(const char* client_name, const char* so_name, const JSList * parameters, int options, int* int_ref, int uuid, int* status); - + // Internal session file int LoadInternalSessionFile(const char* file); - + // Transport management int ReleaseTimebase(int refnum); int SetTimebaseCallback(int refnum, int conditional); diff --git a/common/JackShmMem.h b/common/JackShmMem.h index ceb76910..04641230 100644 --- a/common/JackShmMem.h +++ b/common/JackShmMem.h @@ -186,7 +186,7 @@ class JackShmReadWritePtr ~JackShmReadWritePtr() { if (!fInitDone) { - jack_error("JackShmReadWritePtr::~JackShmReadWritePtr - Init not done for %d, skipping unlock", fInfo.index); + jack_error("JackShmReadWritePtr::~JackShmReadWritePtr - Init not done for %d, skipping unlock", fInfo.index); return; } if (fInfo.index >= 0) { @@ -281,7 +281,7 @@ class JackShmReadWritePtr1 ~JackShmReadWritePtr1() { if (!fInitDone) { - jack_error("JackShmReadWritePtr1::~JackShmReadWritePtr1 - Init not done for %d, skipping unlock", fInfo.index); + jack_error("JackShmReadWritePtr1::~JackShmReadWritePtr1 - Init not done for %d, skipping unlock", fInfo.index); return; } if (fInfo.index >= 0) { @@ -370,7 +370,7 @@ class JackShmReadPtr ~JackShmReadPtr() { if (!fInitDone) { - jack_error("JackShmReadPtr::~JackShmReadPtr - Init not done for %ld, skipping unlock", fInfo.index); + jack_error("JackShmReadPtr::~JackShmReadPtr - Init not done for %ld, skipping unlock", fInfo.index); return; } if (fInfo.index >= 0) { diff --git a/common/netjack.h b/common/netjack.h index 45ebe372..b21f5bde 100644 --- a/common/netjack.h +++ b/common/netjack.h @@ -121,7 +121,7 @@ extern "C" OpusCustomMode* opus_mode; #endif }; - + int netjack_wait( netjack_driver_state_t *netj ); void netjack_send_silence( netjack_driver_state_t *netj, int syncstate ); void netjack_read( netjack_driver_state_t *netj, jack_nframes_t nframes ) ; diff --git a/common/shm.h b/common/shm.h index 12f0f228..e9b4403e 100644 --- a/common/shm.h +++ b/common/shm.h @@ -71,7 +71,7 @@ extern "C" typedef char shm_name_t[SHM_NAME_MAX]; typedef shm_name_t jack_shm_id_t; -#elif WIN32 +#elif WIN32 #define NAME_MAX 255 #ifndef SHM_NAME_MAX #define SHM_NAME_MAX NAME_MAX @@ -178,10 +178,10 @@ extern "C" char ptr_size[8]; } ptr; /* a "pointer" that has the same 8 bytes size when compling in 32 or 64 bits */ } POST_PACKED_STRUCTURE; - + typedef struct _jack_shm_info jack_shm_info_t; - - /* utility functions used only within JACK */ + + /* utility functions used only within JACK */ void jack_shm_copy_from_registry (jack_shm_info_t*, jack_shm_registry_index_t); @@ -190,7 +190,7 @@ extern "C" int jack_release_shm_info (jack_shm_registry_index_t); char* jack_shm_addr (jack_shm_info_t* si); - // here begin the API + /* here begin the API */ int jack_register_server (const char *server_name, int new_registry); int jack_unregister_server (const char *server_name); |