Cleanup

data/cleanup-modules.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-if [ ! -f Makefile ]; then
-  echo "Needs to be ran from the source root folder"
-  exit 1
-fi
-
-set -e
-
-cd source/modules
-
-mv lilv/config lilv_config
-
-rm -f */*.in
-rm -f */configure
-rm -f */configure.ac
-rm -f */juce_module_info
-rm -f */install
-rm -f */readme
-rm -rf */config
-rm -rf */contrib
-rm -rf */doc
-rm -rf */lib
-rm -rf */msw
-rm -rf */tests
-
-rm -f */*/INSTALL
-rm -f */*/NEWS
-rm -f */*/PACKAGING
-rm -f */*/README
-rm -f */*/*.in
-rm -f */*/*.ttl
-rm -f */*/waf
-rm -f */*/wscript
-rm -rf */*/bindings
-rm -rf */*/doc
-rm -rf */*/test
-rm -rf */*/tests
-rm -rf */*/utils
-
-mv lilv_config lilv/config
-
-cd ../..

data/copy-juce-carla

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-JUCE_MODULES_DIR="/Shared/Personal/FOSS/GIT/DISTRHO/DISTRHO-Ports/libs/juce/source/modules"
-CARLA_MODULES_DIR="/Shared/Personal/FOSS/GIT/falkTX/Carla/source/modules"
-
-MODULES=("juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics juce_gui_extra")
-
-for M in $MODULES; do
-  echo $CARLA_MODULES_DIR/$M;
-  rm -f $CARLA_MODULES_DIR/$M/juce_*
-  rm -rf $CARLA_MODULES_DIR/$M/{a..z}*
-  cp -r -v $JUCE_MODULES_DIR/$M/* $CARLA_MODULES_DIR/$M/
-  rm $CARLA_MODULES_DIR/$M/juce_*.mm
-done
-
-find $CARLA_MODULES_DIR -name juce_module_info -delete
-sed -i "s|Juce VST Host|Carla Plugin Host|" $CARLA_MODULES_DIR/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

resources/ui/carla_host.ui

@@ -1042,11 +1042,6 @@
     <string>Show Canvas &amp;Keyboard</string>
    </property>
   </action>
-  <action name="act_help_about_juce">
-   <property name="text">
-    <string>About &amp;JUCE</string>
-   </property>
-  </action>
   <action name="act_canvas_show_internal">
    <property name="checkable">
     <bool>true</bool>

source/backend/engine/CarlaEngineGraph.cpp

@@ -990,7 +990,7 @@ static const uint32_t kMidiOutputPortOffset  = MAX_PATCHBAY_PLUGINS*3+1;
 static const uint kMidiChannelIndex = static_cast<uint>(AudioProcessorGraph::midiChannelIndex);
 
 static inline
-bool adjustPatchbayPortIdForJuce(uint& portId)
+bool adjustPatchbayPortIdForWater(uint& portId)
 {
     CARLA_SAFE_ASSERT_RETURN(portId >= kAudioInputPortOffset, false);
     CARLA_SAFE_ASSERT_RETURN(portId <= kMidiOutputPortOffset, false);
@@ -1537,9 +1537,9 @@ bool PatchbayGraph::connect(const bool external, const uint groupA, const uint p
     uint adjustedPortA = portA;
     uint adjustedPortB = portB;
 
-    if (! adjustPatchbayPortIdForJuce(adjustedPortA))
+    if (! adjustPatchbayPortIdForWater(adjustedPortA))
         return false;
-    if (! adjustPatchbayPortIdForJuce(adjustedPortB))
+    if (! adjustPatchbayPortIdForWater(adjustedPortB))
         return false;
 
     if (! graph.addConnection(groupA, static_cast<int>(adjustedPortA), groupB, static_cast<int>(adjustedPortB)))
@@ -1580,9 +1580,9 @@ bool PatchbayGraph::disconnect(const uint connectionId)
         uint adjustedPortA = connectionToId.portA;
         uint adjustedPortB = connectionToId.portB;
 
-        if (! adjustPatchbayPortIdForJuce(adjustedPortA))
+        if (! adjustPatchbayPortIdForWater(adjustedPortA))
             return false;
-        if (! adjustPatchbayPortIdForJuce(adjustedPortB))
+        if (! adjustPatchbayPortIdForWater(adjustedPortB))
             return false;
 
         if (! graph.removeConnection(connectionToId.groupA, static_cast<int>(adjustedPortA),
@@ -1617,9 +1617,9 @@ void PatchbayGraph::disconnectInternalGroup(const uint groupId) noexcept
         uint adjustedPortA = connectionToId.portA;
         uint adjustedPortB = connectionToId.portB;
 
-        if (! adjustPatchbayPortIdForJuce(adjustedPortA))
+        if (! adjustPatchbayPortIdForWater(adjustedPortA))
             return false;
-        if (! adjustPatchbayPortIdForJuce(adjustedPortB))
+        if (! adjustPatchbayPortIdForWater(adjustedPortB))
             return false;
 
         graph.removeConnection(connectionToId.groupA, static_cast<int>(adjustedPortA),

source/plugin/carla-lv2-export.cpp

@@ -39,7 +39,7 @@
 
 #if defined(CARLA_OS_WIN)
 # define PLUGIN_EXT ".dll"
-#elif defined(JUCE_MAC)
+#elif defined(CARLA_OS_MAC)
 # define PLUGIN_EXT ".dylib"
 #else
 # define PLUGIN_EXT ".so"