Kaydet (Commit) bdb3f642 authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Tor Lillqvist

AOO: #i124800# switch avmedia's QuickTime component to QTKit for now

because the QuickTime API is not available to 64bit clients. The switch to QTKit
is temporary only because it has already been deprecated in OSX 10.9. We'll have
to switch to OSX's AVFoundation framework instead soon.

Suggested by: Ariel Constenla-Haile <arielch@apache.org>

Change-Id: I86835b050ae62fe86361852dc4be0f9688c9b14f
üst 70895b69
...@@ -42,15 +42,10 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& ...@@ -42,15 +42,10 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >&
OSErr result; OSErr result;
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
// check the version of QuickTime installed
result = Gestalt(gestaltQuickTime,&mnVersion);
if ((result == noErr) && (mnVersion >= QT701))
{
// we have version 7.01 or later, initialize // we have version 7.01 or later, initialize
mpMovie = [QTMovie movie]; mpMovie = [QTMovie movie];
[mpMovie retain]; [mpMovie retain];
mbInitialized = true; mbInitialized = true;
}
[pool release]; [pool release];
} }
......
...@@ -47,14 +47,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : ...@@ -47,14 +47,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
NSApplicationLoad(); NSApplicationLoad();
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
// check the version of QuickTime installed
long nVersion;
result = Gestalt(gestaltQuickTime,&nVersion);
if ((result == noErr) && (nVersion >= QT701))
{
// we have version 7.01 or later, initialize
mbInitialized = true; mbInitialized = true;
}
[pool release]; [pool release];
} }
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <premac.h> #include <premac.h>
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <QTKit/QTKit.h> #import <QTKit/QTKit.h>
#import <QuickTime/QuickTime.h>
#include <postmac.h> #include <postmac.h>
#endif #endif
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
...@@ -55,14 +54,6 @@ ...@@ -55,14 +54,6 @@
#define AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_QuickTime" #define AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_QuickTime"
#define AVMEDIA_QUICKTIME_WINDOW_SERVICENAME "com.sun.star.media.Window_QuickTime" #define AVMEDIA_QUICKTIME_WINDOW_SERVICENAME "com.sun.star.media.Window_QuickTime"
#define WM_GRAPHNOTIFY (WM_USER + 567)
// Quicktime 7+ in Mac OS X 10.4
#define QT701 0x07010000
// Quicktime 6.4+ in Mac OS X 10.3
#define QT64 0x06400000
#endif // _QUICKTIMECOMMOM_HXX #endif // _QUICKTIMECOMMOM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -102,13 +102,11 @@ End ...@@ -102,13 +102,11 @@ End
#endif #endif
#ifdef MACOSX #ifdef MACOSX
#ifndef X86_64
File gid_File_Lib_avmediaQuickTime File gid_File_Lib_avmediaQuickTime
PACKED_LIB_FILE_BODY; PACKED_LIB_FILE_BODY;
Name = LIBNAME(avmediaQuickTime); Name = LIBNAME(avmediaQuickTime);
End End
#endif #endif
#endif
#if defined(MACOSX) #if defined(MACOSX)
File gid_File_Lib_Basebmp File gid_File_Lib_Basebmp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment