NetJack2 code cleanup.

1 files changed, 14 insertions, 13 deletions

diff --git a/common/JackAudioDriver.h b/common/JackAudioDriver.h
index 42ccb22d..f064aeb1 100644
--- a/common/JackAudioDriver.h
+++ b/common/JackAudioDriver.h
@@ -35,15 +35,6 @@ class SERVER_EXPORT JackAudioDriver : public JackDriver
 
     protected:
 
-        void ProcessGraphAsyncMaster();
-        void ProcessGraphAsyncSlave();
-
-        int ProcessGraphSyncMaster();
-        int ProcessGraphSyncSlave();
-
-        virtual int ProcessAsync();
-        virtual int ProcessSync();
-
         int fCaptureChannels;
         int fPlaybackChannels;
 
@@ -57,12 +48,22 @@ class SERVER_EXPORT JackAudioDriver : public JackDriver
 
         std::list<std::pair<std::string, std::string> > fConnections;		// Connections list
 
-        jack_default_audio_sample_t* GetInputBuffer(int port_index, bool nulled = false);
-        jack_default_audio_sample_t* GetOutputBuffer(int port_index, bool nulled = false);
-        jack_default_audio_sample_t* GetMonitorBuffer(int port_index, bool nulled = false);
+        jack_default_audio_sample_t* GetInputBuffer(int port_index);
+        jack_default_audio_sample_t* GetOutputBuffer(int port_index);
+        jack_default_audio_sample_t* GetMonitorBuffer(int port_index);
 
         void HandleLatencyCallback(int status);
-        void UpdateLatencies();
+        virtual void UpdateLatencies();
+
+        int ProcessAsync();
+        void ProcessGraphAsync();
+        void ProcessGraphAsyncMaster();
+        void ProcessGraphAsyncSlave();
+
+        int ProcessSync();
+        void ProcessGraphSync();
+        int ProcessGraphSyncMaster();
+        int ProcessGraphSyncSlave();
 
     public: