summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS2
-rw-r--r--DOCS/man/cs/mplayer.110
-rw-r--r--DOCS/man/de/mplayer.110
-rw-r--r--DOCS/man/en/mplayer.112
-rw-r--r--DOCS/man/es/mplayer.110
-rw-r--r--DOCS/man/fr/mplayer.112
-rw-r--r--DOCS/man/hu/mplayer.112
-rw-r--r--DOCS/man/it/mplayer.110
-rw-r--r--DOCS/man/pl/mplayer.110
-rw-r--r--DOCS/man/ru/mplayer.112
-rw-r--r--DOCS/man/zh_CN/mplayer.112
-rw-r--r--DOCS/tech/MAINTAINERS2
-rw-r--r--DOCS/xml/cs/ports.xml2
-rw-r--r--DOCS/xml/de/ports.xml2
-rw-r--r--DOCS/xml/en/ports.xml2
-rw-r--r--DOCS/xml/fr/ports.xml2
-rw-r--r--DOCS/xml/hu/ports.xml2
-rw-r--r--DOCS/xml/pl/ports.xml2
-rw-r--r--DOCS/xml/ru/ports.xml2
-rw-r--r--Makefile2
-rwxr-xr-xconfigure4
-rw-r--r--libvo/video_out.c4
-rw-r--r--libvo/vo_corevideo.h (renamed from libvo/vo_macosx.h)2
-rw-r--r--libvo/vo_corevideo.m (renamed from libvo/vo_macosx.m)36
24 files changed, 88 insertions, 88 deletions
diff --git a/AUTHORS b/AUTHORS
index ff606dee4b..ad1883abf8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -637,7 +637,7 @@ Pietrzak, Dariusz (Eyck) <eyck@ghost.anime.pl>
Plourde, Nicolas <nicolas.plourde@gmail.com>
* quartz video output driver for Mac OS X
- * macosx CoreVideo output driver for Mac OS X
+ * CoreVideo video output driver for Mac OS X
* Darwin VCD/SVCD support
Poettering, Lennart <mzzcynlre@0pointer.de>
diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1
index 9b5bbc8467..7e128b85d0 100644
--- a/DOCS/man/cs/mplayer.1
+++ b/DOCS/man/cs/mplayer.1
@@ -316,7 +316,7 @@ Nastavení sytosti barev (saturation).
.PP
.RS
(Následující klávesy jsou činné pouze pokud používáte výstupní video rozhraní
-Quartz nebo macosx.)
+Quartz nebo corevideo.)
.RE
.PP
.PD 0
@@ -3025,14 +3025,14 @@ Navíc pod X11 váš okenní manažer musí rozumět pokynům pro poměr stran o
.B "\-ontop\ "
Umístí okno přehrávače trvale nad ostatní okna.
Podporováno video rozhraními používajícími X11, kromě SDL,
-stejně jako directx, macosx, quartz, ggi a gl2.
+stejně jako directx, corevideo, quartz, ggi a gl2.
.
.TP
.B \-panscan <0.0\-1.0>
Zapne "přibližovací" funkci (pan-and-scan) (oříznutím videa po stranách tak,
aby např.\& film 16:9 pokryl obrazovku 4:3 bez černých okrajů).
Tato funkce pracuje pouze s video rozhraními xv, xmga, mga, gl,
-gl2, quartz, macosx a xvidix.
+gl2, quartz, corevideo a xvidix.
.br
.I POZNÁMKA:
Hodnoty mezi \-1 a 0 jsou také povoleny, ale naprosto experimenální
@@ -3059,7 +3059,7 @@ Zatím podporování pouze \-vo directx v kombinaci s volbou \-vm.
.B \-rootwin (pouze X11)
Přehraje film v kořenovém okně (pozadí desktopu).
Obrázek na ploše však může překrýt zobrazované video.
-Pracuje pouze s video rozhraními x11, xv, xmga, xvidix, quartz, macosx a directx.
+Pracuje pouze s video rozhraními x11, xv, xmga, xvidix, quartz, corevideo a directx.
.
.TP
.B \-saturation <\-100\-100>
@@ -3375,7 +3375,7 @@ Nastaví rozlišení celoobrazovkového režimu (použitelné pro pomalé systé
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 nebo 10.3.9 s QuickTime 7)
+.B corevideo (Mac OS X 10.4 nebo 10.3.9 s QuickTime 7)
Výstupní video rozhraní Mac OS X CoreVideo.
.PD 0
.RSs
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index 9696f6700d..c3ce690606 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -328,7 +328,7 @@ Passe Sttigung an.
.PP
.RS
(Die folgenden Tasten sind nur gltig bei Benutzung der Videoausgabetreiber
-quartz und macosx.)
+quartz und corevideo.)
.RE
.PP
.PD 0
@@ -3322,7 +3322,7 @@ Fenster-Seitenverhltnis verstehen.
.B "\-ontop\ "
Sorgt dafr, dass das Abspielfenster oberhalb von anderen Fenstern bleibt.
Wird untersttzt von Videoausgabetreibern, die X11 benutzen, auer SDL,
-auerdem directx, macosx, quartz, ggi und gl2.
+auerdem directx, corevideo, quartz, ggi und gl2.
.
.TP
.B \-panscan <0.0\-1.0>
@@ -3330,7 +3330,7 @@ Aktiviert Panscan.
Dabei werden z.B.\& bei einem 16:9-Film und einem 4:3-Monitor die Seiten
abgeschnitten, damit der komplette Bildbereich ausgefllt wird.
Der Bereich kontrolliert, wieviel vom Bild abgeschnitten wird.
-Dies funktioniert nur mit den xv-, xmga-, mga-, gl-, gl2, quartz-, macosx- und
+Dies funktioniert nur mit den xv-, xmga-, mga-, gl-, gl2, quartz-, corevideo- und
xvidix-Videoausgabetreibern.
.br
.I ANMERKUNG:
@@ -3356,7 +3356,7 @@ Momentan nur untersttzt von \-vo directx kombiniert mit der Option \-vm.
.B \-rootwin
Spielt den Film im Hauptfenster (dem Desktophintergrund) ab.
Desktophintergrundbilder knnen den Film allerdings verdecken.
-Funktioniert nur mit den x11-, xv-, xmga-, xvidix-, quartz-, macosx- und
+Funktioniert nur mit den x11-, xv-, xmga-, xvidix-, quartz-, corevideo- und
directx-Videoausgabetreibern.
.
.TP
@@ -3714,7 +3714,7 @@ Gib die Auflsung im Vollbildmodus an (ntzlich auf langsamen Systemen).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 oder 10.3.9 mit QuickTime 7)
+.B corevideo (Mac OS X 10.4 oder 10.3.9 mit QuickTime 7)
Mac OS X CoreVideo-Videoausgabetreiber
.PD 0
.RSs
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 68d8ee317e..0906523e28 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -312,7 +312,7 @@ Adjust saturation.
.PD 1
.PP
.RS
-(The following keys are valid only when using the quartz or macosx
+(The following keys are valid only when using the quartz or corevideo
video output driver.)
.RE
.PP
@@ -1041,7 +1041,7 @@ Permit MPlayer to receive pointer events reported by the video
output driver.
Necessary to select the buttons in DVD menus.
Supported for X11 based VOs (x11, xv, xvmc, etc.) and the gl, gl2, direct3d and
-macosx VOs.
+corevideo VOs.
.
.TP
.B \-noar
@@ -3208,14 +3208,14 @@ Furthermore under X11 your window manager has to honor window aspect hints.
.B "\-ontop\ "
Makes the player window stay on top of other windows.
Supported by video output drivers which use X11, except SDL,
-as well as directx, macosx, quartz, ggi and gl2.
+as well as directx, corevideo, quartz, ggi and gl2.
.
.TP
.B \-panscan <0.0\-1.0>
Enables pan-and-scan functionality (cropping the sides of e.g.\& a 16:9
movie to make it fit a 4:3 display without black bands).
The range controls how much of the image is cropped.
-Only works with the xv, xmga, mga, gl, gl2, quartz, macosx and xvidix
+Only works with the xv, xmga, mga, gl, gl2, quartz, corevideo and xvidix
video output drivers.
.br
.I NOTE:
@@ -3241,7 +3241,7 @@ Currently only supported by \-vo directx combined with the \-vm option.
.B \-rootwin
Play movie in the root window (desktop background).
Desktop background images may cover the movie window, though.
-Only works with the x11, xv, xmga, xvidix, quartz, macosx and directx video output drivers.
+Only works with the x11, xv, xmga, xvidix, quartz, corevideo and directx video output drivers.
.
.TP
.B \-saturation <\-100\-100>
@@ -3632,7 +3632,7 @@ Specify the fullscreen resolution (useful on slow systems).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 or 10.3.9 with QuickTime 7)
+.B corevideo (Mac OS X 10.4 or 10.3.9 with QuickTime 7)
Mac OS X CoreVideo video output driver
.PD 0
.RSs
diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1
index 12aec37677..507197df55 100644
--- a/DOCS/man/es/mplayer.1
+++ b/DOCS/man/es/mplayer.1
@@ -313,7 +313,7 @@ Ajusta la saturacin.
.PD 1
.PP
(Las siguientes teclas son vlidas nicamente cuando se usa quartz o el
-controlador de vdeo de macosx)
+controlador de vdeo de corevideo)
.PP
.PD 0
.IPs "command + 0"
@@ -2882,7 +2882,7 @@ de aspecto de ventana.
.TP
.B \-ontop
Hace que la ventana de reproduccin se quede por encima de las otras ventanas.
-Soportado por controladores que usen X11, excepto SDL, as como directx,macosx,
+Soportado por controladores que usen X11, excepto SDL, as como directx,corevideo,
quartz, ggi y gl2.
.
.TP
@@ -2892,7 +2892,7 @@ pelcula a 16:9 para ajustarla a una pantalla 4:3 sin bandas negras).
.br
El rango controla cunto de la imagen ser recortado.
Slo funciona con los controladores de salida de vdeo xv, xmga, mga, gl, gl2,
-quartz, macosx y xvidix.
+quartz, corevideo y xvidix.
.
.TP
.B \-panscanrange <\-19.0\-99.0> (experimental)
@@ -2915,7 +2915,7 @@ Reproduce la pelcula en la ventana raz (fondo de escritorio).
Las imgenes del fondo de escritorio pueden cubrir sin embargo a la ventana
de la pelcula.
Funciona slo con los controladores de salida de vdeo x11, xv, xmga,
-xvidix, quartz, macosx y directx.
+xvidix, quartz, corevideo y directx.
.
.TP
.B \-saturation <\-100\-100>
@@ -3249,7 +3249,7 @@ Especifica la resolucin a pantalla completa (til en sistemas lentos).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 o 10.3.9 con QuickTime 7)
+.B corevideo (Mac OS X 10.4 o 10.3.9 con QuickTime 7)
Controlador de salida de vdeo Mac OS X CoreVideo.
.PD 0
.RSs
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 74c1e9c8eb..a8ba671003 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -328,7 +328,7 @@ Ajuste la saturation.
.PP
.RS
(Les touches suivantes ne sont valides que lorsque le pilote de sortie
-vido quartz ou macosx est utilis.)
+vido quartz ou corevideo est utilis.)
.RE
.PP
.PD 0
@@ -1097,7 +1097,7 @@ Permet MPlayer de recevoir des vnements souris envoys
par le pilote de sortie vido.
Utilis pour slectioner les boutons des menus DVDs.
Gr par par les VOs bass sur X11 (x11, xv, xvmc, etc.) ainsi que les VOs gl,
-gl2, direct3d et macosx.
+gl2, direct3d et corevideo.
.
.TP
.B \-noar
@@ -3386,7 +3386,7 @@ hauteur/\:largeur de fentres.
.B "\-ontop\ "
Rend la fentre de lecture toujours visible.
Permise par les pilotes de sortie vido qui utilisent X11, except SDL,
-aussi bien que directx, macosx, quartz, ggi et gl2.
+aussi bien que directx, corevideo, quartz, ggi et gl2.
.
.TP
.B \-panscan <0.0\-1.0>
@@ -3394,7 +3394,7 @@ Active la fonctionnalit "pan-and-scan" (par ex.\& couper les cts d'un
film 16/\:9e pour qu'il tienne sans bords noirs sur un cran 4/\:3)
L'intervalle dfinit quel point l'image sera coupe.
Cette option ne fonctionne qu'avec les pilotes de sortie vido xv, xmga, mga,
-gl, gl2, quartz, macosx et xvidix.
+gl, gl2, quartz, corevideo et xvidix.
.br
.I NOTE\ :
Des valeurs compris entre \-1 et 0 sont aussi permises, mais trs exprimentale,
@@ -3421,7 +3421,7 @@ N'est gr actuellement que par \-vo directx combine avec l'option \-vm.
Joue le film dans la fentre root (le fond du bureau).
Les images en fond d'cran peuvent nanmoins cacher le film.
Cette option ne fonctionne qu'avec les pilotes de sortie vido x11, xv, xmga,
-xvidix, quartz, macosx et directx.
+xvidix, quartz, corevideo et directx.
.
.TP
.B \-saturation <\-100\-100>
@@ -3821,7 +3821,7 @@ Choisir la rsolution du mode plein-cran (utile sur les systmes plus lents).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 ou 10.3.9 avec QuickTime 7)
+.B corevideo (Mac OS X 10.4 ou 10.3.9 avec QuickTime 7)
pilote de sortie vido CoreVideo pour Mac OS X
.PD 0
.RSs
diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1
index 361822da37..b186c586f3 100644
--- a/DOCS/man/hu/mplayer.1
+++ b/DOCS/man/hu/mplayer.1
@@ -314,7 +314,7 @@ Szaturci belltsa.
.PD 1
.PP
.RS
-(A kvetkez billentyk csak quartz vagy macosx vide kimeneten mkdnek.)
+(A kvetkez billentyk csak quartz vagy corevideo vide kimeneten mkdnek.)
.RE
.PP
.PD 0
@@ -1041,7 +1041,7 @@ Engedlyezi az MPlayernek a pozcionl eszkz esemnyeinek fogadst,
melyeket a vide kimeneti eszkz kld.
Szksges a dvd menkben a gombok kivlasztshoz.
Az X11 alap VO-kban (x11, xv, xvmc, stb.), a gl, a gl2, a direct3d s a
-macosx VO-kban tmogatott.
+corevideo VO-kban tmogatott.
.
.TP
.B \-noar
@@ -3220,14 +3220,14 @@ Tovbb X11 alatt az ablakkezeldnek is tmogatnia kell.
.B "\-ontop\ "
A lejtszsi ablak folyamatosan a tbbi ablak eltt lesz lthat.
Azok a vide kimeneti vezrlk tmogatjk, amelyek X11-et hasznlnak,
-kivve az SDL-t, valamint a directx, macosx, quartz, ggi s gl2.
+kivve az SDL-t, valamint a directx, corevideo, quartz, ggi s gl2.
.
.TP
.B \-panscan <0.0\-1.0>
Pan & Scan funkci bekapcsolsa (pl.\& egy 16:9 arny film szleinek a
levgsa, hogy elfrjen egy 4:3 arny kpernyn fekete svok nlkl)
A tartomny vezrli, hogy a kpbl mennyi kerl levgsra.
-Ez a funkci csak az xv, xmga, mga, gl, gl2, quartz, macosx s xvidix vide
+Ez a funkci csak az xv, xmga, mga, gl, gl2, quartz, corevideo s xvidix vide
kimeneti meghajtkkal mkdik.
.br
.I MEGJEGYZS:
@@ -3253,7 +3253,7 @@ Jelenleg csak a \-vo directx tmogatja a \-vm opcival egytt.
.B \-rootwin
A film root ablakban (asztal htterben) trtn lejtszsa.
Az asztalon lv httrkp kitakarhatja a filmet.
-Csak az x11, xv, xmga, xvidix, quartz, macosx s directx vide meghajtk
+Csak az x11, xv, xmga, xvidix, quartz, corevideo s directx vide meghajtk
tmogatjk.
.
.TP
@@ -3649,7 +3649,7 @@ A teljes kperny felbontsa (hasznos lass rendszereknl).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 vagy 10.3.9 QuickTime 7-tel)
+.B corevideo (Mac OS X 10.4 vagy 10.3.9 QuickTime 7-tel)
Mac OS X CoreVideo kimeneti vide vezrl
.PD 0
.RSs
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index c66c75ece9..eba3255ce3 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -330,7 +330,7 @@ Regola la saturazione.
.PP
.RS
(I seguenti tasti sono validi solo quando si utilizza il driver di uscita
-video quartz oppure macosx.)
+video quartz oppure corevideo.)
.RE
.PP
.PD 0
@@ -3296,7 +3296,7 @@ dell'aspetto finestra.
Rende la finestra di visualizzazione del filmato in modalit 'stay on top',
stai in cima, alle altre finestre.
Supportato dai driver di uscita video che usano X11, SDL esclusa, cos come
-da directx, macosx, quartz, ggi e gl2.
+da directx, corevideo, quartz, ggi e gl2.
.
.TP
.B \-panscan <0.0\-1.0>
@@ -3305,7 +3305,7 @@ filmato in formato 16:9 per adattarlo ad uno schermo 4:3 senza avere bande
nere)
Il parametro controlla quanto dell'immagine viene tagliato.
Questa opzione funziona solo con i driver di uscita video xv, xmga, mga,
-gl, gl2, quartz, macosx e xvidix.
+gl, gl2, quartz, corevideo e xvidix.
.br
.I NOTA:
Sono permessi anche valori compresi tra \-1 e 0, ma sono altamente sperimentali
@@ -3331,7 +3331,7 @@ l'opzione \-vm.
.B \-rootwin
Visualizza il filmato nella finestra root (lo sfondo del desktop).
L'immagine di sfondo del desktop pu per coprire la finestra del filmato.
-Funziona solo con i driver di uscita video x11, xv, xmga, xvidix, quartz, macosx e directx.
+Funziona solo con i driver di uscita video x11, xv, xmga, xvidix, quartz, corevideo e directx.
.
.TP
.B \-saturation <\-100\-100>
@@ -3681,7 +3681,7 @@ Specifica la risoluzione a schermo intero (utile su sistemi lenti).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 oppure 10.3.9 con QuickTime 7)
+.B corevideo (Mac OS X 10.4 oppure 10.3.9 con QuickTime 7)
Driver di uscita video Mac OS X CoreVideo.
.PD 0
.RSs
diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1
index e905822d82..e1d2cf19c9 100644
--- a/DOCS/man/pl/mplayer.1
+++ b/DOCS/man/pl/mplayer.1
@@ -334,7 +334,7 @@ Modyfikuje nasycenie.
.PD 1
.PP
(Nastpujce klawisze dziaaj tylko ze sterownikiem wyjcia video quartz lub
-macosx.)
+corevideo.)
.PP
.PD 0
.RSs
@@ -2293,14 +2293,14 @@ Dodatkowo, pod X11 Twj manager okien musi rozumie zalecenia proporcji okna.
.B "\-ontop\ "
Sprawia, e okno zostaje nad innymi oknami.
Obsugiwane przez sterowniki wyjcia video uywajce X11, poza SDL
-oraz directx, macosx, quartz, ggi i gl2.
+oraz directx, corevideo, quartz, ggi i gl2.
.
.TP
.B \-panscan <0.0\-1.0>
Wcza tryb panoramiczny (obcina boki filmu np.\& 16:9 tak, by pasowa na
ekran 4:3 bez czarnych paskw).
Zasig kontroluje jak dua cz obrazu bdzie przycita.
-Dziaa tylko ze sterownikami wyjcia video xv, xmga, mga, gl, quartz, macosx i xvidix.
+Dziaa tylko ze sterownikami wyjcia video xv, xmga, mga, gl, quartz, corevideo i xvidix.
.
.TP
.B \-refreshrate <Hz>
@@ -2311,7 +2311,7 @@ Obecnie opcja ta jest obsugiwana tylko przez \-vo directx razem z \-vm.
.B \-rootwin
Odtwarza film w gwnym oknie (to pulpitu).
Jednak obrazki ta na pulpicie mog przesania okno filmu.
-Dziaa tylko ze sterownikami wyjcia video x11, xv, xmga, xvidix, quartz, macosx i directx.
+Dziaa tylko ze sterownikami wyjcia video x11, xv, xmga, xvidix, quartz, corevideo i directx.
.
.TP
.B \-saturation <\-100\-100>
@@ -2621,7 +2621,7 @@ Podaje rozdzielczo penoekranow (przydatne na wolnych systemach).
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 lub 10.3.9 z QuickTime 7)
+.B corevideo (Mac OS X 10.4 lub 10.3.9 z QuickTime 7)
sterownik wyjcia video Mac OS X CoreVideo
.PD 0
.RSs
diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1
index d719820930..9103d173c3 100644
--- a/DOCS/man/ru/mplayer.1
+++ b/DOCS/man/ru/mplayer.1
@@ -313,7 +313,7 @@ Stop playing (and quit if \-idle is not used).
.PD 1
.PP
.RS
-( quartz macosx).
+( quartz corevideo).
.RE
.PP
.PD 0
@@ -1000,7 +1000,7 @@ FIFO n (n\-1) .
.
DVD .
VO, X11 (x11, xv, xvmc, etc.)
- gl, gl2, direct3d macosx.
+ gl, gl2, direct3d corevideo.
.
.TP
.B \-noar
@@ -3175,7 +3175,7 @@ monitoraspect (, ).
.B "\-ontop\ "
.
, X11,
- SDL, directx, macosx,
+ SDL, directx, corevideo,
quartz, ggi gl2.
.
.TP
@@ -3183,7 +3183,7 @@ quartz, ggi gl2.
pan\-and\-scan (
, , 16:9, 4:3
). .
- xv, xmga, mga, gl, gl2, quartz, macosx xvidix .
+ xv, xmga, mga, gl, gl2, quartz, corevideo xvidix .
.br
.I NOTE:
\-1 0 ,
@@ -3209,7 +3209,7 @@ quartz, ggi gl2.
.B \-rootwin
( ).
, .
- x11, xv, xmga, xvidix, quartz, macosx directx .
+ x11, xv, xmga, xvidix, quartz, corevideo directx .
.
.TP
.B \-saturation <\-100\-100>
@@ -3625,7 +3625,7 @@ Windows VIDIX.
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 10.3.9 QuickTime 7)
+.B corevideo (Mac OS X 10.4 10.3.9 QuickTime 7)
Mac OS X CoreVideo.
.PD 0
.RSs
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index 6d6b31f66b..2a04dea749 100644
--- a/DOCS/man/zh_CN/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
@@ -314,7 +314,7 @@ MPlayer 有个完全可配置的, 命令驱动的控制层,
.PD 1
.PP
.RS
-(以下的按键仅适用于 quartz or macosx 视频输出驱动。)
+(以下的按键仅适用于 quartz or corevideo 视频输出驱动。)
.RE
.PP
.PD 0
@@ -989,7 +989,7 @@ n 大小的 FIFO 能容纳 (n\-1) 缓冲事件。
.B \-mouse\-movements
允许 MPlayer 接收来自视频输出驱动的指针事件。
必须选择 DVD 菜单中的按钮。
-支持基于 X11 的视频输出（x11、xv、xvmc等）以及 gl、gl2、direct3d 和 macosx 的视频输出
+支持基于 X11 的视频输出（x11、xv、xvmc等）以及 gl、gl2、direct3d 和 corevideo 的视频输出
.
.TP
.B \-noar
@@ -3007,14 +3007,14 @@ gl、gl2、directx、fbdev 和 tdfxfb 视频输出驱动支持。
.TP
.B "\-ontop\ "
使得此播放器窗口位于其他窗口之上。
-视频输出驱动使用 X11 的, 除了 SDL, 还有使用 directx, macosx, quartz,
+视频输出驱动使用 X11 的, 除了 SDL, 还有使用 directx, corevideo, quartz,
ggi 和 gl2 的都支持此功能。
.
.TP
.B \-panscan <0.0\-1.0>
启用 pan-and-scan 功能 (裁减如 16:9 电影的边适应 4:3 显示不带黑边)。
范围参数值用来控制裁减多少图像。
-只能与 xv, xmga, mga, gl, gl2, quartz, macosx 和 xvidix 的
+只能与 xv, xmga, mga, gl, gl2, quartz, corevideo 和 xvidix 的
视频输出驱动一起工作。
.br
.I 注意：
@@ -3038,7 +3038,7 @@ ggi 和 gl2 的都支持此功能。
.B \-rootwin
在根窗口(桌面背景)中播放电影。
虽然桌面背景图像可能盖住电影窗口。
-只能与 x11, xv, xmga, xvidix, quartz, macosx 和 directx 的
+只能与 x11, xv, xmga, xvidix, quartz, corevideo 和 directx 的
视频输出驱动一起工作。
.
.TP
@@ -3397,7 +3397,7 @@ Mac OS X Quartz 视频输出驱动。
.PD 1
.
.TP
-.B macosx (Mac OS X 10.4 或 10.3.9 的 QuickTime 7)
+.B corevideo (Mac OS X 10.4 或 10.3.9 的 QuickTime 7)
Mac OS X CoreVideo 视频输出驱动
.PD 0
.RSs
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 198d2711ea..2933001a46 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -156,6 +156,7 @@ libvo drivers:
* vo_aa.c - Alban Bedel
* vo_caca.c - Howell Tam (Pigeon)
* vo_bl.c - Rik Snel
+ * vo_corevideo.m - None
* vo_cvidix.c - Sascha Sommer
* vo_dga.c - None
* vo_dfbmga.c - Ville Syrjälä
@@ -172,7 +173,6 @@ libvo drivers:
* vo_gl2.c - Reimar Döffinger
* vo_ivtv.c - Benjamin Zores
* vo_jpeg.c - Ivo van Poorten
- * vo_macosx.m - None
* vo_md5sum.c - Ivo van Poorten
* vo_mga.c - Attila Kinali
* vo_mpegpes.c - None
diff --git a/DOCS/xml/cs/ports.xml b/DOCS/xml/cs/ports.xml
index 5e628d3fdd..c6de31b8e2 100644
--- a/DOCS/xml/cs/ports.xml
+++ b/DOCS/xml/cs/ports.xml
@@ -740,7 +740,7 @@ GCC 3.x a vyšších.
Základní prostředí pro kompilaci můžete získat instalací
<ulink url="http://developer.apple.com/tools/download/">Xcode</ulink>
od Apple. Máte-li Mac OS X 10.3.9 nebo pozdější a QuickTime 7
-můžete použít výstupní video rozhraní <option>macosx</option>.
+můžete použít výstupní video rozhraní <option>corevideo</option>.
</para>
<para>
diff --git a/DOCS/xml/de/ports.xml b/DOCS/xml/de/ports.xml
index c9638a8f02..6e6c85a56d 100644
--- a/DOCS/xml/de/ports.xml
+++ b/DOCS/xml/de/ports.xml
@@ -718,7 +718,7 @@ Segmentation fault</screen>
<ulink url="http://developer.apple.com/tools/download/">Xcode</ulink>
von Apple installierst.
Besitzt du Mac OS X 10.3.9 oder später und QuickTime 7
- kannst du den Videoausgabetreiber <option>macosx</option> verwenden.
+ kannst du den Videoausgabetreiber <option>corevideo</option> verwenden.
</para>
<para>
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index abf5c17f72..f90cec3332 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -694,7 +694,7 @@ GCC 3.x or later.
You can get the basic compilation environment by installing Apple's
<ulink url="http://developer.apple.com/tools/download/">Xcode</ulink>.
If you have Mac OS X 10.3.9 or later and QuickTime 7
-you can use the <option>macosx</option> video output driver.
+you can use the <option>corevideo</option> video output driver.
</para>
<para>
diff --git a/DOCS/xml/fr/ports.xml b/DOCS/xml/fr/ports.xml
index 8d5cb8b9e2..7b628368dd 100644
--- a/DOCS/xml/fr/ports.xml
+++ b/DOCS/xml/fr/ports.xml
@@ -740,7 +740,7 @@ Le compilateur préféré étant la version Apple de GCC 3.x ou supérieure.
Vous pouvez obtenir l'environement de compilation de base en
installant <ulink url="http://developer.apple.com/tools/download/">Xcode</ulink> de Apple.
Si vous avez Mac OS X 10.3.9 ou supérieur et QuickTime 7
-vous pouvez utiliser le pilote macosx de sortie vidéo.
+vous pouvez utiliser le pilote corevideo de sortie vidéo.
</para>
<para>
Malheureusement, cet environement de base ne vous autorise pas à
diff --git a/DOCS/xml/hu/ports.xml b/DOCS/xml/hu/ports.xml
index 2a52ae9f71..f000f67194 100644
--- a/DOCS/xml/hu/ports.xml
+++ b/DOCS/xml/hu/ports.xml
@@ -694,7 +694,7 @@ Az alap fordítási környezetet az Apple
<ulink url="http://developer.apple.com/tools/download/">Xcode</ulink>
telepítésével kapod meg.
Ha Mac OS X 10.3.9 vagy régebbi verziód és QuickTime 7-esed van,
-használhatod a <option>macosx</option> videó kimeneti vezérlőt is.
+használhatod a <option>corevideo</option> videó kimeneti vezérlőt is.
</para>
<para>
diff --git a/DOCS/xml/pl/ports.xml b/DOCS/xml/pl/ports.xml
index 1495a0394d..9de674c9ea 100644
--- a/DOCS/xml/pl/ports.xml
+++ b/DOCS/xml/pl/ports.xml
@@ -693,7 +693,7 @@ wyższym. Zalecanym kompilatorem jest GCC 3.x w wersji Apple.
Możesz otrzymać podstawowe środowisko do kompilacji, instalując
<ulink url="http://developer.apple.com/tools/download/">Xcode</ulink> od Apple.
Jeżeli masz Mac OS X 10.3.9 lub późniejszy i QuickTime 7, możesz
-skorzystać ze sterownika wyjścia video <option>macosx</option>.
+skorzystać ze sterownika wyjścia video <option>corevideo</option>.
</para>
<para>
diff --git a/DOCS/xml/ru/ports.xml b/DOCS/xml/ru/ports.xml
index 266b3a155d..ce0b6f527d 100644
--- a/DOCS/xml/ru/ports.xml
+++ b/DOCS/xml/ru/ports.xml
@@ -726,7 +726,7 @@ mplayer dvd://<replaceable>&lt;title&gt;</replaceable> -dvd-device <replaceable>
для компиляции, установив Apple'овский
<ulink url="http://developer.apple.com/tools/download/">Xcode</ulink>.
Если у вас Mac OS X 10.3.9 или выше и QuickTime 7, можете использовать
-драйвер видео вывода <option>macosx</option>.
+драйвер видео вывода <option>corevideo</option>.
</para>
<para>
diff --git a/Makefile b/Makefile
index c56aa88e86..7bd546fec1 100644
--- a/Makefile
+++ b/Makefile
@@ -532,7 +532,7 @@ SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c
SRCS_MPLAYER-$(BL) += libvo/vo_bl.c
SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
-SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_macosx.m
+SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m
SRCS_MPLAYER-$(DART) += libao2/ao_dart.c
SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c
SRCS_MPLAYER-$(DGA) += libvo/vo_dga.c
diff --git a/configure b/configure
index 488783e81b..3e2f1526f6 100755
--- a/configure
+++ b/configure
@@ -3863,11 +3863,11 @@ EOF
cc_check -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL && _corevideo=yes
fi
if test "$_corevideo" = yes ; then
- _vomodules="macosx $_vomodules"
+ _vomodules="corevideo $_vomodules"
extra_ldflags="$extra_ldflags -framework Carbon -framework Cocoa -framework QuartzCore -framework OpenGL"
def_corevideo='#define CONFIG_COREVIDEO 1'
else
- _novomodules="macosx $_novomodules"
+ _novomodules="corevideo $_novomodules"
def_corevideo='#undef CONFIG_COREVIDEO'
fi
echores "$_corevideo"
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 81f938b301..b7c0ed1f0a 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -128,7 +128,7 @@ extern vo_functions_t video_out_cvidix;
extern vo_functions_t video_out_tdfx_vid;
extern vo_functions_t video_out_xvr100;
extern vo_functions_t video_out_tga;
-extern vo_functions_t video_out_macosx;
+extern vo_functions_t video_out_corevideo;
extern vo_functions_t video_out_quartz;
extern vo_functions_t video_out_pnm;
extern vo_functions_t video_out_md5sum;
@@ -151,7 +151,7 @@ const vo_functions_t* const video_out_drivers[] =
&video_out_kva,
#endif
#ifdef CONFIG_COREVIDEO
- &video_out_macosx,
+ &video_out_corevideo,
#endif
#ifdef CONFIG_QUARTZ
&video_out_quartz,
diff --git a/libvo/vo_macosx.h b/libvo/vo_corevideo.h
index 1384d24040..44c2ad8a89 100644
--- a/libvo/vo_macosx.h
+++ b/libvo/vo_corevideo.h
@@ -1,5 +1,5 @@
/*
- * MPlayer Mac OS X video output driver
+ * CoreVideo video output driver
*
* Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com>
*
diff --git a/libvo/vo_macosx.m b/libvo/vo_corevideo.m
index 9f0fcc4bd1..71046fdb68 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_corevideo.m
@@ -1,5 +1,5 @@
/*
- * Mac OS X video output driver
+ * CoreVideo video output driver
* Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com>
*
* This file is part of MPlayer.
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#import "vo_macosx.h"
+#import "vo_corevideo.h"
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/mman.h>
@@ -96,12 +96,12 @@ static BOOL isLeopardOrLater;
static vo_info_t info =
{
"Mac OS X Core Video",
- "macosx",
+ "corevideo",
"Nicolas Plourde <nicolas.plourde@gmail.com>",
""
};
-LIBVO_EXTERN(macosx)
+LIBVO_EXTERN(corevideo)
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride)
{
@@ -127,7 +127,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
}
else
{
- mp_msg(MSGT_VO, MSGL_INFO, "[vo_macosx] Device ID %d does not exist, falling back to main device\n", screen_id);
+ mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id);
screen_handle = [screen_array objectAtIndex:0];
screen_id = -1;
}
@@ -178,7 +178,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
}
else
{
- mp_msg(MSGT_VO, MSGL_INFO, "[vo_macosx] writing output to a shared buffer "
+ mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] writing output to a shared buffer "
"named \"%s\"\n",buffer_name);
movie_aspect = (float)d_width/(float)d_height;
@@ -188,7 +188,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
if (shm_fd == -1)
{
mp_msg(MSGT_VO, MSGL_FATAL,
- "[vo_macosx] failed to open shared memory. Error: %s\n", strerror(errno));
+ "[vo_corevideo] failed to open shared memory. Erro