Merge pull request #198 from pierreguillot/dev/v1.0.7

Dev/v1.0.7

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -60,11 +60,10 @@
 !/Dependencies/LibPdBuild/VisualStudio2015/infos.txt
 
 #Examples
-/Plugins/Examples/*
+/Plugins/*
 !/Plugins/Examples/AlmondOrgan/
 !/Plugins/Examples/Bulgroz/
 !/Plugins/Examples/Castafiore/
 !/Plugins/Examples/MiniMock/
 !/Plugins/Examples/PdStalFx/
 !/Plugins/Examples/PdStal/
-/Plugins/lv2_file_generator

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "Juce"]
 	path = Juce
 url=https://github.com/WeAreROLI/JUCE.git
-[submodule "Dependencies/Vst"]
-	path = Dependencies/Vst
-	url = https://github.com/steinbergmedia/vst3sdk.git
 [submodule "Dependencies/LibPd"]
 	path = Dependencies/LibPd
 	url = https://[email protected]/pierreguillot/libpd.git

.travis.yml

@@ -1,5 +1,5 @@
 language: cpp
-dist: trusty
+dist: xenial
 sudo: required
 notifications:
   email: false
@@ -23,16 +23,17 @@ matrix:
     - sudo apt-get install -y libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev libstdc++6
     script:
     - cd Dependencies/LibPdBuild/LinuxMakefile && cmake .. -DCMAKE_BUILD_TYPE=Release && cd ../../..
-    - make
-    - make -C LV2/lv2_file_generator
+    - make TARGET_ARCH=-m64 CONFIG=Release
     after_success:
     - cd $TRAVIS_BUILD_DIR
     - ./Plugins/camomile -d ./Plugins/Examples -o ./Plugins/Builds
+    - ls -R ./Plugins/Builds
     - curl -L https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Linux.zip -o ./pluginval.zip
     - unzip ./pluginval.zip
     - ./pluginval --strictnessLevel 10 --validate ./Plugins/Builds/ > /dev/null
     before_deploy:
-    - rm -r Plugins/Builds
+    - mv Plugins/Builds Examples
+    - zip -r $release-examples.zip Examples
     - rm Plugins/Camomile.a
     - rm Plugins/CamomileFx.a
     - cp README.md Plugins/README.md
@@ -44,7 +45,6 @@ matrix:
   - os: osx
     compiler: clang++
     env: release=CamomileMacOS
-    osx_image: xcode8.3
     script:
     - cd Dependencies/LibPdBuild/MacOSX && cmake .. -GXcode && cd ../../..
     - xcodebuild -workspace Camomile.xcworkspace -scheme Camomile-libpd -configuration Release | egrep '^(/.+:[0-9+:[0-9]+:.(error|warning):|fatal|===)' -
@@ -56,7 +56,8 @@ matrix:
     - tar zxvf ./pluginval.zip
     - ./pluginval.app/Contents/MacOS/pluginval --strictnessLevel 10 --validate ./Plugins/Builds/ > /dev/null
     before_deploy:
-    - rm -r Plugins/Builds
+    - mv Plugins/Builds Examples
+    - zip -r $release-examples.zip Examples
     - rm Plugins/libCamomile.a
     - rm Plugins/libCamomileFx.a
     - cp README.md Plugins/README.md
@@ -74,8 +75,10 @@ deploy:
   name: ${TRAVIS_TAG}
   tag_name: ${TRAVIS_TAG}
   api_key:
-    secure: IaAt+xohgcO99ho2SEAPR2sGcC5w0KtzmGiarM02/VrY7ECu5JfeSsoohuxWSqI8K+Dnf0O/akIVbTcnXizigpK8cDH+tUC/0j9a/9MannlEhOXYAUjFsikWMEpiHQ5hqs84QTpwjzTMTPrYwxJft1GIChqJDUq2X+0++BPKwrTi+31V+1ZVQtZBF/ra80ivaigvC4ikm5FCFgWhemKdxiASi3s7pmTY68LYy7TvEJim4OHW7IUPJh9q1N2+TLfgrI8gP1lWkolU/dLSBjEZxsh/SEO1FO5lVNxoiGq/7urDVjoG6Bcow3JLWdw1k8WdjoIj5/ndUucgWzgd/6UoYbtnwnsHreg4EFE86NtkdELiP12bzk0B6rHJge+DHk3LYx0UH17a2y54WaiEuNCoDXlYlqARHzjz2KeglzldYnzoEEFi98ds68eyJVaFsnj0p3pvdujFtduPltbBfXyLVqNOJP+mjQyu7YvZiaev+mlCqYfZTM7B8eYowoP1K+jAsC4ulYWOaNqJWt/K+aFU+o7C1/wTkuSXhGV4wfCj5JvNwcsCt1XNiC29R6SAkThZk4D4+8hj5u+WQg4AUBdT2E3GVP+Fdg/C+bFRoKO2v9Yv7GBDxhfKwRrxRnSrUwmWEeZEWJwq3s2EMNXf0ycDiizzxJ3YxoPPkVUdSAQmVME=
-  file: $release.zip
+    secure: KhjoDswm7tGKjBCsUFFi1u9Dwl8WXSiPcDD+WhwibpgkTBzPuWyngJBL6VtHHPNi/0wAhvlg7ng4IgtBMW5vMI9q1YoOOgd2smADYY+bsKNEcDNblQZhXYf0A5MQ77fYjiNKDC08psmDIrnL2NTxn3Aqwsnz8vH8lSYX/r1eo9+kD+U9gyGT9Xv4qk1lGok4/A6ACx/Pd18m9Lc4X+XLaK8ZFrRemCRgP3dHIMiObPqSkS6oJCG/DH0C3gBF29bMJHJKMxUeKNBrMv5xQqJY4fpuiUILHgk2hE6CFNj9mFt0huR6IW/2NOuuvy00O0AeTj7WeH7oQEneHIeZPwXwyKvV1ihI73qCYdh8RJ9R/eg06x3ppLM+uBlgmBcSKfEPw0M1FkBg7PgVBTNQ3UTQpjiwCButcyxN04Yec9e3I3pt16R4nqdMl49W+mXd5XHbmedj9t1D53G8fMnsF8zQf6LaiC/SHbMq1B5odGxNVS7+XkKWG8vlXrn8ksBKK0WGMsdF+kquMIZ99OYMlALNntv9e5J50WTeUz6jRcTuVaDU9o/6CDEDp8VC9N+UkQF3IDw4p/jS34681R1wgsme9XcHjbvpWwVbfVc/ymqaRucYA1+Tdh0ilrrGymgygmJjK0aRtYfS3HaIhGC0iZk6lo1wJ1AQMxE99hwnBRH9+Sg=
+  file:
+  - $release.zip
+  - $release-examples.zip
   on:
     repo: pierreguillot/Camomile
     tags: true

Camomile.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Latest</string>
+	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>

Instrument/Builds/MacOSX/Camomile.xcodeproj/xcshareddata/xcschemes/Camomile-libpd.xcscheme → Camomile.xcworkspace/xcshareddata/xcschemes/Camomile-libpd.xcscheme

@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
-   version = "1.3">
+   LastUpgradeVersion = "1150"
+   version = "2.0">
    <BuildAction
       parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Run Script"
-               scriptText = "">
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -23,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AA9276E83F054B87954C0417"
+               BlueprintIdentifier = "E290DBFFFBAB47F0ABA23E0C"
                BuildableName = "libpd-multi.a"
                BlueprintName = "libpdstatic"
-               ReferencedContainer = "container:../../../Dependencies/LibPdBuild/MacOSX/libpd.xcodeproj">
+               ReferencedContainer = "container:Dependencies/LibPdBuild/MacOSX/libpd.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -40,7 +31,7 @@
                BlueprintIdentifier = "FF882317069013018CDCC4B9"
                BuildableName = "Camomile - All"
                BlueprintName = "Camomile - All"
-               ReferencedContainer = "container:Camomile.xcodeproj">
+               ReferencedContainer = "container:Instrument/Builds/MacOSX/Camomile.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -54,7 +45,7 @@
                BlueprintIdentifier = "FF882317069013018CDCC4B9"
                BuildableName = "CamomileFx - All"
                BlueprintName = "CamomileFx - All"
-               ReferencedContainer = "container:../../../Effect/Builds/MacOSX/CamomileFx.xcodeproj">
+               ReferencedContainer = "container:Effect/Builds/MacOSX/CamomileFx.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -68,7 +59,7 @@
                BlueprintIdentifier = "E8CDB3EF7A152A673172E1AB"
                BuildableName = "CamomileLV2.dylib"
                BlueprintName = "CamomileLV2 - Dynamic Library"
-               ReferencedContainer = "container:../../../LV2/Builds/MacOSX/CamomileLV2.xcodeproj">
+               ReferencedContainer = "container:LV2/Builds/MacOSX/CamomileLV2.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -80,44 +71,19 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FF882317069013018CDCC4B9"
-            BuildableName = "Camomile - All"
-            BlueprintName = "Camomile - All"
-            ReferencedContainer = "container:Camomile.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
+      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <PathRunnable
-         runnableDebuggingMode = "0"
-         BundleIdentifier = "com.cockos.reaper"
-         FilePath = "/Applications/REAPER64.app">
-      </PathRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FF882317069013018CDCC4B9"
-            BuildableName = "Camomile - All"
-            BlueprintName = "Camomile - All"
-            ReferencedContainer = "container:Camomile.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -131,7 +97,7 @@
             BlueprintIdentifier = "FF882317069013018CDCC4B9"
             BuildableName = "Camomile - All"
             BlueprintName = "Camomile - All"
-            ReferencedContainer = "container:Camomile.xcodeproj">
+            ReferencedContainer = "container:Instrument/Builds/MacOSX/Camomile.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

ChangeLog.md

@@ -1,4 +1,7 @@
 v1.0.7
+- Update Pd version (0.51)
+- Update Juce version (6.0.0)
+- Remove VST2 support
 - Fix PdStalFx - DSP not recompiled (#126)
 - Fix PdStalFx - no loadbang (#126)
 - Fix PdStalFx - undefined when reloaded (#126)
@@ -8,6 +11,21 @@ v1.0.7
 - Fix midiin objects support to output all the midi messages (#134)
 - Fix midiout objects support for 3 bytes messages and system exclusive messages (#134)
 - Fix camomile script to support white space in the path (#136)
+- Fix LV2 plugin freeze on Linux (#183)
+- Add support for manufacturer (#152)
+- Fix support for Logic X (#166)
+- Fix default display of parameters of Audio Unit (#153)
+- Fix expr objects on Windows (#139)
+- Fix MIDI in support for LV2 plugins (#160)
+- Fix object position and margin of GOP (#130)
+- Improved dynamic parching support (#128)
+- Fix LV2 parameters crash on Ardour (#188)
+- Add parameter range support for LV2 (#188)
+- Add parameter label support for LV2 (#188)
+- Fix one LV2 plugin instance limitation on macOS
+- Update AlmondOrgan example
+- Add a release bundle with pre-compiled examples
+- Minor fixes and improvements
 
 v1.0.6
 - Add LV2 format support (#70)

Dependencies/LibPdBuild/CMakeLists.txt

@@ -9,23 +9,9 @@ project(libpd C)
 # CMAKE MAC OS SPECIFIC
 #------------------------------------------------------------------------------#
 
-if(CMAKE_GENERATOR STREQUAL Xcode)
-	if(XCODE_VERSION VERSION_LESS "10.0")
-		set(XCODE_32BIT_LIMITATION OFF)
-	else()
-		set(XCODE_32BIT_LIMITATION ON)
-		message("32 bit limitation")
-	endif()
-endif()
-
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)
 set(CMAKE_MACOSX_RPATH ON)
-
-if(XCODE_32BIT_LIMITATION)
-	set(CMAKE_OSX_ARCHITECTURES "i386;x86_64")
-else()
-	set(CMAKE_OSX_ARCHITECTURES "x86_64")
-endif()
+set(CMAKE_OSX_ARCHITECTURES "x86_64")
 
 set(LIBPD_PATH "${PROJECT_SOURCE_DIR}/../LibPd")
 set(LIBPD_OUTPUT_DIRECTORY "./..")
@@ -93,6 +79,7 @@ file(GLOB PD_SOURCES
     ${LIBPD_PATH}/pure-data/src/g_canvas.c
     ${LIBPD_PATH}/pure-data/src/g_canvas.h
     ${LIBPD_PATH}/pure-data/src/g_clone.c
+		${LIBPD_PATH}/pure-data/src/g_editor_extras.c
     ${LIBPD_PATH}/pure-data/src/g_editor.c
     ${LIBPD_PATH}/pure-data/src/g_graph.c
     ${LIBPD_PATH}/pure-data/src/g_guiconnect.c
@@ -108,6 +95,8 @@ file(GLOB PD_SOURCES
     ${LIBPD_PATH}/pure-data/src/g_text.c
     ${LIBPD_PATH}/pure-data/src/g_toggle.c
     ${LIBPD_PATH}/pure-data/src/g_traversal.c
+		${LIBPD_PATH}/pure-data/src/g_undo.c
+		${LIBPD_PATH}/pure-data/src/g_undo.h
     ${LIBPD_PATH}/pure-data/src/g_vdial.c
     ${LIBPD_PATH}/pure-data/src/g_vslider.c
     ${LIBPD_PATH}/pure-data/src/g_vumeter.c
@@ -127,6 +116,8 @@ file(GLOB PD_SOURCES
     ${LIBPD_PATH}/pure-data/src/s_inter.c
     ${LIBPD_PATH}/pure-data/src/s_loader.c
     ${LIBPD_PATH}/pure-data/src/s_main.c
+		${LIBPD_PATH}/pure-data/src/s_net.c
+		${LIBPD_PATH}/pure-data/src/s_net.h
     ${LIBPD_PATH}/pure-data/src/s_path.c
     ${LIBPD_PATH}/pure-data/src/s_print.c
     ${LIBPD_PATH}/pure-data/src/s_stuff.h
@@ -329,17 +320,6 @@ endif()
 #------------------------------------------------------------------------------#
 set(THREADS_PREFER_PTHREAD_FLAG On)
 set(CMAKE_THREAD_PREFER_PTHREAD True)
-if(NOT XCODE_32BIT_LIMITATION)
-	find_package(Threads REQUIRED)
-
-	if(LIBPD_INCLUDE_DYNAMIC_LIBRARY)
-	  target_link_libraries(libpdshared Threads::Threads)
-	endif()
-	if(LIBPD_INCLUDE_STATIC_LIBRARY)
-	  target_link_libraries(libpdstatic Threads::Threads)
-	endif()
-endif()
-
 
 if(MSVC)
     link_directories(${PROJECT_SOURCE_DIR}/pure-data)

Dependencies/juce_audio_plugin_client_LV2/includes/lv2_external_ui.h → Dependencies/juce_audio_plugin_client_LV2/LV2/includes/lv2_external_ui.h

@@ -18,7 +18,8 @@
 #ifndef LV2_EXTERNAL_UI_H
 #define LV2_EXTERNAL_UI_H
 
-#include "ui.h"
+#include "../lv2/ui/ui.h"
+#include "../lv2/units/units.h"
 
 #define LV2_EXTERNAL_UI_URI     "http://kxstudio.sf.net/ns/lv2ext/external-ui"
 #define LV2_EXTERNAL_UI_PREFIX  LV2_EXTERNAL_UI_URI "#"

Dependencies/juce_audio_plugin_client_LV2/includes/lv2_programs.h → Dependencies/juce_audio_plugin_client_LV2/LV2/includes/lv2_programs.h

@@ -23,8 +23,8 @@
 #ifndef LV2_PROGRAMS_H
 #define LV2_PROGRAMS_H
 
-#include "lv2.h"
-#include "ui.h"
+#include "../lv2/core/lv2.h"
+#include "../lv2/ui/ui.h"
 
 #define LV2_PROGRAMS_URI    "http://kxstudio.sf.net/ns/lv2ext/programs"
 #define LV2_PROGRAMS_PREFIX LV2_PROGRAMS_URI "#"