Final fixes, don't build cabbage for now

Author: falkTX

ports/Makefile

@@ -11,9 +11,9 @@ plugins: lv2 vst
 lv2:
 	install -d ../bin/lv2
 	$(MAKE) -C argotlunar/LV2
-	$(MAKE) -C cabbage/LV2-fx
-	$(MAKE) -C cabbage/LV2-ins
-	$(MAKE) -C cabbage/LV2-midi
+# 	$(MAKE) -C cabbage/LV2-fx
+# 	$(MAKE) -C cabbage/LV2-ins
+# 	$(MAKE) -C cabbage/LV2-midi
 	$(MAKE) -C protoplug/LV2-fx
 	$(MAKE) -C protoplug/LV2-gen
 	$(MAKE) -C PdPulp/LV2-fx
@@ -27,9 +27,9 @@ lv2:
 vst:
 	install -d ../bin/vst
 	$(MAKE) -C argotlunar/VST
-	$(MAKE) -C cabbage/VST-fx
-	$(MAKE) -C cabbage/VST-ins
-	$(MAKE) -C cabbage/VST-midi
+# 	$(MAKE) -C cabbage/VST-fx
+# 	$(MAKE) -C cabbage/VST-ins
+# 	$(MAKE) -C cabbage/VST-midi
 	$(MAKE) -C protoplug/VST-fx
 	$(MAKE) -C protoplug/VST-gen
 	$(MAKE) -C PdPulp/VST-fx

ports/PdPulp/Source/PluginProcessor.cpp

@@ -299,7 +299,7 @@ void PureDataAudioProcessor::setStateInformation (const void* data, int sizeInBy
                 File path(child->getStringAttribute ("fullpath"));
                 if (path.exists()) {
                     patchfile = path; // creates a copy
-                    reloadPatch(NULL);
+                    reloadPatch(0.0);
                 }
             }
 

ports/cabbage/source/Plugin/CabbagePluginProcessor.cpp

@@ -172,7 +172,7 @@ CabbagePluginAudioProcessor::CabbagePluginAudioProcessor(String inputfile, bool
 
 #ifdef CSOUND6 
         csoundParams = new CSOUND_PARAMS();
-        csoundParams->nchnls_override = this->getNumOutputChannels();
+        csoundParams->nchnls_override = this->getTotalNumOutputChannels();
         csoundParams->displays = 0;
         csound->SetParams(csoundParams);
 #endif
@@ -390,7 +390,7 @@ CabbagePluginAudioProcessor::CabbagePluginAudioProcessor():
     startTimer(20);
 #ifdef CSOUND6
     csoundParams = new CSOUND_PARAMS();
-    csoundParams->nchnls_override = this->getNumOutputChannels();
+    csoundParams->nchnls_override = this->getTotalNumOutputChannels();
     csoundParams->displays = 0;
     csound->SetParams(csoundParams);
 #endif
@@ -1055,7 +1055,7 @@ void CabbagePluginAudioProcessor::startRecording ()
                     threadedWriter = new AudioFormatWriter::ThreadedWriter (writer, backgroundThread, 32768);
 
                     // Reset our recording thumbnail
-                    //thumbnail.reset (writer->getNumChannels(), writer->getSampleRate());
+                    //thumbnail.reset (writer->getTotalNumChannels(), writer->getSampleRate());
                     nextSampleNum = 0;
 
                     // And now, swap over our active writer pointer so that the audio callback will start using it..
@@ -1727,7 +1727,7 @@ void CabbagePluginAudioProcessor::prepareToPlay (double sampRate, int samplesPer
 {
     // Use this method as the place to do any pre-playback
     // initialisation that you need..
-	//showMessage(String(this->getNumOutputChannels()));
+	//showMessage(String(this->getTotalNumOutputChannels()));
     keyboardState.reset();
     sampleRate = sampRate;
 }
@@ -1773,7 +1773,7 @@ void CabbagePluginAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiB
 				ccBuffer = midiMessages;
 
 				//if no inputs are used clear buffer in case it's not empty..
-				if(getNumInputChannels()==0)
+				if(getTotalNumInputChannels()==0)
 					buffer.clear();
 
 	#if JucePlugin_ProducesMidiOutput
@@ -1807,10 +1807,10 @@ void CabbagePluginAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiB
 					}
 					if(csCompileResult==OK)
 					{
-						for(int channel = 0; channel < getNumOutputChannels(); channel++ )
+						for(int channel = 0; channel < getTotalNumOutputChannels(); channel++ )
 						{
 							audioBuffer = buffer.getWritePointer(channel,0);
-							pos = csndIndex*getNumOutputChannels();
+							pos = csndIndex*getTotalNumOutputChannels();
 							CSspin[channel+pos] = audioBuffer[i]*cs_scale;
 							audioBuffer[i] = (CSspout[channel+pos]/cs_scale);
 						}
@@ -1828,7 +1828,7 @@ void CabbagePluginAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiB
 			}//if not compiled just mute output
 			else
 			{
-				for(int channel = 0; channel < getNumInputChannels(); channel++)
+				for(int channel = 0; channel < getTotalNumInputChannels(); channel++)
 				{
 					audioBuffer = buffer.getWritePointer(channel,0);
 					for(int i=0; i<numSamples; i++, csndIndex++)

ports/protoplug/Source/LuaLink.cpp

@@ -404,7 +404,7 @@ void LuaLink::processBlock (AudioSampleBuffer& buffer, MidiBuffer& midiMessages,
 									0);
 #ifdef _PROTOGEN
 	if (!res) {
-		for (int channel = 0; channel < pfx->getNumOutputChannels(); ++channel)
+		for (int channel = 0; channel < pfx->getTotalNumOutputChannels(); ++channel)
 		{
 			buffer.clear (channel, 0, buffer.getNumSamples());
 		}