RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-18 13:47:04 +00:00
Code Issues Releases Wiki Activity

Introduce HAVE_QUICKTIME definition and use it where appropriate.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26248 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-03-15 11:31:28 +00:00
parent 6628c4ba3b
commit 9e1ccf7447
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -3583,6 +3583,7 @@ EOF
_def_quartz='#define HAVE_QUARTZ 1'
_vosrc="$_vosrc vo_quartz.c"
_vomodules="quartz $_vomodules"
_def_quicktime='#define HAVE_QUICKTIME 1'
else
_macosx=no
_coreaudio=no
@ -3591,6 +3592,7 @@ EOF
_noaomodules="macosx $_noaomodules"
_def_quartz='#undef HAVE_QUARTZ'
_novomodules="quartz $_novomodules"
_def_quicktime='#undef HAVE_QUICKTIME'
fi
cat > $TMPC <<EOF
#include <Carbon/Carbon.h>
@ -8178,6 +8180,7 @@ $_def_macosx_bundle
$_def_coreaudio
$_def_corevideo
$_def_quartz
$_def_quicktime
/* Build our Win32-loader */
$_def_win32_loader

10
libmpcodecs/ad_qtaudio.c
View File

@ -5,7 +5,7 @@
#include "config.h"
#ifdef MACOSX
#ifdef HAVE_QUICKTIME
#include <QuickTime/QuickTimeComponents.h>
#endif
@ -30,7 +30,7 @@ static ad_info_t info = {
LIBAD_EXTERN(qtaudio)
#if !defined(MACOSX)
#ifndef HAVE_QUICKTIME
typedef struct OpaqueSoundConverter* SoundConverter;
typedef unsigned long OSType;
typedef unsigned long UnsignedFixed;
@ -164,7 +164,7 @@ static int loader_init()
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
return 0;
}
#endif /* #if !defined(MACOSX) */
#endif /* #ifndef HAVE_QUICKTIME */
static SoundConverter myConverter = NULL;
static SoundComponentData InputFormatInfo,OutputFormatInfo;
@ -180,7 +180,7 @@ static int preinit(sh_audio_t *sh){
unsigned long WantedBufferSize=0; //the size you want your buffers to be
#ifdef MACOSX
#ifdef HAVE_QUICKTIME
EnterMovies();
#else
if(loader_init()) return 0; // failed to load DLL
@ -280,7 +280,7 @@ static void uninit(sh_audio_t *sh){
// FreeLibrary( qtime_qts );
// qtime_qts = NULL;
// printf("qt dll loader uninit done\n");
#ifdef MACOSX
#ifdef HAVE_QUICKTIME
ExitMovies();
#endif
}

14
libmpcodecs/vd_qtvideo.c
View File

@ -4,7 +4,7 @@
#include "config.h"
#ifdef MACOSX
#ifdef HAVE_QUICKTIME
#include <QuickTime/ImageCodec.h>
#define dump_ImageDescription(x)
#endif
@ -30,7 +30,7 @@ LIBVD_EXTERN(qtvideo)
#include "bswap.h"
#ifndef MACOSX
#ifndef HAVE_QUICKTIME
#include "loader/qtx/qtxsdk/components.h"
HMODULE WINAPI LoadLibraryA(LPCSTR);
@ -53,7 +53,7 @@ static ImageDescriptionHandle framedescHandle;
static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
static HMODULE handler;
#if !defined(MACOSX)
#ifndef HAVE_QUICKTIME
static Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
static long (*CountComponents)(ComponentDescription* desc);
@ -88,7 +88,7 @@ static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw,
void *baseAddr,
long rowBytes);
static OSErr (*NewHandleClear)(Size byteCount);
#endif /* #if !defined(MACOSX) */
#endif /* #ifndef HAVE_QUICKTIME */
// to set/get/query special features/parameters
static int control(sh_video_t *sh,int cmd,void* arg,...){
@ -107,7 +107,7 @@ static int init(sh_video_t *sh){
ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
codec_initialized = 0;
#ifdef MACOSX
#ifdef HAVE_QUICKTIME
EnterMovies();
#else
@ -154,7 +154,7 @@ static int init(sh_video_t *sh){
mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %li\n",result);
// result=EnterMovies();
// printf("EnterMovies->%d\n",result);
#endif /* MACOSX */
#endif /* HAVE_QUICKTIME */
#if 0
memset(&desc,0,sizeof(desc));
@ -293,7 +293,7 @@ static int init(sh_video_t *sh){
// uninit driver
static void uninit(sh_video_t *sh){
#ifdef MACOSX
#ifdef HAVE_QUICKTIME
ExitMovies();
#endif
}