#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>

avmedia/source/quicktime/framegrabber.cxx

@@ -46,15 +46,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];
 }
 

avmedia/source/quicktime/makefile.mk

@@ -26,7 +26,7 @@ PRJNAME=avmedia
 TARGET=avmediaQuickTime
 
 # the QuickTime API has been deprecated since OSX 10.5 and has been removed in the OSX SDK 10.7
-.IF ("$(GUIBASE)" != "aqua") || ("${MACOSX_DEPLOYMENT_TARGET:s/.//}" >= "106")
+.IF "$(GUIBASE)" != "aqua"
 dummy:
     @echo " Nothing to build for GUIBASE=$(GUIBASE) and OSX$(MACOSX_DEPLOYMENT_TARGET)"
 .ELSE

avmedia/source/quicktime/player.cxx

@@ -27,37 +27,6 @@
 #include "framegrabber.hxx"
 #include "window.hxx"
 
-// dbg_dump for development
-#if OSL_DEBUG_LEVEL > 1
-#include <rtl/strbuf.hxx>
-#include <rtl/ustring.hxx>
-
-const sal_Char *dbg_dump(const rtl::OString &rStr)
-{
-    static rtl::OStringBuffer aStr;
-
-    aStr = rtl::OStringBuffer(rStr);
-    aStr.append(static_cast<char>(0));
-    return aStr.getStr();
-}
-
-const sal_Char *dbg_dump(const rtl::OUString &rStr)
-{
-    return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
-}
-
-const sal_Char *dbg_dump(rtl_String *pStr)
-{
-    return dbg_dump(rtl::OString(pStr));
-}
-
-const sal_Char *dbg_dump(rtl_uString *pStr)
-{
-    return dbg_dump(rtl::OUString(pStr));
-}
-
-#endif
-
 using namespace ::com::sun::star;
 
 namespace avmedia { namespace quicktime {
@@ -88,13 +57,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
 
     NSApplicationLoad();
     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
       mbInitialized = true;
-    }
     [pool release];
 }
 

avmedia/source/quicktime/quicktimecommon.hxx

@@ -28,13 +28,10 @@
 #include <premac.h>
 #import <Cocoa/Cocoa.h>
 #import <QTKit/QTKit.h>
-#import <QuickTime/QuickTime.h>
 #include <postmac.h>
 #endif
 #include <osl/mutex.hxx>
-#ifndef __RTL_USTRING_
 #include <rtl/ustring.hxx>
-#endif
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
@@ -65,13 +62,5 @@
 #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
+

scp2/source/ooo/file_library_ooo.scp

@@ -609,14 +609,12 @@ File gid_File_Lib_MacOSXSpell
 	Dir = SCP2_OOO_BIN_DIR;
 End
 
-#if (MACOSX_DEPLOYMENT_TARGET_NUM < 106)
 File gid_File_Lib_avmediaQuickTime
 	TXT_FILE_BODY;
 	Styles = (PACKED);
 	Name = LIBNAME(avmediaQuickTime);
 	Dir = SCP2_OOO_BIN_DIR;
 End
-#endif // MACOSX_DEPLOYMENT_TARGET_NUM
 #endif // MACOSX
 
 #ifdef OS2