Skip to content

V
vlc
Commit a6e21c2b authored by Florian G. Pflug's avatar Florian G. Pflug
Browse files
Options

*) Changed configure.in to check for all header files the macosx plugin needs 

*) There is now an option --disable-macosx, instead of --enable-macosx.
   --disable-macosx is default for all plattforms except MACOSX
*) The mouse cursor is hidden when playing in fullscreen mode
*) The screensaver is deactivated when playing in fullscreen mode
   (Thanks to Julian Mayer <julianmayer>@mac.com)
*) Stop, Prev and Next buttons work now.
parent 9a724840
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 100 deletions
configure
View file @ a6e21c2b
...@@ -58,7 +58,7 @@ ac_help="$ac_help ...@@ -58,7 +58,7 @@ ac_help="$ac_help
ac_help="$ac_help ac_help="$ac_help
--enable-arts aRts sound server (default disabled)" --enable-arts aRts sound server (default disabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-macosx MacOS X support (default enabled on MacOS X)" --disable-macosx disable MacOS X support (default everywhere except on Mac OSX)"
ac_help="$ac_help ac_help="$ac_help
--disable-qnx QNX RTOS support (default enabled on QNX RTOS)" --disable-qnx QNX RTOS support (default enabled on QNX RTOS)"
ac_help="$ac_help ac_help="$ac_help
...@@ -5082,28 +5082,27 @@ fi ...@@ -5082,28 +5082,27 @@ fi
# Check whether --enable-macosx or --disable-macosx was given. # Check whether --enable-macosx or --disable-macosx was given.
if test "${enable_macosx+set}" = set; then if test "${enable_macosx+set}" = set; then
enableval="$enable_macosx" enableval="$enable_macosx"
if test x$enable_macosx = xyes :
then fi
BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" if test x$enable_macosx != xno
LIB="${LIB} -ObjC" then
fi osx_failed=0
else for ac_hdr in Cocoa/Cocoa.h ApplicationServices/ApplicationServices.h CoreServices/CoreServices.h QuickTime/QuickTime.h
for ac_hdr in Cocoa/Cocoa.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5097: checking for $ac_hdr" >&5 echo "configure:5096: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5102 "configure" #line 5101 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5123,17 +5122,21 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -5123,17 +5122,21 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1 #define $ac_tr_hdr 1
EOF EOF
BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
LIB="${LIB} -ObjC"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
osx_failed=1
fi fi
done done
fi if test x$osx_failed != x1
then
BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreServices -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
LIB="${LIB} -ObjC"
fi
fi
# Check whether --enable-qnx or --disable-qnx was given. # Check whether --enable-qnx or --disable-qnx was given.
if test "${enable_qnx+set}" = set; then if test "${enable_qnx+set}" = set; then
...@@ -5147,17 +5150,17 @@ fi ...@@ -5147,17 +5150,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5151: checking for $ac_hdr" >&5 echo "configure:5154: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5156 "configure" #line 5159 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5234,17 +5237,17 @@ if test x$enable_x11 != xno && ...@@ -5234,17 +5237,17 @@ if test x$enable_x11 != xno &&
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5238: checking for $ac_hdr" >&5 echo "configure:5241: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5243 "configure" #line 5246 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5297,17 +5300,17 @@ if test x$enable_xvideo != xno && ...@@ -5297,17 +5300,17 @@ if test x$enable_xvideo != xno &&
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5301: checking for $ac_hdr" >&5 echo "configure:5304: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5306 "configure" #line 5309 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5331,7 +5334,7 @@ EOF ...@@ -5331,7 +5334,7 @@ EOF
saved_CFLAGS=$CFLAGS saved_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6 echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
echo "configure:5335: checking for XvSetPortAttribute in -lXv_pic" >&5 echo "configure:5338: checking for XvSetPortAttribute in -lXv_pic" >&5
ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'` ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -5339,7 +5342,7 @@ else ...@@ -5339,7 +5342,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lXv_pic $LIBS" LIBS="-lXv_pic $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5343 "configure" #line 5346 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -5350,7 +5353,7 @@ int main() { ...@@ -5350,7 +5353,7 @@ int main() {
XvSetPortAttribute() XvSetPortAttribute()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:5357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -5406,7 +5409,7 @@ fi ...@@ -5406,7 +5409,7 @@ fi
# Extract the first word of "sdl12-config", so it can be a program name with args. # Extract the first word of "sdl12-config", so it can be a program name with args.
set dummy sdl12-config; ac_word=$2 set dummy sdl12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5410: checking for $ac_word" >&5 echo "configure:5413: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -5446,7 +5449,7 @@ fi ...@@ -5446,7 +5449,7 @@ fi
# Extract the first word of "sdl11-config", so it can be a program name with args. # Extract the first word of "sdl11-config", so it can be a program name with args.
set dummy sdl11-config; ac_word=$2 set dummy sdl11-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5450: checking for $ac_word" >&5 echo "configure:5453: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -5487,7 +5490,7 @@ fi ...@@ -5487,7 +5490,7 @@ fi
# Extract the first word of "sdl-config", so it can be a program name with args. # Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2 set dummy sdl-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5491: checking for $ac_word" >&5 echo "configure:5494: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -5544,17 +5547,17 @@ fi ...@@ -5544,17 +5547,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5548: checking for $ac_hdr" >&5 echo "configure:5551: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5553 "configure" #line 5556 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5624,17 +5627,17 @@ fi ...@@ -5624,17 +5627,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5628: checking for $ac_hdr" >&5 echo "configure:5631: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5633 "configure" #line 5636 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5663,7 +5666,7 @@ done ...@@ -5663,7 +5666,7 @@ done
else else
echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
echo "configure:5667: checking for directX headers in ${withval}" >&5 echo "configure:5670: checking for directX headers in ${withval}" >&5
if test -f ${withval}/include/directx.h if test -f ${withval}/include/directx.h
then then
PLUGINS="${PLUGINS} directx" PLUGINS="${PLUGINS} directx"
...@@ -5746,7 +5749,7 @@ if test "${enable_gnome+set}" = set; then ...@@ -5746,7 +5749,7 @@ if test "${enable_gnome+set}" = set; then
# Extract the first word of "gnome-config", so it can be a program name with args. # Extract the first word of "gnome-config", so it can be a program name with args.
set dummy gnome-config; ac_word=$2 set dummy gnome-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5750: checking for $ac_word" >&5 echo "configure:5753: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -5791,17 +5794,17 @@ fi ...@@ -5791,17 +5794,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5795: checking for $ac_hdr" >&5 echo "configure:5798: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5800 "configure" #line 5803 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5861,7 +5864,7 @@ fi ...@@ -5861,7 +5864,7 @@ fi
# Extract the first word of "gtk-config", so it can be a program name with args. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5865: checking for $ac_word" >&5 echo "configure:5868: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -5907,17 +5910,17 @@ fi ...@@ -5907,17 +5910,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:5911: checking for $ac_hdr" >&5 echo "configure:5914: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5916 "configure" #line 5919 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5961,17 +5964,17 @@ if test "${enable_alsa+set}" = set; then ...@@ -5961,17 +5964,17 @@ if test "${enable_alsa+set}" = set; then
then then
ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
echo "configure:5965: checking for alsa/asoundlib.h" >&5 echo "configure:5968: checking for alsa/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 5970 "configure" #line 5973 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:5978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -5988,7 +5991,7 @@ fi ...@@ -5988,7 +5991,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
echo "configure:5992: checking for main in -lasound" >&5 echo "configure:5995: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -5996,14 +5999,14 @@ else ...@@ -5996,14 +5999,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS" LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6000 "configure" #line 6003 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
......
configure.in
View file @ a6e21c2b
...@@ -854,18 +854,20 @@ dnl ...@@ -854,18 +854,20 @@ dnl
dnl MacOS X module dnl MacOS X module
dnl dnl
AC_ARG_ENABLE(macosx, AC_ARG_ENABLE(macosx,
[ --enable-macosx MacOS X support (default enabled on MacOS X)], [ --disable-macosx disable MacOS X support (default everywhere except on Mac OSX)])
[if test x$enable_macosx = xyes if test x$enable_macosx != xno
then then
BUILTINS="${BUILTINS} macosx" osx_failed=0
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" AC_CHECK_HEADERS(Cocoa/Cocoa.h ApplicationServices/ApplicationServices.h CoreServices/CoreServices.h QuickTime/QuickTime.h,, [
LIB="${LIB} -ObjC" osx_failed=1
fi], ])
[AC_CHECK_HEADERS(Cocoa/Cocoa.h, if test x$osx_failed != x1
BUILTINS="${BUILTINS} macosx" then
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" BUILTINS="${BUILTINS} macosx"
LIB="${LIB} -ObjC" LIB_MACOSX="-framework CoreServices -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime"
)]) LIB="${LIB} -ObjC"
fi
fi
dnl dnl
dnl QNX RTOS module dnl QNX RTOS module
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ a6e21c2b
...@@ -4,31 +4,34 @@ ...@@ -4,31 +4,34 @@
{ {
ACTIONS = { ACTIONS = {
fullscreen_toggle = id; fullscreen_toggle = id;
nextPlaylist = id;
openFile = id; openFile = id;
pause = id; pause = id;
play = id; play = id;
prevPlaylist = id;
speedslider_update = id; speedslider_update = id;
stop = id;
timeslider_update = id; timeslider_update = id;
}; };
CLASS = Intf_Controller; CLASS = Intf_Controller;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = { OUTLETS = {
o_currenttime = id; o_currenttime = NSTextField;
o_menu_fullscreen = id; o_menu_fullscreen = NSMenuItem;
o_pause = id; o_pause = NSButton;
o_play = id; o_play = NSButton;
o_playlistds = id; o_playlistds = Intf_PlaylistDS;
o_stepf = id; o_stepf = NSButton;
o_stepr = id; o_stepr = NSButton;
o_stop = id; o_stop = NSButton;
o_timeslider = id; o_timeslider = NSSlider;
}; };
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
}, },
{ {
CLASS = Intf_PlaylistDS; CLASS = Intf_PlaylistDS;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = {o_table = id; }; OUTLETS = {o_table = NSTableView; };
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
}, },
{CLASS = VlcQuickDrawView; LANGUAGE = ObjC; SUPERCLASS = NSQuickDrawView; } {CLASS = VlcQuickDrawView; LANGUAGE = ObjC; SUPERCLASS = NSQuickDrawView; }
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ a6e21c2b
...@@ -4,13 +4,19 @@ ...@@ -4,13 +4,19 @@
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>87 157 428 240 0 0 1280 938 </string> <string>87 157 428 240 0 0 1280 938 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>87 402 257 44 0 0 1280 938 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>219.0</string> <string>248.0</string>
<key>IBMainMenuLocation</key> <key>IBOpenObjects</key>
<string>288 493 104 66 0 0 1280 938 </string> <array>
<integer>21</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5L14</string> <string>5P48</string>
<key>IBUserGuides</key>
<dict/>
</dict> </dict>
</plist> </plist>
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ a6e21c2b
...@@ -132,10 +132,12 @@ ...@@ -132,10 +132,12 @@
refType = 4; refType = 4;
}; };
F51212320170635601A80A1F = { F51212320170635601A80A1F = {
indentWidth = 4;
isa = PBXFileReference; isa = PBXFileReference;
name = vout_macosx.c; name = vout_macosx.c;
path = plugins/macosx/vout_macosx.c; path = plugins/macosx/vout_macosx.c;
refType = 4; refType = 4;
usesTabs = 0;
}; };
F51352740170655D01A80A1F = { F51352740170655D01A80A1F = {
isa = PBXFileReference; isa = PBXFileReference;
...@@ -217,7 +219,7 @@ ...@@ -217,7 +219,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>vlc</string> <string>vlc</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>VideoLan Client</string> <string>VideoLan Client 0.2.92</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>vlc.icns</string> <string>vlc.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
...@@ -229,9 +231,9 @@ ...@@ -229,9 +231,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>vlc 0.2.90</string> <string>vlc 0.2.92</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.2.90</string> <string>0.2.92</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>MainMenu</string> <string>MainMenu</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
......
plugins/macosx/intf_controller.c
View file @ a6e21c2b
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <QuickTime/QuickTime.h> #include <QuickTime/QuickTime.h>
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <CoreServices/CoreServices.h>
#import "intf_controller.h" #import "intf_controller.h"
#import "intf_vlc_wrapper.h" #import "intf_vlc_wrapper.h"
...@@ -53,6 +54,8 @@ ...@@ -53,6 +54,8 @@
[o_currenttime setStringValue: [o_vlc getTimeAsString]] ; [o_currenttime setStringValue: [o_vlc getTimeAsString]] ;
[o_timeslider setFloatValue: [o_vlc getTimeAsFloat]] ; [o_timeslider setFloatValue: [o_vlc getTimeAsFloat]] ;
if ([o_vlc playlistPlaying])
UpdateSystemActivity(UsrActivity) ;
} }
- (void)applicationDidBecomeActive:(NSNotification*)aNotification { - (void)applicationDidBecomeActive:(NSNotification*)aNotification {
...@@ -96,6 +99,18 @@ ...@@ -96,6 +99,18 @@
[o_vlc playlistPlayCurrent] ; [o_vlc playlistPlayCurrent] ;
} }
- (IBAction) stop:(id)sender {
[o_vlc playlistStop] ;
}
- (IBAction) prevPlaylist:(id)sender {
[o_vlc playlistPlayPrev] ;
}
- (IBAction) nextPlaylist:(id)sender {
[o_vlc playlistPlayNext] ;
}
- (IBAction) timeslider_update:(id)slider { - (IBAction) timeslider_update:(id)slider {
[o_vlc setTimeAsFloat: [o_timeslider floatValue]] ; [o_vlc setTimeAsFloat: [o_timeslider floatValue]] ;
} }
...@@ -128,6 +143,8 @@ ...@@ -128,6 +143,8 @@
defer:NO screen:[NSScreen mainScreen] defer:NO screen:[NSScreen mainScreen]
] ; ] ;
[o_window setLevel:CGShieldingWindowLevel()] ; [o_window setLevel:CGShieldingWindowLevel()] ;
CGDisplayHideCursor(kCGDirectMainDisplay) ;
[o_menu_fullscreen setState:NSOffState] ;
b_window_is_fullscreen = TRUE ; b_window_is_fullscreen = TRUE ;
} }
else { else {
...@@ -154,7 +171,6 @@ ...@@ -154,7 +171,6 @@
[o_window setContentView:o_qdview] ; [o_window setContentView:o_qdview] ;
[o_window orderFront:self] ; [o_window orderFront:self] ;
[o_vlc setQDPort:[o_qdview qdPort]] ; [o_vlc setQDPort:[o_qdview qdPort]] ;
[o_menu_fullscreen setState:(b_window_is_fullscreen ? NSOnState : NSOffState)] ;
} }
- (void) releaseQDPort { - (void) releaseQDPort {
...@@ -168,6 +184,11 @@ ...@@ -168,6 +184,11 @@
[o_window close] ; [o_window close] ;
o_window = nil ; o_window = nil ;
} }
if (b_window_is_fullscreen)
{
[o_menu_fullscreen setState:NSOnState] ;
CGDisplayShowCursor(kCGDirectMainDisplay) ;
}
} }
- (void) resizeQDPortFullscreen:(bool)b_fullscreen { - (void) resizeQDPortFullscreen:(bool)b_fullscreen {
......
plugins/macosx/intf_controller.h
View file @ a6e21c2b
...@@ -68,6 +68,9 @@ ...@@ -68,6 +68,9 @@
- (IBAction) openFile:(id)sender ; - (IBAction) openFile:(id)sender ;
- (IBAction) pause:(id)sender ; - (IBAction) pause:(id)sender ;
- (IBAction) play:(id)sender ; - (IBAction) play:(id)sender ;
- (IBAction) stop:(id)sender ;
- (IBAction) prevPlaylist:(id)sender ;
- (IBAction) nextPlaylist:(id)sender ;
- (IBAction) timeslider_update:(id)slider ; - (IBAction) timeslider_update:(id)slider ;
- (IBAction) speedslider_update:(id)slider ; - (IBAction) speedslider_update:(id)slider ;
- (IBAction) fullscreen_toggle:(id)sender ; - (IBAction) fullscreen_toggle:(id)sender ;
......
plugins/macosx/intf_vlc_wrapper.c
View file @ a6e21c2b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_vlc_wrapper.c : MacOS X plugin for vlc * intf_vlc_wrapper.c : MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: intf_vlc_wrapper.c,v 1.5 2001/12/07 18:33:07 sam Exp $ * $Id: intf_vlc_wrapper.c,v 1.5.2.1 2002/01/24 21:54:37 fgp Exp $
* *
* Authors: Florian G. Pflug <fgp@phlo.org> * Authors: Florian G. Pflug <fgp@phlo.org>
* *
...@@ -276,7 +276,9 @@ ...@@ -276,7 +276,9 @@
vlc_mutex_unlock(&p_main->p_playlist->change_lock) ; vlc_mutex_unlock(&p_main->p_playlist->change_lock) ;
} }
- (bool) playlistPlaying {
return p_main->p_playlist->b_stopped ;
}
// Private Functions. This are just some utilities for other functions // Private Functions. This are just some utilities for other functions
......
plugins/macosx/intf_vlc_wrapper.h
View file @ a6e21c2b
...@@ -68,5 +68,6 @@ typedef enum intf_speed_e {SPEED_SLOW=0, SPEED_NORMAL, SPEED_FAST} intf_speed_t ...@@ -68,5 +68,6 @@ typedef enum intf_speed_e {SPEED_SLOW=0, SPEED_NORMAL, SPEED_FAST} intf_speed_t
- (void) playlistPlayItem:(int)i_item ; - (void) playlistPlayItem:(int)i_item ;
- (void) playlistAdd:(NSString*)o_filename ; - (void) playlistAdd:(NSString*)o_filename ;
- (void) clearPlaylist ; - (void) clearPlaylist ;
- (bool) playlistPlaying ;
@end @end
plugins/macosx/vout_macosx.c
View file @ a6e21c2b
...@@ -150,7 +150,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -150,7 +150,6 @@ static int vout_Init( vout_thread_t *p_vout )
{ {
p_vout->b_need_render = 0 ; p_vout->b_need_render = 0 ;
p_vout->i_bytes_per_line = p_vout->i_width ; p_vout->i_bytes_per_line = p_vout->i_width ;
p_vout->p_sys->c_codec = 'NONE' ;
p_vout->p_sys->osx_communication.i_changes |= OSX_VOUT_INTF_REQUEST_QDPORT ; p_vout->p_sys->osx_communication.i_changes |= OSX_VOUT_INTF_REQUEST_QDPORT ;
return 0 ; return 0 ;
...@@ -292,18 +291,16 @@ static void fillout_ImageDescription(ImageDescriptionHandle h_descr, unsigned in ...@@ -292,18 +291,16 @@ static void fillout_ImageDescription(ImageDescriptionHandle h_descr, unsigned in
static void fillout_ScalingMatrix( vout_thread_t *p_vout) static void fillout_ScalingMatrix( vout_thread_t *p_vout)
{ {
Rect s_rect ; Rect s_rect ;
Fixed factor_x ; Fixed factor_x ;
Fixed factor_y ; Fixed factor_y ;
GetPortBounds( p_vout->p_sys->osx_communication.p_qdport, &s_rect ) ; GetPortBounds( p_vout->p_sys->osx_communication.p_qdport, &s_rect ) ;
// if (((s_rect.right - s_rect.left) / ((float) p_vout->i_width)) < ((s_rect.bottom - s_rect.top) / ((float) p_vout->i_height))) factor_x = FixDiv(Long2Fix(s_rect.right - s_rect.left), Long2Fix(p_vout->i_width)) ;
factor_x = FixDiv(Long2Fix(s_rect.right - s_rect.left), Long2Fix(p_vout->i_width)) ; factor_y = FixDiv(Long2Fix(s_rect.bottom - s_rect.top), Long2Fix(p_vout->i_height)) ;
// else
factor_y = FixDiv(Long2Fix(s_rect.bottom - s_rect.top), Long2Fix(p_vout->i_height)) ;
SetIdentityMatrix(p_vout->p_sys->p_matrix) ; SetIdentityMatrix(p_vout->p_sys->p_matrix) ;
ScaleMatrix( p_vout->p_sys->p_matrix, factor_x, factor_y, Long2Fix(0), Long2Fix(0) ) ; ScaleMatrix( p_vout->p_sys->p_matrix, factor_x, factor_y, Long2Fix(0), Long2Fix(0) ) ;
} }
static OSErr new_QTSequence( ImageSequence *i_seq, CGrafPtr p_qdport, ImageDescriptionHandle h_descr, MatrixRecordPtr p_matrix ) static OSErr new_QTSequence( ImageSequence *i_seq, CGrafPtr p_qdport, ImageDescriptionHandle h_descr, MatrixRecordPtr p_matrix )
...@@ -349,6 +346,12 @@ static int create_QTSequenceBestCodec( vout_thread_t *p_vout ) ...@@ -349,6 +346,12 @@ static int create_QTSequenceBestCodec( vout_thread_t *p_vout )
) ) ) )
{ {
p_vout->p_sys->c_codec = 'y420' ; p_vout->p_sys->c_codec = 'y420' ;
intf_WarnMsg( 1, "vout_macosx: Created QTSequence with codec '%c%c%c%c'",
p_vout->p_sys->c_codec >> 24,
p_vout->p_sys->c_codec >> 16,
p_vout->p_sys->c_codec >> 8,
p_vout->p_sys->c_codec
) ;
return 0 ; return 0 ;
} }
...@@ -360,7 +363,14 @@ static void dispose_QTSequence( vout_thread_t *p_vout ) ...@@ -360,7 +363,14 @@ static void dispose_QTSequence( vout_thread_t *p_vout )
{ {
if (p_vout->p_sys->c_codec == 'NONE') if (p_vout->p_sys->c_codec == 'NONE')
return ; return ;
intf_WarnMsg( 1, "vout_macosx: About to delete QTSequence using codec: '%c%c%c%c'",
p_vout->p_sys->c_codec >> 24,
p_vout->p_sys->c_codec >> 16,
p_vout->p_sys->c_codec >> 8,
p_vout->p_sys->c_codec
) ;
CDSequenceEnd( p_vout->p_sys->i_seq ) ; CDSequenceEnd( p_vout->p_sys->i_seq ) ;
switch (p_vout->p_sys->c_codec) switch (p_vout->p_sys->c_codec)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment