rework part of AudioServer for TOML supporting

AlexanderARodin · Jan 28, 2024 · 24ab289 · 24ab289
1 parent b08e669
commit 24ab289
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 #raalog = { git = "https://github.com/AlexanderARodin/raalog.git", branch="dev" }
 raalog = { git = "https://github.com/AlexanderARodin/raalog.git", tag="v0.2.0" }
 
-audio_server = { path = "../audio_server/" }
-# audio_server = { git = "https://github.com/AlexanderARodin/audio_server.git", branch="main" }
+# audio_server = { path = "../audio_server/" }
+audio_server = { git = "https://github.com/AlexanderARodin/audio_server.git", branch="main" }
 
 egui = "0.24.0"
 eframe = { version = "0.24.0", default-features = false, features = [

diff --git a/src/test_view.rs b/src/test_view.rs
@@ -83,30 +83,33 @@ impl TestView {
         ui.horizontal( |ui| {
                 let btnN = ui.button( "None" );
                 if btnN.clicked(){
-                    let setup = "[AudioSource]\nMain = 'None'";
+                    let setup = "[AudioSource]\nName = 'None'";
                     self.applySetup( setup, None );
                 }
                 let btnS = ui.button( "SimpleSynth" );
                 if btnS.clicked(){
-                    let setup = "[AudioSource]\nMain = 'Simple'";
+                    let setup = "[AudioSource]\nName = 'Simple'";
                     self.applySetup( setup, None );
                 }
                 let btnRA = ui.button( "RustySynt - Strings" );
                 if btnRA.clicked(){
-                    let setup = "[AudioSource]\nMain = 'RustySynth'";
+                    let setup = "[AudioSource]\nName = 'RustySynth'";
                     self.applySetup( setup, Some(SF_STRINGS) );
                 }
                 let btnRB = ui.button( "RustySynt - Piano" );
                 if btnRB.clicked(){
-                    let setup = "[AudioSource]\nMain = 'RustySynth'";
+                    let setup = "[AudioSource]\nName = 'RustySynth'";
                     self.applySetup( setup, Some(SF_PIANO) );
                 }
+                let btnRA = ui.button( "Sequencer:Simple" );
+                if btnRA.clicked(){
+                    let setup = "[AudioSource]\nName = 'Sequencer'\n[AudioSource.Sequencer]\nMainVoice = 'Simple'";
+                    self.applySetup( setup, None );
+                }
                 let btnRA = ui.button( "Sequencer:RustySynt - Strings" );
                 if btnRA.clicked(){
-                    let setup = "[AudioSource]\nMain = 'Sequencer'";
-                    self.applySetup( setup, Some(SF_PIANO) );
-                    //self.applySetup( setup, Some(SF_STRINGS) );
-                    //self.applySetup( "Sequencer:RustySynt", Some(SF_STRINGS) );
+                    let setup = "[AudioSource]\nName = 'Sequencer'\n[AudioSource.Sequencer]\nMainVoice = 'RustySynth'";
+                    self.applySetup( setup, Some(SF_STRINGS) );
                 }
             });
         ui.separator();