Merge pull request #158 from alnitak/clicks

fix: clicks and pops when changing waveform frequency #156
alnitak · Dec 5, 2024 · 5303435 · 5303435
2 parents 551f541 + b18038e
commit 5303435
Show file tree

Hide file tree

Showing 11 changed files with 200 additions and 134 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "name": "Flutter debug",
             "type": "dart",
             "request": "launch",
-            "program": "lib/buffer_stream/websocket.dart",
+            "program": "lib/waveform/waveform.dart",
             "flutterMode": "debug",
             "cwd": "${workspaceFolder}/example"
         },

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -9,7 +9,7 @@
         },
         {
             "label": "compile linux debug",
-            "command": "cd ${workspaceFolder}/example; flutter build linux -t lib/buffer_stream/websocket.dart --debug",
+            "command": "cd ${workspaceFolder}/example; flutter build linux -t lib/waveform/waveform.dart --debug",
             "type": "shell"
         },
         {
@@ -29,7 +29,7 @@
         },
         {
             "label": "compile web debug",
-            "command": "cd ${workspaceFolder}/example; flutter run -d chrome --web-renderer canvaskit --web-browser-flag '--disable-web-security' -t lib/main.dart --release",
+            "command": "cd ${workspaceFolder}/example; flutter run -d chrome --web-renderer canvaskit --web-browser-flag '--disable-web-security' -t lib/waveform/waveform.dart --release",
             "type": "shell"
         },
         {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.1.8 ()
+- fix: clicks and pops when changing waveform frequency #156
+- added BufferStream #148. Now it's possible to add audio data and listen to them. It provides a customizable buffering length which automatycally pause the playing handle for example when receiving audio data from the web.
+
 ### 2.1.7 (29 Oct 2024)
 - added `listPlaybackDevices` to get all the OS output devices available.
 - added `deviceId` parameter to the `init()` method. You can choose which device is delegated to output the audio.

diff --git a/example/lib/waveform/waveform.dart b/example/lib/waveform/waveform.dart
@@ -41,7 +41,7 @@ class MyApp extends StatelessWidget {
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
         useMaterial3: true,
       ),
-      home: const MyHomePage(title: 'Flutter Demo Home Page'),
+      home: const MyHomePage(title: 'Flutter SoLoud waveform demo'),
     );
   }
 }
