Merge branch 'main' into win-beta-5

BUILD-LINUX.md

@@ -58,7 +58,7 @@ sudo apt-get install -y \
      ruby-dev erlang-base erlang-dev erlang-tools \
      supercollider-server sc3-plugins-server alsa-utils libaubio5  jackd2 libjack-jackd2-dev libjack-jackd2-0 libasound2-dev librtmidi-dev pulseaudio-module-jack\
      qt5-default qttools5-dev-tools libqt5concurrent5 libqt5core5a libqt5gui5 libqt5network5 libqt5opengl5 libqt5printsupport5 libqt5concurrent5 libqt5svg5 libqt5widgets5 libqt5svg5-dev \
-     compton
+     compton pulseaudio-module-jack
 ```     
 
 

app/gui/qt/mainwindow.cpp

@@ -128,7 +128,7 @@ MainWindow::MainWindow(QApplication &app, bool i18n, QSplashScreen* splash)
     show_rec_icon_a = false;
     restoreDocPane = false;
     focusMode = false;
-    version = "3.3-BETA-4";
+    version = "3.3-BETA-5";
     latest_version = "";
     version_num = 0;
     latest_version_num = 0;

app/mac-release.sh

@@ -3,7 +3,7 @@ set -eux # Quit script on error
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-cd "${SCRIPT_DIR}/build/Sonic Pi.app/Contents/Resources"
+cd "${SCRIPT_DIR}/build/gui/qt/Sonic Pi.app/Contents/Resources"
 
 rm app etc server
 mkdir app

app/server/ruby/lib/sonicpi/runtime.rb

@@ -1332,7 +1332,7 @@ module SonicPi
       end
       @scsynth_clobber_args = @audio_settings.scsynth_opts_override
       @scsynth_opts = @audio_settings.scsynth_opts
-      @version = Version.new(3, 3, 0, "beta-4")
+      @version = Version.new(3, 3, 0, "beta-5")
       @server_version = __server_version
       @life_hooks = LifeCycleHooks.new
       @msg_queue = msg_queue

app/server/ruby/lib/sonicpi/scsynthexternal.rb

@@ -404,18 +404,12 @@ module SonicPi
       else
          puts "Booting on Raspberry Pi (32bit OS)"
       end
-      begin
-        asoundrc = File.read(Dir.home + "/.asoundrc")
-        audio_card = (asoundrc.match(/pcm.output\s+{[^}]+\n\s+card\s+([0-9]+)/m))[1]
-      rescue
-        audio_card = "0"
-      end
 
       #Start Jack if not already running
       if `ps cax | grep jackd`.split(" ").first.nil?
         #Jack not running - start a new instance
         puts "Jackd not running on system. Starting..."
-       jackCmd="jackd -R -p 32 -d alsa -d hw:#{audio_card} -n 3 -p 2048 -o2 -r 44100 "
+        jackCmd="jackd -T -ddummy -r48000 -p1024"
         jack_pid = spawn "exec #{jackCmd}"
         register_process jack_pid
       else
@@ -435,11 +429,13 @@ module SonicPi
 
       boot_and_wait(scsynth_path, scsynth_opts)
 
-      `jack_connect SuperCollider:out_1 system:playback_1`
-      `jack_connect SuperCollider:out_2 system:playback_2`
       `jack_connect SuperCollider:in_1 system_capture_1`
       `jack_connect SuperCollider:in_2 system_capture_2`
-
+      `pactl load-module module-jack-source connect=0 client_name=JACK_to_PulseAudio`
+      `pactl load-module module-loopback source=jack_in`
+      `jack_connect SuperCollider:out_1 JACK_to_PulseAudio:front-left`
+      `jack_connect SuperCollider:out_2 JACK_to_PulseAudio:front-right`
+      
       sleep 3
     end