hornetseye-kinect 0.2.3 → 0.2.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-kinect'
-PKG_VERSION = '0.2.3'
+PKG_VERSION = '0.2.4'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -27,8 +27,8 @@ EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-kinect/}
 
 OBJ = CC_FILES.ext 'o'
-$CXXFLAGS = "-DNDEBUG #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
-# $CXXFLAGS = "-g #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
+# $CXXFLAGS = "-DNDEBUG #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
+$CXXFLAGS = "-g #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
 if CFG[ 'rubyhdrdir' ]
   $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " + 
               "-I#{CFG[ 'rubyhdrdir' ]}/#{CFG[ 'arch' ]}"

data/ext/kinectcontext.cc

@@ -26,15 +26,13 @@ using namespace std;
 VALUE KinectContext::cRubyClass = Qnil;
 
 KinectContext::KinectContext(void) throw (Error):
-  m_usb(NULL), m_context(NULL), m_instances(0)
+  m_usb(NULL), m_context(NULL), m_instances(0), m_threadInitialised(false)
 {
   pthread_mutex_init( &m_mutex, NULL );
   pthread_cond_init( &m_cond, NULL );
   ERRORMACRO( libusb_init( &m_usb ) == 0, Error, , "Error creating libusb session" );
   freenect_init( &m_context, m_usb );
   ERRORMACRO( m_context != NULL, Error, , "Initialisation of libfreenect failed" );
-  pthread_create( &m_thread, NULL, staticThreadFunc, this );
-  pthread_cond_wait( &m_cond, &m_mutex );
 }
 
 KinectContext::~KinectContext(void)
@@ -46,7 +44,9 @@ void KinectContext::addInstance(void)
 {
   m_instances++;
   if ( m_instances == 1 ) {
+    if ( m_threadInitialised ) pthread_detach( m_thread );
     pthread_create( &m_thread, NULL, staticThreadFunc, this );
+    m_threadInitialised = true;
   };
 }
 
@@ -61,7 +61,10 @@ void KinectContext::removeInstance(void)
 void KinectContext::close(void)
 {
   if ( m_context != NULL ) {
-    pthread_join( m_thread, NULL );
+    if ( m_threadInitialised ) {
+      pthread_join( m_thread, NULL );
+      m_threadInitialised = false;
+    };
     pthread_mutex_destroy( &m_mutex );
     pthread_cond_destroy( &m_cond );
     freenect_shutdown( m_context );

data/ext/kinectcontext.hh

@@ -45,6 +45,7 @@ protected:
   libusb_context *m_usb;
   freenect_context *m_context;
   pthread_t m_thread;
+  bool m_threadInitialised;
   pthread_mutex_t m_mutex;
   pthread_cond_t m_cond;
   int m_instances;

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +00:00
+date: 2011-05-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency