Build - compile on Linux and Windows again, and vendor the crates from clockwork's workspace for the Debian source

Author: samaaron

app/gui/mainwindow.h

@@ -233,6 +233,7 @@ public slots:
     void onMixerSettings(double drive, double outputVolume);
     void onAudioSwitchDone(const SonicPi::AudioSwitchOutcome& outcome);
     void onAudioDeviceReopenReply(bool accepted, QString reason);
+    void onAudioStateChanged(const QString& state, const QString& reason);   // the engine's own fallback: say where the sound went
     void changeBufferSize(int size);
     void resetAudioDevice();
 
@@ -253,6 +254,7 @@ public slots:
     // startup never finished (see audioBootDecision); say so once we are up.
     bool m_audioPrefsSkippedAtBoot = false;
     bool m_audioDevicesSeen = false;
+    bool m_announceDeviceAfterRollback = false;   // the next device list names where the engine's fallback went
     bool m_audioInputDevicesSeen = false;
     bool m_audioDeviceConfigSeen = false;
     SonicPi::AudioDevicesInfo      m_lastAudioDevices;
@@ -632,8 +634,6 @@ private slots:
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     // A+V session-recorder branch of toggleRecording. Write to a temp
     // file; rename or delete it once the user picks a save location.
-    void onAudioStateChanged(const QString& state, const QString& reason);   // the engine's own fallback: say where the sound went
-    bool m_announceDeviceAfterRollback = false;
     void startSessionRecordingFlow();
     void stopSessionRecordingFlow();
     void recordingFailed(const QString& reason);   // the recorder could not start or died: Record goes back

app/gui/platform/recorder_win.cpp

@@ -19,6 +19,7 @@
 #include "windows.h"
 #include "wgc_d3d_interop.h"
 #include "mp4_soft_remux.h"
+#include "recorder_audio_mix.h"
 
 #include <d3d11_4.h>
 #include <windows.graphics.capture.interop.h>

app/linux-debian-source.sh

@@ -13,7 +13,7 @@
 #   sonic-pi_<uv>.orig-link.tar.xz        pristine Ableton Link 4.0 with its
 #                                         asio-standalone submodule
 #   sonic-pi_<uv>.orig-rust-vendor.tar.xz `cargo vendor` output for the
-#                                         supersonic rust/Cargo.lock
+#                                         clockwork rust/Cargo.lock
 #   sonic-pi_<dv>.dsc + .debian.tar.xz    via dpkg-buildpackage -S
 #
 # The Link and rust-vendor components mirror the ones the supersonic repo's
@@ -102,11 +102,10 @@ find "$WORK/link" -name .git -prune -exec rm -rf {} +
 tar -C "$WORK" -cJf "$WORK/sonic-pi_$UV.orig-link.tar.xz" link
 
 # ── Rust vendor component ───────────────────────────────────────────────────
-# supersonic's workspace is the one the engine build runs cargo in
-# (CLOCKWORK_RUST_WORKSPACE); its crates path-depend on clockwork's, so one
-# vendor of this lockfile covers the whole graph.
+# clockwork's workspace is the one the engine build runs cargo in
+# (CLOCKWORK_RUST_WORKSPACE), so one vendor of its lockfile covers the graph.
 echo "=== orig-rust-vendor tarball ==="
-(cd "$SUPERSONIC/rust" && cargo vendor "$WORK/rust-vendor")
+(cd "$SUPERSONIC/clockwork/rust" && cargo vendor "$WORK/rust-vendor")
 
 # Sanitise the vendor tree so it survives Debian's source-package machinery
 # and lintian — same rules as supersonic's make-debian-source.sh, see there