Merge pull request #2684 from sonic-pi-net/v3.3.1-dev

V3.3.1 dev

Author: samaaron

CHANGELOG.md

@@ -1,4 +1,5 @@
 # History
+* [v3.3.1 'Beamer'](#v3.3.1), 1st Feb, 2021
 * [v3.3 'Beam'](#v3.3), 28th Jan, 2021
 * [v3.2.2 'Tau3'](#v3.2.2), 5th April, 2020
 * [v3.2.1 'Take Tau'](#v3.2.1), 3rd April, 2020
@@ -22,6 +23,22 @@
 * [v2.0.1](#v2.0.1), 9th Sept, 2014
 * [v2.0 'Phoenix'](#v2.0), 2nd Sept, 2014
 
+<a name="v3.3.1"></a>
+
+## Version 3.3.1 - 'Beamer'
+1st Feb, 2021
+[(view commits)](https://github.com/sonic-pi-net/sonic-pi/commits/v3.3.1):
+
+This is a compatibility release addressing two issues with macOS Big Sur:
+
+1. Correct language translations now used based on user's current locale
+2. The language server is no longer killed by macOS Gatekeeper when a
+   sample's onset times are queried.
+   
+This release also includes minor translation updates.
+
+   
+
 <a name="v3.3"></a>
 
 ## Version 3.3.0 - 'Beam'

CONTRIBUTORS.md

@@ -224,19 +224,18 @@ In addition to the Sonic Pi Core Team, we would like to extend our
 thanks to the following developers who have donated their time and
 effort to help grow and improve the Sonic Pi code base:
 
-
-* [Sam Aaron](https://github.com/samaaron/sonic-pi/commits?author=samaaron) (5546)
-* [Ethan Crawford](https://github.com/samaaron/sonic-pi/commits?author=ethancrawford) (259)
+* [Sam Aaron](https://github.com/samaaron/sonic-pi/commits?author=samaaron) (5565)
+* [Ethan Crawford](https://github.com/samaaron/sonic-pi/commits?author=ethancrawford) (262)
 * [Joseph Wilk](https://github.com/samaaron/sonic-pi/commits?author=josephwilk) (160)
 * [Hanno Zulla](https://github.com/samaaron/sonic-pi/commits?author=hzulla) (127)
 * [Jeremy Weatherford](https://github.com/samaaron/sonic-pi/commits?author=jweather) (127)
 * [Xavier Riley](https://github.com/samaaron/sonic-pi/commits?author=xavriley) (106)
 * [Adrian Cheater](https://github.com/samaaron/sonic-pi/commits?author=factoid) (74)
-* [Robin Newman](https://github.com/samaaron/sonic-pi/commits?author=rbnpi) (64)
+* [Robin Newman](https://github.com/samaaron/sonic-pi/commits?author=rbnpi) (68)
 * [Emlyn Corrin](https://github.com/samaaron/sonic-pi/commits?author=emlyn) (62)
 * [SunderB](https://github.com/samaaron/sonic-pi/commits?author=SunderB) (56)
 * [Martin Keegan](https://github.com/samaaron/sonic-pi/commits?author=mk270) (48)
-* [Chris Maughan](https://github.com/samaaron/sonic-pi/commits?author=cmaughan) (44)
+* [Chris Maughan](https://github.com/samaaron/sonic-pi/commits?author=cmaughan) (46)
 * [Luis Lloret](https://github.com/samaaron/sonic-pi/commits?author=llloret) (39)
 * [Nicolas Dermine](https://github.com/samaaron/sonic-pi/commits?author=nicoder) (37)
 * [Nikolaus Gradwohl](https://github.com/samaaron/sonic-pi/commits?author=ngradwohl) (30)
@@ -379,8 +378,8 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Hanno Zulla (119)
 * Sam Aaron (87)
 * Nico Staelens (83)
-* Nicolas Dermine (80)
-* Olivier Humbert (50)
+* Nicolas Dermine (81)
+* Olivier Humbert (51)
 * Cindy Dallaire (48)
 * Pau Monfort (39)
 * Olympia Brikis (37)
@@ -392,22 +391,22 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Ricardo Pozo (23)
 * Yann Pavlenko (22)
 * Giovanni Mori (21)
+* Emlyn Corrin (18)
 * Ruben Tobalina (18)
-* Emlyn Corrin (16)
+* Nicolas Le Bellier (15)
 * Wolfgang Werner (14)
 * Allan Nordhøy (13)
 * G. Martin Butz (12)
-* Nicolas Le Bellier (12)
 * Álvaro Cáceres Muñoz (12)
 * Hong Lees (11)
 * Ole Friis Østergaard (11)
 * Nicolas Limage (10)
 * Elena Ogaderova (9)
+* Kristjan Räts (9)
 * Oto Popis (9)
 * Tiago Morais Morgado (9)
 * Yaron Shahrabani (9)
 * Daniele Paradiso (8)
-* Kristjan Räts (8)
 * Ole Erik Yrvin (8)
 * Rekc@h (8)
 * Yang Wanjun (8)
@@ -446,6 +445,7 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Nur Sodik (5)
 * Sebastian Stahn (5)
 * Suleyman Poyraz (5)
+* Alex Esc (4)
 * André Klöpfel (4)
 * ArtyomIsFlash (4)
 * Dahlia Sager (4)
@@ -582,7 +582,6 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Ai Doan (1)
 * Alejandro Sánchez Medina (1)
 * Alessandro Kiefer (1)
-* Alex Esc (1)
 * Anderson Freitas B. da Silva (1)
 * Andras Nemeth (1)
 * Andrey Raspopov (1)
@@ -599,6 +598,7 @@ The following volunteers have generously helped to translate Sonic Pi into addit
 * Bruno Arakaki (1)
 * Burak Tufekci (1)
 * Carlos David Perales Cejudo (1)
+* Cattice (1)
 * Cedric Frossard (1)
 * Cem Kaan Kösali (1)
 * Cem Olcay (1)

app/external/aubio/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(aubio-5)
 set(SOURCE_ROOT ${CMAKE_CURRENT_LIST_DIR}/src)
+set(EXAMPLES_ROOT ${CMAKE_CURRENT_LIST_DIR}/examples)
 
 set(SOURCES
     ${SOURCE_ROOT}/exports.def
@@ -122,11 +123,23 @@ set(SOURCES
     ${SOURCE_ROOT}/utils/windll.c
 )
 
-add_library(${PROJECT_NAME} SHARED ${SOURCES} ${RESOURCES}) # Win32 ignored on non-windows
+add_library(${PROJECT_NAME} STATIC ${SOURCES} ${RESOURCES}) # Win32 ignored on non-windows
 target_include_directories(${PROJECT_NAME}
     PRIVATE
     src
     ${LIBSNDFILE_INCLUDE_DIR}
+    )
+
+add_executable(aubio_onset
+    ${EXAMPLES_ROOT}/aubioonset.c
+    ${EXAMPLES_ROOT}/utils.c)
+
+target_link_libraries(aubio_onset PRIVATE ${PROJECT_NAME})
+
+target_include_directories(aubio_onset
+    PRIVATE
+    src
+    ${LIBSNDFILE_INCLUDE_DIR}
 )
 
 # 'lib' is appended to the library name automatically on most non-Windows platforms
@@ -206,6 +219,7 @@ target_compile_definitions(${PROJECT_NAME}
     -DHAVE_SWRESAMPLE
     -DHAVE_MEMCPY_HACKS
     -DHAVE_SNDFILE
+    -DHAVE_CONFIG
     #-DHAVE_ACCELERATE
     #-DHAVE_INTEL_IPP (needs intel lib)
     #-DHAVE_SAMPLERATE (needs extra lib in path)

app/external/aubio/examples/config.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#define HAVE_STDLIB_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ERRNO_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MEMCPY_HACKS 1
+#define HAVE_C99_VARARGS_MACROS 1
+
+#ifdef WIN32
+#define HAVE_WIN_HACKS 1
+#else
+#define HAVE_UNISTD_H 1
+#endif

app/external/aubio/examples/utils.c

@@ -38,13 +38,22 @@ int usejack = 0;
 char_t *sink_uri = NULL;
 char_t *source_uri = NULL;
 // general stuff
+
+// Use defaults as found in the original aubio Ruby gem
+// to match existing behaviour:
+// [:window_size]     1024
+// [:hop_size]        512
+// [:onset_threshold] 0.3
+// [:minioi_ms]       12.0 (ms)
+
+
 uint_t samplerate = 0;
-uint_t buffer_size = 512;
-uint_t hop_size = 256;
+uint_t buffer_size = 1024;
+uint_t hop_size = 512;
 // onset stuff
 char_t * onset_method = "default";
-smpl_t onset_threshold = 0.0; // will be set if != 0.
-smpl_t onset_minioi = 0.0; // will be set if != 0.
+smpl_t onset_threshold = 0.3; // will be set if != 0.
+smpl_t onset_minioi = 0.012; // will be set if != 0.
 // pitch stuff
 char_t * pitch_unit = "default";
 char_t * pitch_method = "default";

app/external/linux_build_externals.sh

@@ -12,10 +12,6 @@ cmake -DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH} -G "Unix Makefiles" ..
 
 echo "Building sp_midi..."
 cmake --build . --target sp_midi
-
-if [ "$1" = "--build-aubio" ]; then
-  echo "Building aubio..."
-  cmake --build . --target aubio
-fi
+cmake --build . --target aubio
 
 cd "${SCRIPT_DIR}"

app/external/mac_build_externals.sh

@@ -11,11 +11,7 @@ cmake -G "Unix Makefiles" -D ERLANG_INCLUDE_PATH="${SCRIPT_DIR}/../../prebuilt/m
 
 echo "Building sp_midi..."
 cmake  --build . --target sp_midi
-
-
-if [ "$1" = "--build-aubio" ]; then
-  echo "Building aubio..."
-  cmake --build . --target aubio
-fi
+echo "Building aubio onset..."
+cmake --build . --target aubio
 
 cd "${SCRIPT_DIR}"

app/gui/qt/CMakeLists.txt

@@ -5,7 +5,7 @@ message(STATUS " CMakeLists: Sonic Pi")
 project("Sonic Pi"
     LANGUAGES CXX C
   DESCRIPTION "A code-based music creation and performance tool"
-  VERSION 3.3.0
+  VERSION 3.3.1
   HOMEPAGE_URL "https://sonic-pi.net"
     )
 

app/gui/qt/html/doc.html

@@ -15,7 +15,7 @@
  code_as <span class="highlight">:art</span></pre>
     </p>
 
-    <p class="version">v3.3.0</p>
+    <p class="version">v3.3.1</p>
 
   </center>
 

app/gui/qt/html/info.html

@@ -29,6 +29,6 @@
 
     <br/>
 
-    <p class="version">v3.3.0</p>
+    <p class="version">v3.3.1</p>
   </center>
 </body>