Merge pull request #135 from alexmercerind/fix-seg-faults

Author: alexmercerind

dartvlc/api/eventmanager.h

@@ -160,48 +160,68 @@ inline void OnRate(int32_t id, PlayerState* state) {
 inline void OnOpen(int32_t id, PlayerState* state) {
   const auto& media_items = state->medias()->medias();
 
-  auto value_objects = std::unique_ptr<Dart_CObject* []>(
-      new Dart_CObject*[4 + media_items.size() * 2]);
-
   Dart_CObject id_object;
   id_object.type = Dart_CObject_kInt32;
   id_object.value.as_int32 = id;
-  value_objects[0] = &id_object;
 
   Dart_CObject type_object;
   type_object.type = Dart_CObject_kString;
   type_object.value.as_string = "openEvent";
-  value_objects[1] = &type_object;
 
   Dart_CObject index_object;
   index_object.type = Dart_CObject_kInt32;
   index_object.value.as_int32 = state->index();
-  value_objects[2] = &index_object;
 
   Dart_CObject is_playlist_object;
   is_playlist_object.type = Dart_CObject_kBool;
   is_playlist_object.value.as_int32 = state->is_playlist();
-  value_objects[3] = &is_playlist_object;
-  int index = 0;
-  for (const auto& media : media_items) {
-    Dart_CObject media_type_object;
-    media_type_object.type = Dart_CObject_kString;
-    media_type_object.value.as_string =
-        const_cast<char*>(media->media_type().c_str());
-
-    Dart_CObject resource_object;
-    resource_object.type = Dart_CObject_kString;
-    resource_object.value.as_string =
-        const_cast<char*>(media->resource().c_str());
-    value_objects[index + 4] = &media_type_object;
-    value_objects[index + 5] = &resource_object;
-    index += 2;
+
+  auto types_objects =
+      std::unique_ptr<Dart_CObject[]>(new Dart_CObject[media_items.size()]);
+  auto types_object_refs =
+      std::unique_ptr<Dart_CObject* []>(new Dart_CObject*[media_items.size()]);
+  std::vector<std::string> types_str(media_items.size());
+  std::vector<const char*> types_ptr(media_items.size());
+  for (int32_t i = 0; i < media_items.size(); i++) {
+    types_str[i] = media_items[i]->media_type();
+    types_ptr[i] = types_str[i].c_str();
+    Dart_CObject* value_object = &types_objects[i];
+    value_object->type = Dart_CObject_kString;
+    value_object->value.as_string = const_cast<char*>(types_ptr[i]);
+    types_object_refs[i] = value_object;
+  }
+  Dart_CObject types_object;
+  types_object.type = Dart_CObject_kArray;
+  types_object.value.as_array.length = media_items.size();
+  types_object.value.as_array.values = types_object_refs.get();
+
+  auto resources_objects =
+      std::unique_ptr<Dart_CObject[]>(new Dart_CObject[media_items.size()]);
+  auto resources_object_refs =
+      std::unique_ptr<Dart_CObject* []>(new Dart_CObject*[media_items.size()]);
+  std::vector<std::string> resources_str(media_items.size());
+  std::vector<const char*> resources_ptr(media_items.size());
+  for (int32_t i = 0; i < media_items.size(); i++) {
+    resources_str[i] = media_items[i]->resource();
+    resources_ptr[i] = resources_str[i].c_str();
+    Dart_CObject* value_object = &resources_objects[i];
+    value_object->type = Dart_CObject_kString;
+    value_object->value.as_string = const_cast<char*>(resources_ptr[i]);
+    resources_object_refs[i] = value_object;
   }
+  Dart_CObject resources_object;
+  resources_object.type = Dart_CObject_kArray;
+  resources_object.value.as_array.length = media_items.size();
+  resources_object.value.as_array.values = resources_object_refs.get();
+
+  Dart_CObject* value_objects[] = {&id_object,    &type_object,
+                                   &index_object, &is_playlist_object,
+                                   &types_object, &resources_object};
 
   Dart_CObject return_object;
   return_object.type = Dart_CObject_kArray;
-  return_object.value.as_array.length = 4 + media_items.size() * 2;
-  return_object.value.as_array.values = value_objects.get();
+  return_object.value.as_array.length = 6;
+  return_object.value.as_array.values = value_objects;
   g_dart_post_C_object(g_callback_port, &return_object);
 }
 

ffi/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4
+
+- Fix OnOpen callback
+
 ## 0.1.3
 
 - Update `ReceivePort` listener to match new NativePort callbacks.

ffi/lib/src/internal/ffi.dart

@@ -228,22 +228,24 @@ final ReceivePort receiver = new ReceivePort()
         {
           players[id]!.current.index = event[2];
           players[id]!.current.isPlaylist = event[3];
+          assert(event[4].length == event[5].length);
+          int length = event[4].length;
           List<Media> medias = [];
-          for (int index = 4; index < event.length; index += 2) {
-            switch (event[index]) {
+          for (int index = 0; index < length; index++) {
+            switch (event[4][index]) {
               case 'MediaType.file':
                 {
-                  medias.add(Media.file(File(event[index + 1])));
+                  medias.add(Media.file(File(event[5][index])));
                   break;
                 }
               case 'MediaType.network':
                 {
-                  medias.add(Media.network(Uri.parse(event[index + 1])));
+                  medias.add(Media.network(Uri.parse(event[5][index])));
                   break;
                 }
               case 'MediaType.directShow':
                 {
-                  medias.add(Media.directShow(rawUrl: event[index + 1]));
+                  medias.add(Media.directShow(rawUrl: event[5][index]));
                   break;
                 }
             }

ffi/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_vlc_ffi
 description: FFI based binding to dart_vlc wrapper (Based on libVLC & libVLC++).
-version: 0.1.3
+version: 0.1.4
 homepage: https://github.com/alexmercerind/dart_vlc
 repository: https://github.com/alexmercerind/dart_vlc
 documentation: https://github.com/alexmercerind/dart_vlc/blob/master/README.md

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: audio_video_progress_bar
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.9.0"
   characters:
     dependency: transitive
     description:
@@ -25,10 +25,10 @@ packages:
   dart_vlc_ffi:
     dependency: "direct main"
     description:
-      name: dart_vlc_ffi
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.3"
+      path: ffi
+      relative: true
+    source: path
+    version: "0.1.4"
   ffi:
     dependency: transitive
     description:
@@ -68,7 +68,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   path_provider_linux:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_vlc
 description: Flutter media playback, broadcast, recording & chromecast library. Based on libVLC & libVLC++.
-version: 0.1.6
+version: 0.1.7
 homepage: https://github.com/alexmercerind/dart_vlc
 repository: https://github.com/alexmercerind/dart_vlc
 documentation: https://github.com/alexmercerind/dart_vlc/blob/master/README.md
@@ -12,7 +12,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  dart_vlc_ffi: ">=0.1.3 <1.0.0"
+  dart_vlc_ffi:
+   path: ./ffi
   path: ">=1.8.0 <2.0.0"
   path_provider: ">=2.0.2 <3.0.0"
   audio_video_progress_bar: ">=0.9.0 <1.0.0"