Merge pull request #113 from alnitak/loadFile_freeze

using `loadFile` or `loadMem` freeze the UI

lib/src/soloud.dart

@@ -18,6 +18,24 @@ import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 
+@pragma('vm:entry-point')
+void _loadFile(Map<String, dynamic> args) {
+  SoLoudController().soLoudFFI.loadFile(
+        args['path'] as String,
+        LoadMode.values[args['mode'] as int],
+      );
+}
+
+@pragma('vm:entry-point')
+({PlayerErrors error, SoundHash soundHash}) _loadMem(
+    Map<String, dynamic> args) {
+  return SoLoudController().soLoudFFI.loadMem(
+        args['path'] as String,
+        args['buffer'] as Uint8List,
+        LoadMode.values[args['mode'] as int],
+      );
+}
+
 /// The main class to call all the audio methods that play sounds.
 ///
 /// This class has a singleton [instance] which represents the (also singleton)
@@ -420,13 +438,13 @@ interface class SoLoud {
       throw const SoLoudNotInitializedException();
     }
 
-    _controller.soLoudFFI.loadFile(path, mode);
-
     final completer = Completer<AudioSource>();
     loadedFileCompleters.addAll({
       path: completer,
     });
 
+    await compute(_loadFile, {'path': path, 'mode': mode.index});
+
     return completer.future.whenComplete(() {
       loadedFileCompleters.removeWhere((key, __) => key == path);
     });
@@ -470,7 +488,11 @@ interface class SoLoud {
       path: completer,
     });
 
-    final ret = _controller.soLoudFFI.loadMem(path, buffer, mode);
+    final ret = await compute(_loadMem, {
+      'path': path,
+      'buffer': buffer,
+      'mode': mode.index,
+    });
 
     /// There is not a callback in cpp that is supposed to add the
     /// "load file event". Manually send this event to have only one

src/bindings.cpp

@@ -233,12 +233,12 @@ extern "C"
 
         Player *p = player.get();
         unsigned int hash = 0;
-        // std::thread loadThread([p, completeFileName, loadIntoMem, hash]()
+        // std::thread loadThread([p, pa, completeFileName, loadIntoMem, hash]()
         //                        {
-        PlayerErrors error = p->loadFile(pa.string(), loadIntoMem, &hash);
+        PlayerErrors error = p->loadFile(pa.string(), loadIntoMem, (unsigned int*)&hash);
         // printf("*** LOAD FILE FROM THREAD error: %d  hash: %u\n", error,  *hash);
-        fileLoadedCallback(error, completeFileName, &hash);
-        //     });
+        fileLoadedCallback(error, completeFileName, (unsigned int*)&hash);
+            // });
         // // TODO(marco): use .detach()? Use std::atomic somewhere
         // loadThread.join();
     }