[Libreoffice-commits] core.git: Branch 'aoo/trunk' - avmedia/source scp2/source

[Herbert Dürr]

 avmedia/source/quicktime/framegrabber.cxx    |    5 ---
 avmedia/source/quicktime/makefile.mk         |    2 -
 avmedia/source/quicktime/player.cxx          |   37 ---------------------------
 avmedia/source/quicktime/quicktimecommon.hxx |   13 ---------
 scp2/source/ooo/file_library_ooo.scp         |    2 -
 5 files changed, 2 insertions(+), 57 deletions(-)

New commits:
commit db742b838d3eae07436b27f1619e2b7f2da12f44
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue May 6 11:13:12 2014 +0000

    #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 at apache.org>

diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index 612a515..9073ee3 100644
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/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];
 }
 
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index 808360f..07ae749 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/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
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index e148e4c..f8bd6f1 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/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];
 }
 
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 7e9e0b5..eac6f24 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/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
+
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 4ae6717..2a94bf9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/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