From ff68236badb676c39b8e672d426c0b36caddc230 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 30 Sep 2010 09:40:48 +0000 Subject: [PATCH] From Stephan Huber, fixed build under OSX 10.5. --- src/osgPlugins/QTKit/ReaderWriterQTKit.mm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/QTKit/ReaderWriterQTKit.mm b/src/osgPlugins/QTKit/ReaderWriterQTKit.mm index 82206214e..00410de8c 100644 --- a/src/osgPlugins/QTKit/ReaderWriterQTKit.mm +++ b/src/osgPlugins/QTKit/ReaderWriterQTKit.mm @@ -189,7 +189,11 @@ class QTKitImageStream : public osg::ImageStream [[NSNotificationCenter defaultCenter] addObserver:movieNotificationHandler selector:@selector(movieNaturalSizeDidChange:) +#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) name:QTMovieNaturalSizeDidChangeNotification +#else + name:QTMovieSizeDidChangeNotification +#endif object:qtMovie]; [[NSNotificationCenter defaultCenter] addObserver:movieNotificationHandler @@ -427,9 +431,12 @@ class QTKitImageStream : public osg::ImageStream // NSLog(@"CVPixelBuffer w=%d, h=%d", buffer_width, buffer_height); // buffer_width = 480; // buffer_height = 320; - + +#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) CVPixelBufferLockBaseAddress( swapFrame[currentSwapFrameIndex], kCVPixelBufferLock_ReadOnly ); - +#else + CVPixelBufferLockBaseAddress( swapFrame[currentSwapFrameIndex], 0 ); +#endif void* raw_pixel_data = CVPixelBufferGetBaseAddress(swapFrame[currentSwapFrameIndex]); setImage(buffer_width,buffer_height,1, @@ -573,8 +580,16 @@ class QTKitImageStream : public osg::ImageStream { [[NSNotificationCenter defaultCenter] removeObserver:movieNotificationHandler name:QTMovieLoadStateDidChangeNotification object:qtMovie]; + [[NSNotificationCenter defaultCenter] removeObserver:movieNotificationHandler - name:QTMovieNaturalSizeDidChangeNotification object:qtMovie]; +#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) + name:QTMovieNaturalSizeDidChangeNotification +#else + name:QTMovieSizeDidChangeNotification +#endif + + object:qtMovie]; + [[NSNotificationCenter defaultCenter] removeObserver:movieNotificationHandler name:QTMovieDidEndNotification object:qtMovie];