Merge pull request #14 from ardura/fixing-sync-other-daws

Fixing sync other daws

Author: ardura

.vscode/launch.json

@@ -0,0 +1,75 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "cppvsdbg",
+            "request": "attach",
+            "name": "Debug the plugin inside a DAW",
+            "processId": "${command:pickProcess}",
+            "internalConsoleOptions": "openOnSessionStart",
+            "symbolOptions": {
+                "searchPaths": ["${workspaceFolder}/target/debug", "${workspaceFolder}/target/profiling"],
+                "searchMicrosoftSymbolServer": false
+            }
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug executable 'xtask'",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=xtask",
+                    "--package=xtask"
+                ],
+                "filter": {
+                    "name": "xtask",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in executable 'xtask'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--bin=xtask",
+                    "--package=xtask"
+                ],
+                "filter": {
+                    "name": "xtask",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'Subhoofer'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                    "--package=Subhoofer"
+                ],
+                "filter": {
+                    "name": "Subhoofer",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "scrollscope"
-version = "0.1.0"
+version = "1.1.1"
 edition = "2021"
 authors = ["Ardura <azviscarra@gmail.com>"]
 license = "GPL-3.0-or-later"
@@ -25,6 +25,7 @@ strip = "symbols"
 
 [profile.profiling]
 inherits = "release"
-opt-level = 2
+lto = "off"
+opt-level = 0
 debug = true
 strip = "none"

Cargo.toml

@@ -35,6 +35,8 @@ pub struct Gain {
 
     // Syncing for beats
     sync_var: Arc<Mutex<bool>>,
+    alt_sync: Arc<Mutex<bool>>,
+    alt_sync_beat: Arc<Mutex<i64>>,
     in_place_index: Arc<AtomicI32>,
 }
 
@@ -72,6 +74,8 @@ impl Default for Gain {
             samples: Arc::new(Mutex::new(VecDeque::with_capacity(130))),
             aux_samples: Arc::new(Mutex::new(VecDeque::with_capacity(130))),
             sync_var: Arc::new(Mutex::new(false)),
+            alt_sync: Arc::new(Mutex::new(false)),
+            alt_sync_beat: Arc::new(Mutex::new(0)),
             in_place_index: Arc::new(AtomicI32::new(0)),
         }
     }
@@ -145,6 +149,7 @@ impl Plugin for Gain {
         let ontop = self.swap_draw_order.clone();
         let is_clipping = self.is_clipping.clone();
         let sync_var = self.sync_var.clone();
+        let alt_sync = self.alt_sync.clone();
         let dir_var = self.direction.clone();
         let user_color_primary = self.user_color_primary.clone();
         let user_color_secondary = self.user_color_secondary.clone();
@@ -221,14 +226,15 @@ impl Plugin for Gain {
                                 let _swap_response = ui.checkbox(&mut ontop.lock(), "Swap").on_hover_text("Change the drawing order of waveforms");
 
                                 let sync_response = ui.checkbox(&mut sync_var.lock(), "Sync Beat").on_hover_text("Lock drawing to beat");
+                                let alt_sync = ui.checkbox(&mut alt_sync.lock(), "Alt. Sync").on_hover_text("Try this if Sync doesn't work");
 
                                 let dir_response = ui.checkbox(&mut dir_var.lock(), "Flip").on_hover_text("Flip direction of oscilloscope");
 
                                 if gain_handle.changed() {
                                     sum_line = Line::new(PlotPoints::default());
                                 }
                                 // Reset our line on change
-                                if sync_response.clicked() || dir_response.clicked()
+                                if sync_response.clicked() || dir_response.clicked() || alt_sync.clicked()
                                 {
                                     sum_line = Line::new(PlotPoints::default());
                                     aux_line = Line::new(PlotPoints::default());
@@ -367,12 +373,27 @@ impl Plugin for Gain {
                     // If we are beat syncing - this resets our position in time accordingly
                     if *self.sync_var.lock() {
                         // Make the current bar precision a one thousandth of a beat - I couldn't find a better way to do this
-                        let mut current_bar_position: f64 = context.transport().pos_beats().unwrap();
-                        current_bar_position = (current_bar_position * 10000.0 as f64).round() / 10000.0 as f64;
-                        if  current_bar_position % 1.0 == 0.0 {
-                            // Reset our index to the sample vecdeques
-                            self.in_place_index = Arc::new(AtomicI32::new(0));
-                            self.skip_counter = 0;
+                        let mut current_beat: f64 = context.transport().pos_beats().unwrap();
+
+                        if *self.alt_sync.lock() {
+                            // This is scaled a little more to catch things earlier due to thread timing in Ardour
+                            // This should still play well with other DAWs using this timing
+                            current_beat = ((current_beat + 0.036) * 100.0 as f64).round() / 100.0 as f64;
+                            let current_bar = current_beat as i64;
+                            // Tracks based off beat number for other daws - this is a mutex instead of atomic for locking
+                            if *self.alt_sync_beat.lock() != current_bar {
+                                self.in_place_index = Arc::new(AtomicI32::new(0));
+                                self.skip_counter = 0;
+                                *self.alt_sync_beat.lock() = current_bar;
+                            }
+                        } else {
+                            // Works in FL Studio but not other daws, hence the previous couple of lines
+                            current_beat = (current_beat * 10000.0 as f64).round() / 10000.0 as f64;
+                            if current_beat % 1.0 == 0.0 {
+                                // Reset our index to the sample vecdeques
+                                self.in_place_index = Arc::new(AtomicI32::new(0));
+                                self.skip_counter = 0;
+                            }
                         }
                     }