Cleanup.

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

common/JackDriver.cpp

@@ -56,6 +56,7 @@ JackDriver::JackDriver()
     fEngine = NULL;
     fGraphManager = NULL;
     fBeginDateUst = 0;
+    fDelayedUsecs = 0.f;
     fIsMaster = true;
     fIsRunning = false;
 }

common/JackNetAdapter.cpp

@@ -497,10 +497,9 @@ extern "C"
             adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackNetAdapter(jack_client, buffer_size, sample_rate, params), params, false);
             assert ( adapter );
 
-            if ( adapter->Open() == 0 )
+            if (adapter->Open() == 0) {
                 return 0;
-            else
-            {
+            } else {
                 delete adapter;
                 return 1;
             }

common/JackNetManager.cpp

@@ -37,7 +37,7 @@ namespace Jack
         fSendTransportData.fState = -1;
         fReturnTransportData.fState = -1;
         fLastTransportState = -1;
-        uint port_index;
+        int port_index;
 
         //jack audio ports
         fAudioCapturePorts = new jack_port_t* [fParams.fSendAudioChannels];
@@ -164,7 +164,7 @@ namespace Jack
 //jack ports--------------------------------------------------------------------------
     int JackNetMaster::AllocPorts()
     {
-        uint i;
+        int i;
         char name[24];
         jack_nframes_t port_latency = jack_get_buffer_size ( fJackClient );
         jack_latency_range_t range;
@@ -247,7 +247,7 @@ namespace Jack
 
         ports = jack_get_ports(fJackClient, NULL, NULL, JackPortIsPhysical | JackPortIsOutput);
         if (ports != NULL) {
-            for (unsigned int i = 0; i < fParams.fSendAudioChannels && ports[i]; i++) {
+            for (int i = 0; i < fParams.fSendAudioChannels && ports[i]; i++) {
                 jack_connect(fJackClient, ports[i], jack_port_name(fAudioCapturePorts[i]));
             }
             free(ports);
@@ -255,7 +255,7 @@ namespace Jack
 
         ports = jack_get_ports(fJackClient, NULL, NULL, JackPortIsPhysical | JackPortIsInput);
         if (ports != NULL) {
-            for (unsigned int i = 0; i < fParams.fReturnAudioChannels && ports[i]; i++) {
+            for (int i = 0; i < fParams.fReturnAudioChannels && ports[i]; i++) {
                 jack_connect(fJackClient, jack_port_name(fAudioPlaybackPorts[i]), ports[i]);
             }
             free(ports);
@@ -266,7 +266,7 @@ namespace Jack
     {
         jack_log ( "JackNetMaster::FreePorts, ID %u", fParams.fID );
 
-        uint port_index;
+        int port_index;
         for ( port_index = 0; port_index < fParams.fSendAudioChannels; port_index++ )
             if ( fAudioCapturePorts[port_index] )
                 jack_port_unregister ( fJackClient, fAudioCapturePorts[port_index] );
@@ -409,7 +409,7 @@ namespace Jack
         if ( !fRunning )
             return 0;
 
-        uint port_index;
+        int port_index;
         int res = 0;
 
 #ifdef JACK_MONITOR

macosx/coremidi/JackCoreMidiDriver.cpp

@@ -650,7 +650,7 @@ extern "C" {
         i = 0;
         strcpy(desc->params[i].name, "inchannels");
         desc->params[i].character = 'i';
-        desc->params[i].type = JackDriverParamInt;
+        desc->params[i].type = JackDriverParamUInt;
         desc->params[i].value.ui = 0;
         strcpy(desc->params[i].short_desc, "CoreMIDI virtual bus");
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
@@ -658,7 +658,7 @@ extern "C" {
         i++;
         strcpy(desc->params[i].name, "outchannels");
         desc->params[i].character = 'o';
-        desc->params[i].type = JackDriverParamInt;
+        desc->params[i].type = JackDriverParamUInt;
         desc->params[i].value.ui = 0;
         strcpy(desc->params[i].short_desc, "CoreMIDI virtual bus");
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);