Cleanup.

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

common/JackDriver.cpp

@@ -37,9 +37,9 @@ namespace Jack
 {
 
 JackDriver::JackDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
-    :fClientControl(name),
-    fCaptureChannels(0),
+    :fCaptureChannels(0),
     fPlaybackChannels(0),
+    fClientControl(name),
     fWithMonitorPorts(false)
 {
     assert(strlen(name) < JACK_CLIENT_NAME_SIZE);
@@ -476,7 +476,6 @@ bool JackDriver::Initialize()
     return true;
 }
 
-
 void JackDriver::SaveConnections()
 {
     const char** connections;

common/JackDriver.h

@@ -143,21 +143,25 @@ class SERVER_EXPORT JackDriver : public JackDriverClientInterface
         jack_nframes_t fCaptureLatency;
         jack_nframes_t fPlaybackLatency;
 
+        int fCaptureChannels;
+        int fPlaybackChannels;
+
         jack_time_t fBeginDateUst;
         jack_time_t fEndDateUst;
         float fDelayedUsecs;
 
+        // Pointers to engine state
         JackLockedEngine* fEngine;
         JackGraphManager* fGraphManager;
         JackSynchro* fSynchroTable;
         JackEngineControl* fEngineControl;
         JackClientControl fClientControl;
+
         std::list<JackDriverInterface*> fSlaveList;
+
         bool fIsMaster;
         bool fIsRunning;
-
-        int fCaptureChannels;
-        int fPlaybackChannels;
+        bool fWithMonitorPorts;
 
         // Static tables since the actual number of ports may be changed by the real driver
         // thus dynamic allocation is more difficult to handle
@@ -165,8 +169,6 @@ class SERVER_EXPORT JackDriver : public JackDriverClientInterface
         jack_port_id_t fPlaybackPortList[DRIVER_PORT_NUM];
         jack_port_id_t fMonitorPortList[DRIVER_PORT_NUM];
 
-        bool fWithMonitorPorts;
-
         std::list<std::pair<std::string, std::string> > fConnections;		// Connections list
 
         void CycleIncTime();

common/JackGraphManager.cpp

@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 namespace Jack
 {
 
-
 static void AssertBufferSize(jack_nframes_t buffer_size)
 {
     if (buffer_size > BUFFER_SIZE_MAX) {