@@ -122,126 +122,132 @@ class _MyHomePageState extends State<MyHomePage> {
         backgroundColor: Theme.of(context).colorScheme.inversePrimary,
         title: Text(widget.title),
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text('SuperWave : $superWave'),
-              Switch(
-                value: superWave,
-                onChanged: (value) {
-                  setState(() {
-                    superWave = value;
-                    if (currentSound != null && isPlaying) {
-                      SoLoud.instance
-                          .setWaveformSuperWave(currentSound!, value);
-                    }
-                  });
-                },
-              ),
-              const SizedBox(height: 20),
-              Text('Scale : ${scale.toStringAsFixed(2)}'),
-              Slider(
-                value: scale,
-                max: 4,
-                onChanged: !superWave
-                    ? null
-                    : (value) {
-                        setState(() {
-                          scale = value;
-                          if (currentSound != null && isPlaying) {
-                            SoLoud.instance
-                                .setWaveformScale(currentSound!, value);
-                          }
-                        });
-                      },
-                label: 'Scale: ${scale.toStringAsFixed(2)}',
-                activeColor: Colors.green,
-                inactiveColor: Colors.green[100],
-              ),
-              const SizedBox(height: 20),
-              Text('Detune : ${detune.toStringAsFixed(2)}'),
-              Slider(
-                value: detune,
-                max: 2,
-                onChanged: !superWave
-                    ? null
-                    : (value) {
-                        setState(() {
-                          detune = value;
-                          if (currentSound != null && isPlaying) {
+      body: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('SuperWave : $superWave'),
+                Switch(
+                  value: superWave,
+                  onChanged: (value) {
+                    setState(() {
+                      superWave = value;
+                      if (currentSound != null && isPlaying) {
+                        SoLoud.instance
+                            .setWaveformSuperWave(currentSound!, value);
+                      }
+                    });
+                  },
+                ),
+                const SizedBox(height: 20),
+                Text('Scale : ${scale.toStringAsFixed(2)}'),
+                Slider(
+                  value: scale,
+                  max: 4,
+                  onChanged: !superWave
+                      ? null
+                      : (value) {
+                          setState(() {
+                            scale = value;
+                            if (currentSound != null && isPlaying) {
+                              SoLoud.instance
+                                  .setWaveformScale(currentSound!, value);
+                            }
+                          });
+                        },
+                  label: 'Scale: ${scale.toStringAsFixed(2)}',
+                  activeColor: Colors.green,
+                  inactiveColor: Colors.green[100],
+                ),
+                const SizedBox(height: 20),
+                Text('Detune : ${detune.toStringAsFixed(2)}'),
+                Slider(
+                  value: detune,
+                  max: 2,
+                  onChanged: !superWave
+                      ? null
+                      : (value) {
+                          setState(() {
+                            detune = value;
+                            if (currentSound != null && isPlaying) {
+                              SoLoud.instance
+                                  .setWaveformDetune(currentSound!, value);
+                            }
+                          });
+                        },
+                  label: 'Detune: ${detune.toStringAsFixed(2)}',
+                  activeColor: Colors.green,
+                ),
+                const SizedBox(height: 20),
+                Text('Freequncy Hz: ${frequency.toInt()}'),
+                Slider(
+                  value: frequency,
+                  min: 20,
+                  max: 2000,
+                  onChanged: (value) {
+                    setState(() {
+                      frequency = value;
+
+                      if (currentSound != null && isPlaying) {
+                        SoLoud.instance.setWaveformFreq(currentSound!, value);
+                      }
+                    });
+                  },
+                  label: 'Frequency: ${frequency.toInt()} Hz',
+                  activeColor: Colors.green,
+                  inactiveColor: Colors.green[100],
+                ),
+                const SizedBox(height: 50),
+
+                /// All waveform types.
+                Wrap(
+                  runSpacing: 4,
+                  spacing: 4,
+                  alignment: WrapAlignment.center,
+                  children: [
+                    for (var i = 0; i < WaveForm.values.length; i++)
+                      OutlinedButton(
+                        onPressed: () {
+                          setState(() {
+                            waveForm = WaveForm.values[i];
                             SoLoud.instance
-                                .setWaveformDetune(currentSound!, value);
-                          }
-                        });
-                      },
-                label: 'Detune: ${detune.toStringAsFixed(2)}',
-                activeColor: Colors.green,
-              ),
-              const SizedBox(height: 20),
-              Text('Freequncy Hz: ${frequency.toInt()}'),
-              Slider(
-                value: frequency,
-                min: 20,
-                max: 16000,
-                onChanged: (value) {
-                  setState(() {
-                    frequency = value;
-
-                    if (currentSound != null && isPlaying) {
-                      SoLoud.instance.setWaveformFreq(currentSound!, value);
-                    }
-                  });
-                },
-                label: 'Frequency: ${frequency.toInt()} Hz',
-                activeColor: Colors.green,
-                inactiveColor: Colors.green[100],
-              ),
-              const SizedBox(height: 50),
-
-              /// All waveform types.
-              Wrap(
-                runSpacing: 4,
-                spacing: 4,
-                alignment: WrapAlignment.center,
-                children: [
-                  for (var i = 0; i < WaveForm.values.length; i++)
-                    OutlinedButton(
-                      onPressed: () {
-                        setState(() {
-                          waveForm = WaveForm.values[i];
-                          SoLoud.instance.setWaveform(currentSound!, waveForm);
-                        });
-                      },
-                      style: ButtonStyle(
-                        backgroundColor: WidgetStateProperty.all(
-                          waveForm == WaveForm.values[i]
-                              ? Colors.green
-                              : Colors.transparent,
+                                .setWaveform(currentSound!, waveForm);
+                          });
+                        },
+                        style: ButtonStyle(
+                          backgroundColor: WidgetStateProperty.all(
+                            waveForm == WaveForm.values[i]
+                                ? Colors.green
+                                : Colors.transparent,
+                          ),
                         ),
+                        child: Text(WaveForm.values[i].name),
                       ),
-                      child: Text(WaveForm.values[i].name),
-                    ),
-                ],
-              ),
-              const SizedBox(height: 50),
-              Align(
-                child: OutlinedButton(
-                  onPressed: isPlaying ? null : () => play(frequency),
-                  child: const Text('Play'),
+                  ],
                 ),
-              ),
-              const SizedBox(height: 20),
-              Align(
-                child: OutlinedButton(
-                  onPressed: isPlaying ? stop : null,
-                  child: const Text('Stop'),
+                const SizedBox(height: 50),
+                Align(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      OutlinedButton(
+                        onPressed: isPlaying ? null : () => play(frequency),
+                        child: const Text('Play'),
+                      ),
+                      const SizedBox(width: 20),
+                      OutlinedButton(
+                        onPressed: isPlaying ? stop : null,
+                        child: const Text('Stop'),
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       ),

diff --git a/example/linux/my_application.cc b/example/linux/my_application.cc
@@ -47,7 +47,7 @@ static void my_application_activate(GApplication* application) {
     gtk_window_set_title(window, "flutter_soloud_example");
   }
 
-  gtk_window_set_default_size(window, 600, 580);
+  gtk_window_set_default_size(window, 600, 700);
   gtk_widget_show(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: >-
   A low-level audio plugin for Flutter,
   mainly meant for games and immersive apps.
   Based on the SoLoud (C++) audio engine.
-version: 2.1.7
+version: 2.1.8
 issue_tracker: https://github.com/alnitak/flutter_soloud/issues
 homepage: https://github.com/alnitak/flutter_soloud
 maintainer: Marco Bavagnoli (@lildeimos)

diff --git a/src/bindings.cpp b/src/bindings.cpp
@@ -488,6 +488,9 @@ extern "C"
     ///
     /// [hash] the unique sound hash of a waveform sound
     /// [newFreq]
+
+    /// Thread to oscillate the frequency
+    std::thread waveformFreqThread;
     FFI_PLUGIN_EXPORT void setWaveformFreq(unsigned int hash, float newFreq)
     {
         if (player.get() == nullptr || !player.get()->isInited())