From 4edf1e7fcadb941e429e30bf1ec99f3eb90267e2 Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Sun, 31 Oct 2021 11:23:10 -0700 Subject: [PATCH 1/3] BOM added --- data/plugin/TranslatedStrings_fr.txt | 2 +- data/plugin/TranslatedStrings_it.txt | 2 +- data/plugin/TranslatedStrings_ja.txt | 2 +- data/plugin/TranslatedStrings_ko.txt | 2 +- data/plugin/TranslatedStrings_nl.txt | 2 +- data/plugin/TranslatedStrings_pt.txt | 2 +- data/plugin/TranslatedStrings_ru.txt | 2 +- data/plugin/TranslatedStrings_sv.txt | 2 +- data/plugin/TranslatedStrings_th.txt | 2 +- data/plugin/TranslatedStrings_zh_cn.txt | 2 +- data/plugin/TranslatedStrings_zh_tw.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/plugin/TranslatedStrings_fr.txt b/data/plugin/TranslatedStrings_fr.txt index fb6bc459d..d69feb9dd 100644 --- a/data/plugin/TranslatedStrings_fr.txt +++ b/data/plugin/TranslatedStrings_fr.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=Mode d'emploi : connecter un contrôleur MIDI, lancer MIDI2LR, et commencer à éditer ! Voir https://github.com/rsjaffe/MIDI2LR/wiki pour plus d'aide." +"$$$/MIDI2LR/About/about=Mode d'emploi : connecter un contrôleur MIDI, lancer MIDI2LR, et commencer à éditer ! Voir https://github.com/rsjaffe/MIDI2LR/wiki pour plus d'aide." "$$$/MIDI2LR/Database/Customcameraprofile=Profil de caméra personnalisé" "$$$/MIDI2LR/Database/Show1=Afficher ^1" "$$$/MIDI2LR/Dialog/InvalidKey=La valeur doit être un caractère unique ou épeler une touche F (F1-F16) ou : apostrophe, backslash, backspace (sous MacOS représente supprimer vers la gauche), cursor down, cursor left, cursor right, cursor up, delete (sous MacOS représente la suppression vers la droite), end, escape, home, page down, page up, return, space, tab ou numpad 0 (à numpad 9), numpad add (ou decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_it.txt b/data/plugin/TranslatedStrings_it.txt index a97cd5dc8..754d2d1db 100644 --- a/data/plugin/TranslatedStrings_it.txt +++ b/data/plugin/TranslatedStrings_it.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=Modo d'uso: collegare un controller MIDI, avviare MIDI2LR ed iniziare a lavorare! Vedere https://github.com/rsjaffe/MIDI2LR/wiki per i dettagli." +"$$$/MIDI2LR/About/about=Modo d'uso: collegare un controller MIDI, avviare MIDI2LR ed iniziare a lavorare! Vedere https://github.com/rsjaffe/MIDI2LR/wiki per i dettagli." "$$$/MIDI2LR/Database/Customcameraprofile=Profilo fotocamera personalizzato" "$$$/MIDI2LR/Database/Show1=Mostra ^1" "$$$/MIDI2LR/Dialog/InvalidKey=Il valore deve essere un singolo carattere o indicare un tasto F (F1-F16) o: apostrophe, backslash, backspace (in MacOS rappresenta l'eliminazione a sinistra), cursor down, cursor left, cursor right, cursor up, delete (in MacOS rappresenta l'eliminazione verso destra), end, escape , home, page down, page up, return, space, tab o numpad 0 (fino ad numpad 9), numpad add (o decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_ja.txt b/data/plugin/TranslatedStrings_ja.txt index d310d1226..8b900ed75 100644 --- a/data/plugin/TranslatedStrings_ja.txt +++ b/data/plugin/TranslatedStrings_ja.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=使用方法：MIDIコントローラを接続してMIDI2LRを起動し、編集を開始！詳細は、https://github.com/rsjaffe/MIDI2LR/wikiを参照してください。" +"$$$/MIDI2LR/About/about=使用方法：MIDIコントローラを接続してMIDI2LRを起動し、編集を開始！詳細は、https://github.com/rsjaffe/MIDI2LR/wikiを参照してください。" "$$$/MIDI2LR/Database/Customcameraprofile=カスタムカメラプロファイル" "$$$/MIDI2LR/Database/Show1=^1 の表示" "$$$/MIDI2LR/Dialog/InvalidKey=値は単一文字であるか、Fキー（F1-F16）を綴る必要があります。または：apostrophe、backslash、backspace（MacOSでは左方向への削除を表します）、cursor down、cursor left、cursor right、cursor up、delete（MacOSでは右方向への削除を表します）、end、escape 、home、page down、page up、return、space、tab、またはnumpad 0（numpad 9を介して）、numpad add（またはdecimal、divide、multiply、subtract）。" diff --git a/data/plugin/TranslatedStrings_ko.txt b/data/plugin/TranslatedStrings_ko.txt index e9e0452d3..114127834 100644 --- a/data/plugin/TranslatedStrings_ko.txt +++ b/data/plugin/TranslatedStrings_ko.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=사용 방법 : MIDI 컨트롤러를 연결하여 MIDI2LR를 실행시키고, 편집을 시작합니다! 자세한 내용은 https://github.com/rsjaffe/MIDI2LR/wiki를 참조하십시오." +"$$$/MIDI2LR/About/about=사용 방법 : MIDI 컨트롤러를 연결하여 MIDI2LR를 실행시키고, 편집을 시작합니다! 자세한 내용은 https://github.com/rsjaffe/MIDI2LR/wiki를 참조하십시오." "$$$/MIDI2LR/Database/Customcameraprofile=커스텀 카메라 프로필" "$$$/MIDI2LR/Database/Show1=^1 표시" "$$$/MIDI2LR/Dialog/InvalidKey=값은 단일 문자이거나 F 키 (F1-F16) 또는 apostrophe, backslash, backspace (MacOS에서는 왼쪽 삭제를 나타냅니다), cursor down, cursor left, cursor right, cursor up, delete (MacOS에서는 오른쪽 삭제를 나타냅니다), end, escape, home, page down, page up, return, space, tab 또는 numpad 0 (numpad 9까지), numpad add (또는 decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_nl.txt b/data/plugin/TranslatedStrings_nl.txt index 410396536..4c72a1b9c 100644 --- a/data/plugin/TranslatedStrings_nl.txt +++ b/data/plugin/TranslatedStrings_nl.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=Instructies; sluit een MIDI controller aan, start MIDI2LR, en begin met bewerken! Zie https://github.com/rsjaffe/MIDI2LR/wiki voor meer gegevens." +"$$$/MIDI2LR/About/about=Instructies; sluit een MIDI controller aan, start MIDI2LR, en begin met bewerken! Zie https://github.com/rsjaffe/MIDI2LR/wiki voor meer gegevens." "$$$/MIDI2LR/Database/Customcameraprofile=Aangepast cameraprofiel" "$$$/MIDI2LR/Database/Show1=^1 Weergeven" "$$$/MIDI2LR/Dialog/InvalidKey=De waarde moet één teken zijn of een F-toets (F1-F16) of: apostrophe, backslash, backspace (in MacOS staat voor verwijderen naar links), cursor down, cursor left, cursor right, cursor up, delete (in MacOS staat voor verwijderen naar rechts), end, escape , home, page down, page up, return, space, tab of numpad 0 (via numpad 9), numpad add (of decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_pt.txt b/data/plugin/TranslatedStrings_pt.txt index ad5b18e92..18c3217c8 100644 --- a/data/plugin/TranslatedStrings_pt.txt +++ b/data/plugin/TranslatedStrings_pt.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=Como usar: conecte um controlador MIDI, inicialize o MIDI2LR e comece a editar! Veja mais detalhes em https://github.com/rsjaffe/MIDI2LR/wiki." +"$$$/MIDI2LR/About/about=Como usar: conecte um controlador MIDI, inicialize o MIDI2LR e comece a editar! Veja mais detalhes em https://github.com/rsjaffe/MIDI2LR/wiki." "$$$/MIDI2LR/Database/Customcameraprofile=Perfil de câmera personalizado" "$$$/MIDI2LR/Database/Show1=Mostrar ^1" "$$$/MIDI2LR/Dialog/InvalidKey=O valor deve ser um único caractere ou soletrar uma tecla F (F1-F16) ou: apostrophe, backslash, backspace (no MacOS representa deletar para a esquerda), cursor down, cursor left, cursor right, cursor up, delete (no MacOS representa deletar para a direita), end, escape , home, page down, page up, return, space, tab ou numpad 0 (através de numpad 9), numpad add (ou decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_ru.txt b/data/plugin/TranslatedStrings_ru.txt index 7ad3fd63a..378d7719c 100644 --- a/data/plugin/TranslatedStrings_ru.txt +++ b/data/plugin/TranslatedStrings_ru.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=Как использовать: подключите MIDI-контроллер, запустите MIDI2LR и начните редактирование! Смотрите https://github.com/rsjaffe/MIDI2LR/wiki для подробностей." +"$$$/MIDI2LR/About/about=Как использовать: подключите MIDI-контроллер, запустите MIDI2LR и начните редактирование! Смотрите https://github.com/rsjaffe/MIDI2LR/wiki для подробностей." "$$$/MIDI2LR/Database/Customcameraprofile=Пользовательский профиль камеры" "$$$/MIDI2LR/Database/Show1=Показать ^1" "$$$/MIDI2LR/Dialog/InvalidKey=Значение должно состоять из одного символа или представлять собой клавишу F (F1-F16) или: apostrophe, backslash, backspace (в MacOS представляет собой удаление влево), cursor down, cursor left, cursor right, cursor up, delete (в MacOS представляет собой удаление вправо), end, escape , home, page down, page up, return, space, tab или numpad 0 (через numpad 9), numpad add (или decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_sv.txt b/data/plugin/TranslatedStrings_sv.txt index 0f797c651..f9be38f52 100644 --- a/data/plugin/TranslatedStrings_sv.txt +++ b/data/plugin/TranslatedStrings_sv.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=Användning: anslut en MIDI-kontroller, starta MIDI2LR och börja redigera! Kolla på https://github.com/rsjaffe/MIDI2LR/wiki för mer informatino." +"$$$/MIDI2LR/About/about=Användning: anslut en MIDI-kontroller, starta MIDI2LR och börja redigera! Kolla på https://github.com/rsjaffe/MIDI2LR/wiki för mer informatino." "$$$/MIDI2LR/Database/Customcameraprofile=Anpassad kameraprofil" "$$$/MIDI2LR/Database/Show1=Visa ^1" "$$$/MIDI2LR/Dialog/InvalidKey=Värdet måste bestå av ett tecken eller stava ut en F-tangent (F1-F16) eller: apostrophe, backslash, backspace (i MacOS representerar radera till vänster), cursor down, cursor left, cursor right, cursor up, delete (i MacOS representerar radera till höger), end, escape , home, page down, page up, return, space, tab eller numpad 0 (till och med numpad 9), numpad add (eller decimal, divide, multiply, subtract)." diff --git a/data/plugin/TranslatedStrings_th.txt b/data/plugin/TranslatedStrings_th.txt index 5ecba569c..778c38ca8 100644 --- a/data/plugin/TranslatedStrings_th.txt +++ b/data/plugin/TranslatedStrings_th.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=วิธีใช้: เชื่อมต่อคอนโทรลเลอร์ MIDI เปิด MIDI2LR และเริ่มแก้ไข! ดู https://github.com/rsjaffe/MIDI2LR/wiki สำหรับรายละเอียด" +"$$$/MIDI2LR/About/about=วิธีใช้: เชื่อมต่อคอนโทรลเลอร์ MIDI เปิด MIDI2LR และเริ่มแก้ไข! ดู https://github.com/rsjaffe/MIDI2LR/wiki สำหรับรายละเอียด" "$$$/MIDI2LR/Database/Customcameraprofile=โปรไฟล์กล้องที่กำหนดเอง" "$$$/MIDI2LR/Database/Show1=แสดง ^1" "$$$/MIDI2LR/Dialog/InvalidKey=ค่าต้องเป็นอักขระเดี่ยวหรือสะกดคีย์ F (F1-F16) หรือ: apostrophe, backslash, backspace (ใน MacOS แสดงถึงการลบไปทางซ้าย), cursor down, cursor left, cursor right, cursor up, delete (ใน MacOS แสดงถึงการลบไปทางขวา), end, escape , home, page down, page up, return, space, tab หรือ numpad 0 (ถึง numpad 9), numpad add (หรือ decimal, divide, multiply, subtract)" diff --git a/data/plugin/TranslatedStrings_zh_cn.txt b/data/plugin/TranslatedStrings_zh_cn.txt index bf05199ad..b17599498 100644 --- a/data/plugin/TranslatedStrings_zh_cn.txt +++ b/data/plugin/TranslatedStrings_zh_cn.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=使用方法：连接MIDI控制器，打开MIDI2LR，就可以啦！详情请参考 https://github.com/rsjaffe/MIDI2LR/wiki" +"$$$/MIDI2LR/About/about=使用方法：连接MIDI控制器，打开MIDI2LR，就可以啦！详情请参考 https://github.com/rsjaffe/MIDI2LR/wiki" "$$$/MIDI2LR/Database/Customcameraprofile=自定义相机配置文件" "$$$/MIDI2LR/Database/Show1=显示 ^1" "$$$/MIDI2LR/Dialog/InvalidKey=值必须是单个字符或拼写出F键（F1-F16）或：apostrophe，backslash，backspace（在MacOS中代表向左删除），cursor down，cursor left，cursor right，cursor up，delete（在MacOS中代表向右删除），end，escape ，home，page down，page up，return，space，tab或numpad 0（通过numpad 9），numpad add（或decimal，divide，multiply，subtract）。" diff --git a/data/plugin/TranslatedStrings_zh_tw.txt b/data/plugin/TranslatedStrings_zh_tw.txt index aed9efeb2..95c4afead 100644 --- a/data/plugin/TranslatedStrings_zh_tw.txt +++ b/data/plugin/TranslatedStrings_zh_tw.txt @@ -1,4 +1,4 @@ -"$$$/MIDI2LR/About/about=使用方法：連接MIDI控制器，打開MIDI2LR，就可以啦！詳情請參考 https://github.com/rsjaffe/MIDI2LR/wiki" +"$$$/MIDI2LR/About/about=使用方法：連接MIDI控制器，打開MIDI2LR，就可以啦！詳情請參考 https://github.com/rsjaffe/MIDI2LR/wiki" "$$$/MIDI2LR/Database/Customcameraprofile=自定義相機配置文件" "$$$/MIDI2LR/Database/Show1=顯示 ^1" "$$$/MIDI2LR/Dialog/InvalidKey=值必須是單個字符或拼寫出F鍵（F1-F16）或：apostrophe，backslash，backspace（在MacOS中代表向左刪除），cursor down，cursor left，cursor right，cursor up，delete（在MacOS中代表向右刪除），end，escape ，home，page down，page up，return，space，tab或numpad 0（通過numpad 9），numpad add（或decimal，divide，multiply，subtract）。" From 6fa5e0eaec340bd9ea1479269516c79f15bf802f Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Mon, 1 Nov 2021 05:03:32 -0700 Subject: [PATCH 2/3] Update travis, remove incorrect variable LocalPresets --- .travis.yml | 2 +- src/application/VersionChecker.cpp | 1 + src/plugin/LocalPresets.lua | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 372799705..3b47a16bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ os: osx -osx_image: xcode12.5 +osx_image: xcode13.1 before_install: - gem install xcpretty - gem install xcpretty-travis-formatter diff --git a/src/application/VersionChecker.cpp b/src/application/VersionChecker.cpp index 4f6a5a9a8..e0206a323 100644 --- a/src/application/VersionChecker.cpp +++ b/src/application/VersionChecker.cpp @@ -30,6 +30,7 @@ namespace { [[nodiscard]] std::string IntToVersion(unsigned int vers) { static_assert(std::is_unsigned_v, "Avoid sign extension"); + static_assert(sizeof vers >= 4, "At least 4 bytes"); const auto major {vers >> 24 & 0xFFU}; const auto minor {vers >> 16 & 0xFFU}; const auto rev {vers >> 8 & 0xFFU}; diff --git a/src/plugin/LocalPresets.lua b/src/plugin/LocalPresets.lua index 9dc1133f0..3c51493e4 100644 --- a/src/plugin/LocalPresets.lua +++ b/src/plugin/LocalPresets.lua @@ -28,6 +28,7 @@ MIDI2LR. If not, see . exposure = 0, exposure2012 = 1, highlights2012 = 1, + hue = 1, luminanceNoise = 1, moire = 1, saturation = 1, @@ -36,9 +37,9 @@ MIDI2LR. If not, see . temperature = 1, texture = 1, tint = 1, - toningHue = 240, + toningHue = 327, toningLuminance = 0, - toningSaturation = 0, + toningSaturation = 1, whites2012 = 1, --]] @@ -74,7 +75,7 @@ local localPresetMap = { texture = "local_Texture", tint = "local_Tint", toningHue = "", --"local_ToningHue" doesn't exsist - toningLuminance = "local_ToningLuminance", + toningLuminance = "", -- "local_ToningLuminance" doesn't exist toningSaturation = "", --"local_ToningSaturation" doesn't exsist whites2012 = "local_Whites" } From cc9a6c90f28ace967e0b98369c80cf261740ae44 Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Mon, 1 Nov 2021 05:07:35 -0700 Subject: [PATCH 3/3] Build 2 (for new installer) --- MIDI2LR.jucer | 2 +- build/MacOS/Info-App.plist | 4 ++-- build/MacOS/MIDI2LR.xcodeproj/project.pbxproj | 8 ++++---- build/Windows/MIDI2LR_App.vcxproj | 4 ++-- build/Windows/resources.rc | 6 +++--- external/JuceLibraryCode/JuceHeader.h | 4 ++-- src/plugin/Info.lua | 2 +- tools/doxygen/Midi2lr.Doxyfile | 2 +- tools/installer/MIDI2LR.xml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer index ab4e6aa4c..b4cab427d 100644 --- a/MIDI2LR.jucer +++ b/MIDI2LR.jucer @@ -1,6 +1,6 @@ -CFBundleSignature ???? CFBundleShortVersionString - 5.0.0.1 + 5.0.0.2 CFBundleVersion - 5.0.0.1 + 5.0.0.2 NSHumanReadableCopyright Copyright (C) 2015 by Rory Jaffe. NSHighResolutionCapable diff --git a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj index c9af74e41..e5a88620d 100644 --- a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj +++ b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj @@ -515,8 +515,8 @@ "JUCE_STANDALONE_APPLICATION=1", "JUCE_MODAL_LOOPS_PERMITTED=1", "JUCER_XCODE_MAC_46BB2872=1", - "JUCE_APP_VERSION=5.0.0.1", - "JUCE_APP_VERSION_HEX=0x5000001", + "JUCE_APP_VERSION=5.0.0.2", + "JUCE_APP_VERSION_HEX=0x5000002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -645,8 +645,8 @@ "JUCE_STANDALONE_APPLICATION=1", "JUCE_MODAL_LOOPS_PERMITTED=1", "JUCER_XCODE_MAC_46BB2872=1", - "JUCE_APP_VERSION=5.0.0.1", - "JUCE_APP_VERSION_HEX=0x5000001", + "JUCE_APP_VERSION=5.0.0.2", + "JUCE_APP_VERSION_HEX=0x5000002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/build/Windows/MIDI2LR_App.vcxproj b/build/Windows/MIDI2LR_App.vcxproj index 638c8aa2a..5e0b48dc8 100644 --- a/build/Windows/MIDI2LR_App.vcxproj +++ b/build/Windows/MIDI2LR_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.1;JUCE_APP_VERSION_HEX=0x5000001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.2;JUCE_APP_VERSION_HEX=0x5000002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -105,7 +105,7 @@ Full ..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.1;JUCE_APP_VERSION_HEX=0x5000001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.2;JUCE_APP_VERSION_HEX=0x5000002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) MultiThreaded true NotUsing diff --git a/build/Windows/resources.rc b/build/Windows/resources.rc index f52a8d9c0..8cbeeaf5e 100644 --- a/build/Windows/resources.rc +++ b/build/Windows/resources.rc @@ -9,7 +9,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,0,1 +FILEVERSION 5,0,0,2 BEGIN BLOCK "StringFileInfo" BEGIN @@ -18,9 +18,9 @@ BEGIN VALUE "CompanyName", "Rory Jaffe\0" VALUE "LegalCopyright", "Copyright (C) 2015 by Rory Jaffe.\0" VALUE "FileDescription", "MIDI2LR\0" - VALUE "FileVersion", "5.0.0.1\0" + VALUE "FileVersion", "5.0.0.2\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "5.0.0.1\0" + VALUE "ProductVersion", "5.0.0.2\0" END END diff --git a/external/JuceLibraryCode/JuceHeader.h b/external/JuceLibraryCode/JuceHeader.h index bb3b4e3ee..93588f71b 100644 --- a/external/JuceLibraryCode/JuceHeader.h +++ b/external/JuceLibraryCode/JuceHeader.h @@ -38,7 +38,7 @@ namespace ProjectInfo { const char* const projectName = "MIDI2LR"; const char* const companyName = "Rory Jaffe"; - const char* const versionString = "5.0.0.1"; - const int versionNumber = 0x5000001; + const char* const versionString = "5.0.0.2"; + const int versionNumber = 0x5000002; } #endif diff --git a/src/plugin/Info.lua b/src/plugin/Info.lua index 6c6ea9476..2ba7223e3 100644 --- a/src/plugin/Info.lua +++ b/src/plugin/Info.lua @@ -87,5 +87,5 @@ return { file = "About.lua", }, }, - VERSION = { major=5, minor=0, revision=0, build=1} + VERSION = { major=5, minor=0, revision=0, build=2} } diff --git a/tools/doxygen/Midi2lr.Doxyfile b/tools/doxygen/Midi2lr.Doxyfile index 897566ffb..fa5a37ad9 100644 --- a/tools/doxygen/Midi2lr.Doxyfile +++ b/tools/doxygen/Midi2lr.Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 5.0.0.1 +PROJECT_NUMBER = 5.0.0.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/installer/MIDI2LR.xml b/tools/installer/MIDI2LR.xml index 0b1f84812..6232f7ca2 100644 --- a/tools/installer/MIDI2LR.xml +++ b/tools/installer/MIDI2LR.xml @@ -1,7 +1,7 @@ MIDI2LR MIDI2LR - 5.0.0.1 + 5.0.0.2 ${product_shortname}-${product_version}-${debuglabel}${platform_name}-installer.${platform_exec_suffix} data/translations/ReadMe.txt ../../LICENSE.txt