bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

moved Quicktime init function from creator.c

Browse Source
This commit is contained in:
Rob Haarsma 2003-09-09 21:26:34 +00:00
parent 5572323a3a
commit 422f4faa1b
3 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/imbuf/IMB_imbuf.h
View File

@ -515,4 +515,14 @@ void IMB_freezbufImBuf(struct ImBuf * ibuf);
*/
void IMB_rectfill(unsigned int *drect, unsigned int *srect, int x, int value);
#ifdef WITH_QUICKTIME
/**
*
* @attention Defined in quicktime_import.c
*/
void init_quicktime(void);
#endif //WITH_QUICKTIME
#endif

23
source/blender/quicktime/apple/quicktime_import.c
View File

@ -36,6 +36,7 @@
#include "IMB_anim.h"
#include "BLO_sys_types.h"
#include "BKE_global.h"
#ifdef __APPLE__
#include <QuickTime/Movies.h>
@ -58,6 +59,28 @@
#define QTIME_DEBUG 0
void init_quicktime(void)
{
#ifdef _WIN32
if (InitializeQTML(0) != noErr)
G.have_quicktime = FALSE;
else
G.have_quicktime = TRUE;
#endif /* _WIN32 */
/* Initialize QuickTime */
#if defined(_WIN32) || defined (__APPLE__)
if (EnterMovies() != noErr)
G.have_quicktime = FALSE;
else
#endif /* _WIN32 || __APPLE__ */
#ifdef __linux__
/* inititalize quicktime codec registry */
lqt_registry_init();
#endif
G.have_quicktime = TRUE;
}
int anim_is_quicktime (char *name)
{
FSSpec theFSSpec;

31
source/creator/creator.c
View File

@ -75,6 +75,8 @@
#include "BDR_drawmesh.h"
#include "IMB_imbuf.h"
#include "RE_renderconverter.h"
#include "playanim_ext.h"
@ -94,16 +96,6 @@
#endif
#endif
#ifdef WITH_QUICKTIME
#ifdef _WIN32
#include <QTML.h>
#include <Movies.h>
#elif defined(__APPLE__)
#undef NDEBUG
#include <QuickTime/Movies.h>
#endif /* __APPLE__ */
#endif /* WITH_QUICKTIME */
// from buildinfo.c
extern char * build_date;
extern char * build_time;
@ -431,24 +423,9 @@ int main(int argc, char **argv)
RE_init_filt_mask();
#ifdef WITH_QUICKTIME
#ifdef _WIN32
if (InitializeQTML(0) != noErr)
G.have_quicktime = FALSE;
else
G.have_quicktime = TRUE;
#endif /* _WIN32 */
/* Initialize QuickTime */
#if defined(_WIN32) || defined (__APPLE__)
if (EnterMovies() != noErr)
G.have_quicktime = FALSE;
else
#endif /* _WIN32 || __APPLE__ */
#ifdef __linux__
/* inititalize quicktime codec registry */
lqt_registry_init();
#endif
G.have_quicktime = TRUE;
init_quicktime();
#endif /* WITH_QUICKTIME */
/* OK we are ready for it */