[MPlayer-cvslog] r27426 - in trunk: Makefile libvo/vo_macosx.m libvo/vo_quartz.c parser-mpcmd.c

[diego]

Author: diego
Date: Thu Aug  7 12:57:40 2008
New Revision: 27426

Log:
Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.


Modified:
   trunk/Makefile
   trunk/libvo/vo_macosx.m
   trunk/libvo/vo_quartz.c
   trunk/parser-mpcmd.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Aug  7 12:57:40 2008
@@ -371,7 +371,7 @@ SRCS_COMMON-$(LIBSMBCLIENT)          += 
 SRCS_COMMON-$(LIBTHEORA)             += libmpcodecs/vd_theora.c
 SRCS_COMMON-$(LIBVORBIS)             += libmpcodecs/ad_libvorbis.c \
                                         libmpdemux/demux_ogg.c
-SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
+SRCS_COMMON-$(MACOSX_FINDER)         += osdep/macosx_finder_args.c
 SRCS_COMMON-$(MP3LIB)                += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c
 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
 SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW)    += mp3lib/dct36_3dnow.c \

Modified: trunk/libvo/vo_macosx.m
==============================================================================
--- trunk/libvo/vo_macosx.m	(original)
+++ trunk/libvo/vo_macosx.m	Thu Aug  7 12:57:40 2008
@@ -326,7 +326,7 @@ static int preinit(const char *arg)
 	
 	if(!shared_buffer)
 	{
-		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
+		#if !defined (MACOSX_FINDER) || !defined (CONFIG_SDL)
 		//this chunk of code is heavily based off SDL_macosx.m from SDL 
 		//it uses an Apple private function to request foreground operation
 		void CPSEnableForegroundOperation(ProcessSerialNumber* psn);

Modified: trunk/libvo/vo_quartz.c
==============================================================================
--- trunk/libvo/vo_quartz.c	(original)
+++ trunk/libvo/vo_quartz.c	Thu Aug  7 12:57:40 2008
@@ -1141,7 +1141,7 @@ static int preinit(const char *arg)
         }
     }
 	
-#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
+#if !defined (MACOSX_FINDER) || !defined (CONFIG_SDL)
 	//this chunk of code is heavily based off SDL_macosx.m from SDL 
 	//it uses an Apple private function to request foreground operation
 {

Modified: trunk/parser-mpcmd.c
==============================================================================
--- trunk/parser-mpcmd.c	(original)
+++ trunk/parser-mpcmd.c	Thu Aug  7 12:57:40 2008
@@ -74,7 +74,7 @@ m_config_parse_mp_command_line(m_config_
   int no_more_opts = 0;
   int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything
   play_tree_t *last_parent, *last_entry = NULL, *root;
-#ifdef MACOSX_FINDER_SUPPORT
+#ifdef MACOSX_FINDER
   extern play_tree_t *macosx_finder_args(m_config_t *, int , char **);
 #endif
 
@@ -86,7 +86,7 @@ m_config_parse_mp_command_line(m_config_
 
   config->mode = M_COMMAND_LINE;
   mode = GLOBAL;
-#ifdef MACOSX_FINDER_SUPPORT
+#ifdef MACOSX_FINDER
   root=macosx_finder_args(config, argc, argv);
   if(root) 
   	return root;