mediainfo-native 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a782db0907a8b6d42f2bcbfd5139d5cbc90abba9
-  data.tar.gz: 5b1db6d9c65e0df426e7c6d25698304777c5cbc1
+  metadata.gz: e0b1502f91c83eca2c8f057f9df9f5048afcafe0
+  data.tar.gz: a181df52fa311bb36dcd6aa8e7669328a098d2ea
 SHA512:
-  metadata.gz: 7daf29e66426fdaa52f534302b218f0730091555af5c7de80353122ede3fb1d4e563c3f4b0744922e235f6601ae7bf55d0104e2e8b12205ed7fed438e06f710f
-  data.tar.gz: 1f40980b01405e5d98b640cd9e31d81db582cff8ab7eca70d7d8d0e64f06b64c5fa6042bfaf0d9192ea30f37cf68324fc9a8466f2704e69ec5b8a601902b4f4e
+  metadata.gz: e3f5f0c3fe7bdba919b0621e64018b09f28fd14c55689559382e5a6abdd042f457986879d29d3ba59573aac3334021f5ab47bd4824578f64fde2784b78b391bd
+  data.tar.gz: ffe53edefd1ae6e968b61c19602ef93e4ac8f633c93c2f52721ea712648a36ba5ddb05b46d6949132e1e672895dce21d1e763c389555c7cb2348f141c6379ad4

data/ext/mediainfo_native/mediainfo_wrapper.cpp

@@ -1,3 +1,6 @@
+#include <ruby.h>
+#include <ruby/thread.h>
+
 #include "MediaInfoDLL.h"
 #include "mediainfo_wrapper.h"
 #include "unicode.h"
@@ -11,6 +14,12 @@ namespace MediaInfoNative
   MediaInfoWrapper* var; \
   Data_Get_Struct(self, MediaInfoWrapper, var)
 
+typedef struct {
+  MediaInfoWrapper* miw;
+  MediaInfoDLL::String path;
+  int result;
+} OpenParams;
+
 extern "C"
 {
 
@@ -35,12 +44,26 @@ extern "C"
     return Qnil;
   }
 
+  static void* miw_open_without_gvl(void* ptr) {
+    OpenParams* params = (OpenParams*) ptr;
+    params->result = params->miw->open(params->path);
+    return NULL;
+  }
+
   static VALUE miw_open(VALUE self, VALUE path)
   {
     Check_Type(path, T_STRING);
     GET_WRAPPER(miw);
 
-    miw->open(path);
+    OpenParams params = { miw, value_to_ansi_string(path), 0 };
+    rb_thread_call_without_gvl(miw_open_without_gvl, (void*) &params, NULL, NULL);
+
+    switch(params.result) {
+    case 1:
+      rb_raise(rb_eStandardError, "already opened a file");
+    case 2:
+      rb_raise(rb_eStandardError, "failed to open");
+    }
 
     if(rb_block_given_p())
       return rb_ensure((RUBYFUNC) rb_yield, Qnil, (RUBYFUNC) miw_close, self);
@@ -60,7 +83,7 @@ extern "C"
     Check_Type(path, T_STRING);
     GET_WRAPPER(miw);
 
-    miw->open(path);
+    miw->open(value_to_ansi_string(path));
     VALUE inform = miw->inform();
     miw->close();
 
@@ -138,17 +161,16 @@ MediaInfoWrapper::~MediaInfoWrapper()
     delete mi;
 }
 
-void MediaInfoWrapper::open(VALUE path)
+int MediaInfoWrapper::open(std::string path)
 {
   if(file_opened)
-    rb_raise(rb_eStandardError, "already opened a file");
-
-  MediaInfoDLL::String mi_path = value_to_ansi_string(path);
+    return 1;
 
-  if(mi->Open(mi_path) != 1)
-    rb_raise(rb_eStandardError, "failed to open");
+  if(mi->Open(path) != 1)
+    return 2;
 
   file_opened = true;
+  return 0;
 }
 
 void MediaInfoWrapper::close()

data/ext/mediainfo_native/mediainfo_wrapper.h

@@ -3,9 +3,10 @@
 
 #include <list>
 #include <ruby.h>
+#include <string>
+#include "MediaInfoDLL.h"
 #include "basestream.h"
 
-namespace MediaInfoDLL { class MediaInfo; }
 
 namespace MediaInfoNative
 {
@@ -16,7 +17,7 @@ public:
   MediaInfoWrapper();
   ~MediaInfoWrapper();
 
-  void  open(VALUE path);
+  int   open(MediaInfoDLL::String path);
   void  close();
   VALUE wrapStreams();
 

data/lib/mediainfo-native/version.rb

@@ -1,3 +1,3 @@
 module MediaInfoNative
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler