mediainfo-native 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79de9ef5c9367cd0fd16b1e60e42d739534f97b
-  data.tar.gz: 848f36f9242f311081ab4b595610da1304a65fbd
+  metadata.gz: e07d1c47c08b8c03b5dcc9ed8f0bbccab0dd78f1
+  data.tar.gz: 808c573cb2551e45722218a7c098e8861333293a
 SHA512:
-  metadata.gz: f62ef289e404c36b16c21e20b8d1106fa969844916c849ed1c59b0305e71648d72f2d9f3e165b069a4aaa911dd7e4197cc4d5464f586de9b6be10d7ceebeca5b
-  data.tar.gz: 4b1a14530d4d8141e7aadc9b2855e9651da436ad4f14ada48d0fa7a8ffcda1ca10bbdf7bc52c0f7978a959acd4ddac112d557130346867efee04d1e2e9a4fbb1
+  metadata.gz: 4fbb4b6856edc400e8311819c5797663a89c08b3d6211015153b9a80d0b1c0d0a047eb7e7cff05c8e66944fcc2d8717d5e775d950fe1cec89356e6278e0e6e2c
+  data.tar.gz: c85706f602da7650333c6731098bbca440ec16bbbbca9f73014d8183f5fce8ceffe9c5ccdd4974414d92666ded9e18b0395389290d63c5bf23073583a4d6f7b2

data/ext/mediainfo_native/extconf.rb

@@ -8,6 +8,10 @@ unless have_library('mediainfo')
   abort 'Failed to test-link against libmediainfo.'
 end
 
+unless have_library('pthread')
+  abort 'Failed to test-link against pthread.'
+end
+
 non_std_location = mediainfo_cfg.detect { |flag| flag =~ /^-L/ }
 if non_std_location
   non_std_location.gsub!('-L', '')

data/ext/mediainfo_native/mediainfo_wrapper.cpp

@@ -127,6 +127,8 @@ MediaInfoWrapper::MediaInfoWrapper()
   mi = new MediaInfoDLL::MediaInfo();
   mi->Option("Inform", "XML");
   mi->Option("Complete", "1");
+
+  pthread_mutex_init(&streams_mutex, NULL);
 }
 
 MediaInfoWrapper::~MediaInfoWrapper()
@@ -134,10 +136,13 @@ MediaInfoWrapper::~MediaInfoWrapper()
   if(file_opened)
     close();
 
+  pthread_mutex_lock(&streams_mutex);
   std::list<BaseStream*>::iterator it;
   for(it = streams.begin(); it != streams.end(); ++it)
     (*it)->notifyOfWrapperDestruction();
   streams.clear();
+  pthread_mutex_unlock(&streams_mutex);
+  pthread_mutex_destroy(&streams_mutex);
 
   if(mi != NULL)
     delete mi;
@@ -204,7 +209,11 @@ VALUE MediaInfoWrapper::option() const
 
 void MediaInfoWrapper::notifyOfStreamDestruction(BaseStream* stream)
 {
-  streams.remove(stream);
+  // Might become EINVAL after destruction.
+  if(pthread_mutex_lock(&streams_mutex) == 0) {
+    streams.remove(stream);
+    pthread_mutex_unlock(&streams_mutex);
+  }
 }
 
 } /* namespace MediaInfoNative */

data/ext/mediainfo_native/mediainfo_wrapper.h

@@ -2,6 +2,7 @@
 #define MEDIAINFO_NATIVE_MEDIAINFO_WRAPPER_H
 
 #include <list>
+#include <pthread.h>
 #include <ruby.h>
 #include "basestream.h"
 
@@ -29,7 +30,9 @@ public:
 private:
   bool                     file_opened;
   MediaInfoDLL::MediaInfo* mi;
+
   std::list<BaseStream*>   streams;
+  pthread_mutex_t          streams_mutex;
 };
 
 void Init_MediaInfoWrapper(VALUE mMediaInfoNative);

data/lib/mediainfo-native/attr_readers.rb

@@ -59,7 +59,6 @@ module MediaInfoNative
         when /\A\d+\.\d+\z/ =~ v
           v.to_f.round
         else
-          puts "TimeFragment: #{v}"
           raise "unexpected time fragment! please report bug!"
         end
       end

data/lib/mediainfo-native/version.rb

@@ -1,3 +1,3 @@
 module MediaInfoNative
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler