mirror of
https://github.com/mpv-player/mpv
synced 2025-01-18 13:14:36 +00:00
vo_quartz: remove this video output
This video output is not useful anymore. It is based on Carbon to draw the mplayer window and this has been deprecated by Apple in 10.5. The upcoming 10.8 OSX release should deprecate most of Carbon, so it doesn't make sense to keep vo_quartz in the codebase when there are modern and better alternatives (vo_gl and vo_corevideo).
This commit is contained in:
parent
24e08eb5f2
commit
d0f0bf7fd2
1
Makefile
1
Makefile
@ -469,7 +469,6 @@ SRCS_MPLAYER-$(OPENAL) += libao2/ao_openal.c
|
||||
SRCS_MPLAYER-$(OSS) += libao2/ao_oss.c
|
||||
SRCS_MPLAYER-$(PNM) += libvo/vo_pnm.c
|
||||
SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c
|
||||
SRCS_MPLAYER-$(QUARTZ) += libvo/vo_quartz.c libvo/osx_common.c
|
||||
SRCS_MPLAYER-$(RSOUND) += libao2/ao_rsound.c
|
||||
SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c
|
||||
SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c libvo/sdl_common.c
|
||||
|
22
configure
vendored
22
configure
vendored
@ -437,7 +437,6 @@ Video output:
|
||||
--disable-yuv4mpeg disable yuv4mpeg video output [enable]
|
||||
--disable-corevideo disable CoreVideo video output [autodetect]
|
||||
--disable-cocoa disable Cocoa OpenGL backend [autodetect]
|
||||
--disable-quartz disable Quartz video output [autodetect]
|
||||
|
||||
Audio output:
|
||||
--disable-alsa disable ALSA audio output [autodetect]
|
||||
@ -699,7 +698,6 @@ _qtx=auto
|
||||
_coreaudio=auto
|
||||
_corevideo=auto
|
||||
_cocoa=auto
|
||||
_quartz=auto
|
||||
quicktime=auto
|
||||
_macosx_finder=no
|
||||
_macosx_bundle=auto
|
||||
@ -1135,8 +1133,6 @@ for ac_option do
|
||||
--disable-corevideo) _corevideo=no ;;
|
||||
--enable-cocoa) _cocoa=yes ;;
|
||||
--disable-cocoa) _cocoa=no ;;
|
||||
--enable-quartz) _quartz=yes ;;
|
||||
--disable-quartz) _quartz=no ;;
|
||||
--enable-macosx-finder) _macosx_finder=yes ;;
|
||||
--disable-macosx-finder) _macosx_finder=no ;;
|
||||
--enable-macosx-bundle) _macosx_bundle=yes ;;
|
||||
@ -4213,25 +4209,9 @@ if test "$quicktime" = yes ; then
|
||||
def_quicktime='#define CONFIG_QUICKTIME 1'
|
||||
else
|
||||
def_quicktime='#undef CONFIG_QUICKTIME'
|
||||
_quartz=no
|
||||
fi
|
||||
echores $quicktime
|
||||
|
||||
echocheck "Quartz"
|
||||
if test "$_quartz" = auto ; then
|
||||
_quartz=no
|
||||
statement_check Carbon/Carbon.h 'CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false)' -framework Carbon && _quartz=yes
|
||||
fi
|
||||
if test "$_quartz" = yes ; then
|
||||
libs_mplayer="$libs_mplayer -framework Carbon"
|
||||
def_quartz='#define CONFIG_QUARTZ 1'
|
||||
vomodules="quartz $vomodules"
|
||||
else
|
||||
def_quartz='#undef CONFIG_QUARTZ'
|
||||
novomodules="quartz $novomodules"
|
||||
fi
|
||||
echores $_quartz
|
||||
|
||||
echocheck "CoreVideo"
|
||||
if test "$_corevideo" = auto ; then
|
||||
cat > $TMPC <<EOF
|
||||
@ -6543,7 +6523,6 @@ PVR = $_pvr
|
||||
QTX_CODECS = $_qtx
|
||||
QTX_CODECS_WIN32 = $_qtx_codecs_win32
|
||||
QTX_EMULATION = $_qtx_emulation
|
||||
QUARTZ = $_quartz
|
||||
RADIO=$_radio
|
||||
RADIO_CAPTURE=$_radio_capture
|
||||
REAL_CODECS = $_real
|
||||
@ -6908,7 +6887,6 @@ $def_mga
|
||||
$def_mng
|
||||
$def_png
|
||||
$def_pnm
|
||||
$def_quartz
|
||||
$def_s3fb
|
||||
$def_sdl
|
||||
$def_sdl_sdl_h
|
||||
|
@ -117,7 +117,6 @@ extern struct vo_driver video_out_tdfx_vid;
|
||||
extern struct vo_driver video_out_xvr100;
|
||||
extern struct vo_driver video_out_tga;
|
||||
extern struct vo_driver video_out_corevideo;
|
||||
extern struct vo_driver video_out_quartz;
|
||||
extern struct vo_driver video_out_pnm;
|
||||
extern struct vo_driver video_out_md5sum;
|
||||
|
||||
@ -141,9 +140,6 @@ const struct vo_driver *video_out_drivers[] =
|
||||
#ifdef CONFIG_COREVIDEO
|
||||
&video_out_corevideo,
|
||||
#endif
|
||||
#ifdef CONFIG_QUARTZ
|
||||
&video_out_quartz,
|
||||
#endif
|
||||
#ifdef CONFIG_XMGA
|
||||
&video_out_xmga,
|
||||
#endif
|
||||
|
1371
libvo/vo_quartz.c
1371
libvo/vo_quartz.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user