[ffi] Fixed incorrect Devices.all list

Author: alexmercerind

ffi/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.4
+
+- Fixed incorrect `Devices.all` list.
+
 ## 0.0.3
 
 - Fixed video frame callbacks.

ffi/lib/src/device.dart

@@ -21,8 +21,8 @@ class Devices {
     Pointer<Pointer<Utf8>> devicesPtr = DevicesFFI.all();
     int count = int.parse(devicesPtr.elementAt(0).value.toDartString());
     for (int i = 1; i < 2 * count; i += 2) {
-      devices.add(Device(devicesPtr.elementAt(1).value.toDartString(),
-          devicesPtr.elementAt(2).value.toDartString()));
+      devices.add(Device(devicesPtr.elementAt(i).value.toDartString(),
+          devicesPtr.elementAt(i + 1).value.toDartString()));
     }
     return devices;
   }

ffi/native/dart_vlc.cpp

@@ -293,15 +293,14 @@ EXPORT char** Devices_all() {
     char** _devices = new char*[(devices->all.size() * 2) + 1];
     _devices[0] = new char[200];
     strncpy(_devices[0], std::to_string(devices->all.size()).data(), 200);
-    int index = 1;
+    int index = 0;
     for (Device* device: devices->all) {
-        _devices[index] = new char[200];
-        strncpy(_devices[index], device->id.data(), 200);
         _devices[index + 1] = new char[200];
-        strncpy(_devices[index + 1], device->name.data(), 200);
+        strncpy(_devices[index + 1], device->id.data(), 200);
+        _devices[index + 2] = new char[200];
+        strncpy(_devices[index + 2], device->name.data(), 200);
         index += 2;
     }
-    devices->all.size();
     return _devices;
 }
 

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.0.3
+version: 0.0.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