diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-05-06 11:13:12 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-05-15 18:49:13 +0300 |
| commit | bdb3f642973b7c7b9ce8bdae1344e4ab520f942a (patch) | |
| tree | b15c34087f602f76a9d67b55c5643253f15719d4 | |
| parent | 70895b691eb6bc0ab8d22d9b992b243562660bab (diff) | |
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
| -rw-r--r-- | avmedia/source/quicktime/framegrabber.mm | 5 | ||||
| -rw-r--r-- | avmedia/source/quicktime/player.mm | 7 | ||||
| -rw-r--r-- | avmedia/source/quicktime/quicktimecommon.hxx | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
4 files changed, 0 insertions, 23 deletions
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 52511c9e40ce..9e563fb280a7 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -42,15 +42,10 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& OSErr result; 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 mpMovie = [QTMovie movie]; [mpMovie retain]; mbInitialized = true; - } [pool release]; } diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index 57faad476e34..c668fd770e90 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -47,14 +47,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : NSApplicationLoad(); 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; - } [pool release]; } diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx index 397a716ef2c6..8c1711d65908 100644 --- a/avmedia/source/quicktime/quicktimecommon.hxx +++ b/avmedia/source/quicktime/quicktimecommon.hxx @@ -24,7 +24,6 @@ #include <premac.h> #import <Cocoa/Cocoa.h> #import <QTKit/QTKit.h> -#import <QuickTime/QuickTime.h> #include <postmac.h> #endif #include <osl/mutex.hxx> @@ -55,14 +54,6 @@ #define AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.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 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index cc45c1279738..33f6d7ce6049 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -102,13 +102,11 @@ End #endif #ifdef MACOSX -#ifndef X86_64 File gid_File_Lib_avmediaQuickTime PACKED_LIB_FILE_BODY; Name = LIBNAME(avmediaQuickTime); End #endif -#endif #if defined(MACOSX) File gid_File_Lib_Basebmp |