mediainfo-native 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e07d1c47c08b8c03b5dcc9ed8f0bbccab0dd78f1
-  data.tar.gz: 808c573cb2551e45722218a7c098e8861333293a
+  metadata.gz: b002345aa6d665ca92c66ba77ff0cb9996aaf890
+  data.tar.gz: 4975486613761c4e9307be99ac0c5fafcc81979a
 SHA512:
-  metadata.gz: 4fbb4b6856edc400e8311819c5797663a89c08b3d6211015153b9a80d0b1c0d0a047eb7e7cff05c8e66944fcc2d8717d5e775d950fe1cec89356e6278e0e6e2c
-  data.tar.gz: c85706f602da7650333c6731098bbca440ec16bbbbca9f73014d8183f5fce8ceffe9c5ccdd4974414d92666ded9e18b0395389290d63c5bf23073583a4d6f7b2
+  metadata.gz: 8e41c585c7e13b06b18c5fd0f897978dc2bebb37b62c8eddb5f65af125385e66771f3a13249474c44f69d827e8613c595ab78218c0db4d3f449f903d6f074722
+  data.tar.gz: 816e6c76af927997abf9070b473654cad2a277ba9b95ce6b192bc21f8d5d8a901b746cf55c882fad415484546413a8a250b49313f07135661b6a83dcb9232aa7

data/ext/mediainfo_native/basestream.cpp

@@ -48,27 +48,10 @@ void Init_BaseStream(VALUE mMediaInfoNative)
 /* ************************** BaseStream ************************************ */
 
 BaseStream::BaseStream(StreamType _type, unsigned int _idx, MediaInfoWrapper* _wrapper)
-: valid(true), type(_type), idx(_idx), wrapper(_wrapper)
+: type(_type), idx(_idx), wrapper(_wrapper)
 {
 }
 
-BaseStream::~BaseStream()
-{
-  if(wrapper)
-    wrapper->notifyOfStreamDestruction(this);
-}
-
-void BaseStream::notifyOfWrapperDestruction()
-{
-  invalidate();
-  wrapper = NULL;
-}
-
-void BaseStream::invalidate()
-{
-  valid = false;
-}
-
 VALUE BaseStream::wrap()
 {
   return Data_Wrap_Struct(stream_klasses[type], 0, bs_free, this);
@@ -76,9 +59,6 @@ VALUE BaseStream::wrap()
 
 VALUE BaseStream::lookup(VALUE key) const
 {
-  if(!valid)
-    rb_raise(rb_eStandardError, "stream is invalid");
-
   return wrapper->get(type, idx, key);
 }
 

data/ext/mediainfo_native/basestream.h

@@ -24,15 +24,11 @@ class BaseStream
 {
 public:
   BaseStream(StreamType _type, unsigned int _idx, MediaInfoWrapper* _wrapper);
-  ~BaseStream();
-  void notifyOfWrapperDestruction();
-  void invalidate();
 
   VALUE wrap();
   VALUE lookup(VALUE key) const;
 
 private:
-  bool valid;
   const StreamType type;
   const unsigned int idx;
   MediaInfoWrapper* wrapper;

data/ext/mediainfo_native/extconf.rb

@@ -8,10 +8,6 @@ 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,8 +127,6 @@ MediaInfoWrapper::MediaInfoWrapper()
   mi = new MediaInfoDLL::MediaInfo();
   mi->Option("Inform", "XML");
   mi->Option("Complete", "1");
-
-  pthread_mutex_init(&streams_mutex, NULL);
 }
 
 MediaInfoWrapper::~MediaInfoWrapper()
@@ -136,14 +134,6 @@ 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;
 }
@@ -165,11 +155,6 @@ void MediaInfoWrapper::close()
 {
   CHECK_OPEN;
   
-  std::list<BaseStream*>::iterator it;
-  for(it = streams.begin(); it != streams.end(); ++it)
-    (*it)->invalidate();
-  streams.clear();
-
   mi->Close();
   file_opened = false;
 }
@@ -207,13 +192,4 @@ VALUE MediaInfoWrapper::option() const
   return ansi_string_to_value(mi->Option("Info_Parameters"));
 }
 
-void MediaInfoWrapper::notifyOfStreamDestruction(BaseStream* 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,7 +2,6 @@
 #define MEDIAINFO_NATIVE_MEDIAINFO_WRAPPER_H
 
 #include <list>
-#include <pthread.h>
 #include <ruby.h>
 #include "basestream.h"
 
@@ -25,14 +24,10 @@ public:
   VALUE option() const;
   VALUE get(StreamType type, unsigned int idx, VALUE key) const;
 
-  void notifyOfStreamDestruction(BaseStream* stream);
 
 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - FlavourSys Technology GmbH