From e8cf0fe8cdb6ebf822573dae6764a87dc6aaee39 Mon Sep 17 00:00:00 2001
From: rorywalsh <rorywalsh@ear.ie>
Date: Fri, 18 Jun 2021 09:19:09 +0100
Subject: [PATCH] updating build scripts for latest version of Csound

---
 CabbageIDE.jucer                                |  2 +-
 CabbageLite.jucer                               |  2 +-
 CabbagePlugin.jucer                             |  2 +-
 CabbagePluginMIDIEffect.jucer                   |  2 +-
 CabbagePluginNoStandalone.jucer                 |  2 +-
 CabbagePluginSynth.jucer                        |  2 +-
 Source/Widgets/CabbageWidgetDataInitMethods.cpp |  1 +
 buildOSX.sh                                     | 10 +++++-----
 buildWindows.ps1                                |  2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CabbageIDE.jucer b/CabbageIDE.jucer
index bd786d6df..561b1d262 100644
--- a/CabbageIDE.jucer
+++ b/CabbageIDE.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="CxJYjd" name="Cabbage" projectType="guiapp" version="2.6.10"
+<JUCERPROJECT id="CxJYjd" name="Cabbage" projectType="guiapp" version="2.6.11"
               bundleIdentifier="com.cabbageaudio.cabbage" includeBinaryInAppConfig="0"
               jucerVersion="5.4.7" displaySplashScreen="0" reportAppUsage="1"
               splashScreenColour="Dark" cppLanguageStandard="14" companyCopyright="">
diff --git a/CabbageLite.jucer b/CabbageLite.jucer
index 862db2800..f66cf34b8 100644
--- a/CabbageLite.jucer
+++ b/CabbageLite.jucer
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <JUCERPROJECT id="id6VOA" name="CabbageLite" displaySplashScreen="0" reportAppUsage="1"
-              splashScreenColour="Dark" projectType="guiapp" version="2.6.10"
+              splashScreenColour="Dark" projectType="guiapp" version="2.6.11"
               bundleIdentifier="com.yourcompany.CabbageLite" includeBinaryInAppConfig="1"
               cppLanguageStandard="11" jucerVersion="5.4.7" companyCopyright="">
   <MAINGROUP id="CfT7TE" name="CabbageLite">
diff --git a/CabbagePlugin.jucer b/CabbagePlugin.jucer
index 3ac65cba5..053ad1a93 100644
--- a/CabbagePlugin.jucer
+++ b/CabbagePlugin.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.10"
+<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.11"
               bundleIdentifier="com.cabbageaudio.CabbagePlugin" includeBinaryInAppConfig="1"
               buildVST="1" buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0"
               buildAAX="0" pluginName="CabbageEffectNam" pluginDesc="CabbagePlugin"
diff --git a/CabbagePluginMIDIEffect.jucer b/CabbagePluginMIDIEffect.jucer
index 64dc26337..5171009e0 100644
--- a/CabbagePluginMIDIEffect.jucer
+++ b/CabbagePluginMIDIEffect.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.10"
+<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.11"
               bundleIdentifier="com.cabbageaudio.CabbagePlugin" includeBinaryInAppConfig="0"
               buildVST="1" buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0"
               buildAAX="0" pluginName="CabbageEffectNam" pluginDesc="CabbagePlugin"
diff --git a/CabbagePluginNoStandalone.jucer b/CabbagePluginNoStandalone.jucer
index e35c736c0..5f8e7d7aa 100644
--- a/CabbagePluginNoStandalone.jucer
+++ b/CabbagePluginNoStandalone.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.10"
+<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.11"
               bundleIdentifier="com.cabbageaudio.CabbagePlugin" includeBinaryInAppConfig="1"
               buildVST="1" buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0"
               buildAAX="0" pluginName="CabbageEffectNam" pluginDesc="CabbagePlugin"
diff --git a/CabbagePluginSynth.jucer b/CabbagePluginSynth.jucer
index 0f3f6b0d7..1600f5343 100644
--- a/CabbagePluginSynth.jucer
+++ b/CabbagePluginSynth.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.10"
+<JUCERPROJECT id="ETRteN" name="CabbagePlugin" projectType="audioplug" version="2.6.11"
               bundleIdentifier="com.cabbageaudio.CabbagePlugin" includeBinaryInAppConfig="1"
               buildVST="1" buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0"
               buildAAX="0" pluginName="CabbageEffectNam" pluginDesc="CabbagePlugin"
diff --git a/Source/Widgets/CabbageWidgetDataInitMethods.cpp b/Source/Widgets/CabbageWidgetDataInitMethods.cpp
index dbc11acd8..ae4e3b810 100755
--- a/Source/Widgets/CabbageWidgetDataInitMethods.cpp
+++ b/Source/Widgets/CabbageWidgetDataInitMethods.cpp
@@ -319,6 +319,7 @@ void CabbageWidgetData::setSignalDisplayProperties (ValueTree widgetData, int ID
     setProperty (widgetData, CabbageIdentifierIds::width, 260);
     setProperty (widgetData, CabbageIdentifierIds::height, 100);
     setProperty (widgetData, CabbageIdentifierIds::tablecolour, Colours::lime.toString());
+    setProperty (widgetData, CabbageIdentifierIds::colour, Colours::white.toString());
     setProperty (widgetData, CabbageIdentifierIds::fontcolour, Colours::white.toString());
     setProperty (widgetData, CabbageIdentifierIds::tablebackgroundcolour, Colour (30, 30, 38).toString());
     setProperty (widgetData, CabbageIdentifierIds::type, "signaldisplay");
diff --git a/buildOSX.sh b/buildOSX.sh
index 6e24905d2..c5f5a187c 100644
--- a/buildOSX.sh
+++ b/buildOSX.sh
@@ -14,13 +14,13 @@ ls -1 $BUILD_ARTIFACTSTAGINGDIRECTORY
 
   
 pwd
-curl -L -o csound6.15.0-MacOS_x86_64.dmg 'https://github.com/csound/csound/releases/download/6.15.0/csound-MacOS_x86_64-6.15.0.dmg'
+curl -L -o csound6.16.0-MacOS_x86_64.dmg 'https://github.com/csound/csound/releases/download/6.16.0/csound-MacOS_x86_64-6.16.0.dmg'
 ls
-hdiutil attach csound6.15.0-MacOS_x86_64.dmg
-cp -R /Volumes/Csound6.15.0/ Csound
-hdiutil detach /Volumes/Csound6.15.0/
+hdiutil attach csound6.16.0-MacOS_x86_64.dmg
+cp -R /Volumes/Csound6.16.0/ Csound
+hdiutil detach /Volumes/Csound6.16.0/
 cd Csound
-sudo installer -pkg csound-MacOS_x86_64-6.15.0.pkg -target /
+sudo installer -pkg csound-MacOS_x86_64-6.16.0.pkg -target /
 sudo install_name_tool -id /Library/Frameworks/CsoundLib64.framework/CsoundLib64  /Library/Frameworks/CsoundLib64.framework/CsoundLib64
 
 cd $AGENT_BUILDDIRECTORY
diff --git a/buildWindows.ps1 b/buildWindows.ps1
index 921182200..79c40dc2d 100644
--- a/buildWindows.ps1
+++ b/buildWindows.ps1
@@ -3,7 +3,7 @@ cd c:/
 #Start-BitsTransfer -Source "https://github.com/rorywalsh/cabbage/releases/download/v2.0.00/csound-windows_x64-6.13.0.zip" -Destination "C:\csound-windows_x64-6.12.0.zip" 
 
 $start_time = Get-Date
-(New-Object System.Net.WebClient).DownloadFile("https://github.com/rorywalsh/cabbage/releases/download/v2.0.00/csound-windows_x64-6.15.0.zip", "C:\csound-windows_x64-6.12.0.zip")
+(New-Object System.Net.WebClient).DownloadFile("https://github.com/rorywalsh/cabbage/releases/download/v2.0.00/csound-windows_x64-6.16.0.zip", "C:\csound-windows_x64-6.12.0.zip")
 Write-Output "Time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
 
 # Invoke-WebRequest -UseBasicParsing "https://github.com/rorywalsh/cabbage/releases/download/v2.0.00/csound-windows_x64-6.13.0.zip" -OutFile "C:\csound-windows_x64-6.12.0.zip"