Merge svn changes up to r27399

Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c

1 files changed, 33 insertions, 33 deletions

diff --git a/mplayer.c b/mplayer.c
index 5f2ca013e7..77fdbcc514 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -78,7 +78,7 @@
 
 #include "cpudetect.h"
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif
 
@@ -202,7 +202,7 @@ static int output_quality=0;
 
 int use_gui=0;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 int enqueue=0;
 #endif
 
@@ -300,7 +300,7 @@ char* current_module=NULL; // for debugging
 
 // ---
 
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
 #include "m_struct.h"
 #include "libmenu/menu.h"
 extern void vf_menu_pause_update(struct vf_instance* vf);
@@ -561,7 +561,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask){
     mpctx->initialized_flags&=~INITIALIZED_ACODEC;
     current_module="uninit_acodec";
     if(mpctx->sh_audio) uninit_audio(mpctx->sh_audio);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
 #endif
     mpctx->sh_audio=NULL;
@@ -573,7 +573,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask){
     current_module="uninit_vcodec";
     if(mpctx->sh_video) uninit_video(mpctx->sh_video);
     mpctx->sh_video=NULL;
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
     vf_menu=NULL;
 #endif
   }
@@ -636,7 +636,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask){
     mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL;
   }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if(mask&INITIALIZED_GUI){
     mpctx->initialized_flags&=~INITIALIZED_GUI;
     current_module="uninit_gui";
@@ -655,7 +655,7 @@ void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc){
   timeEndPeriod(1);
 #endif
 #ifdef HAVE_X11
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if ( !use_gui )
 #endif
   vo_uninit(mpctx->x11_state);	// Close the X11 connection (if any is open).
@@ -663,7 +663,7 @@ void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc){
 
     current_module="uninit_input";
     mp_input_uninit(mpctx->input);
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
     if (use_menu)
       menu_uninit();
 #endif
@@ -957,7 +957,7 @@ static int playtree_add_playlist(struct MPContext *mpctx, play_tree_t* entry)
 {
   play_tree_add_bpf(entry,mpctx->filename);
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if (use_gui) {
     if (entry) {
       import_playtree_playlist_into_gui(entry, mpctx->mconfig);
@@ -1004,7 +1004,7 @@ void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr
     subd = sub_read_file(filename, fps);
 #ifdef CONFIG_ASS
     if (ass_enabled)
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
         asst = ass_read_file(ass_library, filename, sub_cp);
 #else
         asst = ass_read_file(ass_library, filename, 0);
@@ -1276,7 +1276,7 @@ int build_afilter_chain(struct MPContext *mpctx, sh_audio_t *sh_audio, ao_data_t
   int result;
   if (!sh_audio)
   {
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
 #endif
     mpctx->mixer.afilter = NULL;
@@ -1300,7 +1300,7 @@ int build_afilter_chain(struct MPContext *mpctx, sh_audio_t *sh_audio, ao_data_t
   result =  init_audio_filters(sh_audio, new_srate,
            &ao_data->samplerate, &ao_data->channels, &ao_data->format);
   mpctx->mixer.afilter = sh_audio->afilter;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if (use_gui) guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter);
 #endif
   return result;
@@ -2158,7 +2158,7 @@ int reinit_video_chain(struct MPContext *mpctx)
     char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL };
     sh_video->vfilter = vf_open_filter(opts, NULL,"vo",vf_arg);
   }
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
   if(use_menu) {
     char* vf_arg[] = { "_oldargs_", menu_root, NULL };
     vf_menu = vf_open_plugin(opts,libmenu_vfs,sh_video->vfilter,"menu",vf_arg);
@@ -2343,7 +2343,7 @@ static void pause_loop(struct MPContext *mpctx)
 	    mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
         mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
     }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui)
 	guiGetEvent(guiCEvent, (char *)guiSetPause);
 #endif
@@ -2362,7 +2362,7 @@ static void pause_loop(struct MPContext *mpctx)
 	}
 	if (mpctx->sh_video && mpctx->video_out)
 	    vo_check_events(mpctx->video_out);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 	if (use_gui) {
 	    guiEventHandling();
 	    guiGetEvent(guiReDraw, NULL);
@@ -2370,7 +2370,7 @@ static void pause_loop(struct MPContext *mpctx)
 		break;
 	}
 #endif
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
 	if (vf_menu)
 	    vf_menu_pause_update(vf_menu);
 #endif
@@ -2386,7 +2386,7 @@ static void pause_loop(struct MPContext *mpctx)
     if (mpctx->video_out && mpctx->sh_video && mpctx->video_out->config_ok)
         vo_control(mpctx->video_out, VOCTRL_RESUME, NULL);	// resume video
     (void)get_relative_time(mpctx);	// ignore time that passed during pause
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui) {
 	if (guiIntfStruct.Playing == guiSetStop)
 	    mpctx->eof = 1;
@@ -2619,7 +2619,7 @@ int gui_no_filename=0;
 
     parse_cfgfiles(mpctx, mpctx->mconfig);
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if ( use_gui ) cfg_read();
 #endif
 
@@ -2641,7 +2641,7 @@ int gui_no_filename=0;
     }
     mpctx->key_fifo = mp_fifo_create(opts);
 	
-#if defined(WIN32) && defined(HAVE_NEW_GUI)
+#if defined(WIN32) && defined(CONFIG_GUI)
     void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows");
     if(runningmplayer && mpctx->filename && use_gui){
         COPYDATASTRUCT csData;
@@ -2670,7 +2670,7 @@ int gui_no_filename=0;
 		SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
 	}
 #endif	
-#ifndef HAVE_NEW_GUI
+#ifndef CONFIG_GUI
     if(use_gui){
       mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
       use_gui=0;
@@ -2697,7 +2697,7 @@ int gui_no_filename=0;
       // Import initital playtree into GUI.
       import_initial_playtree_into_gui(mpctx->playtree, mpctx->mconfig, enqueue);
     }
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
     if(opts->video_driver_list && strcmp(opts->video_driver_list[0],"help")==0){
       list_video_out();
@@ -2865,7 +2865,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
 	    mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
     }
   }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 // breaks DGA and SVGAlib and VESA drivers:  --A'rpi
 // and now ? -- Pontscho
     if(use_gui) setuid( getuid() ); // strongly test, please check this.
@@ -2875,7 +2875,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
       mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
 	     softsleep?"software":timer_name);
 
-#ifdef CONFIG_TERMCAP
+#ifdef HAVE_TERMCAP
   if ( !use_gui ) load_termcap(NULL); // load key-codes
 #endif
 
@@ -2892,7 +2892,7 @@ else if(!noconsolecontrols)
 // Set the libstream interrupt callback
 stream_set_interrupt_callback(mp_input_check_interrupt, mpctx->input);
 
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
  if(use_menu) {
      if(menu_cfg && menu_init(mpctx, mpctx->mconfig, mpctx->input, menu_cfg))
      mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
@@ -2945,7 +2945,7 @@ current_module = NULL;
 #endif
 #endif
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if(use_gui){
        guiInit();
        guiGetEvent(guiSetContext, mpctx);
@@ -2985,7 +2985,7 @@ if(!noconsolecontrols && !slave_mode){
 }
 
 // =================== GUI idle loop (STOP state) ===========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if ( use_gui ) {
       mpctx->file_format=DEMUXER_TYPE_UNKNOWN;
       guiGetEvent( guiSetDefaults,0 );
@@ -3023,7 +3023,7 @@ if(!noconsolecontrols && !slave_mode){
          }
        } 
     }
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
 while (player_idle_mode && !mpctx->filename) {
     play_tree_t * entry = NULL;
@@ -3168,7 +3168,7 @@ if (edl_output_filename) {
   }
   mpctx->initialized_flags|=INITIALIZED_STREAM;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if ( use_gui ) guiGetEvent( guiSetStream,(char *)mpctx->stream );
 #endif
 
@@ -3654,7 +3654,7 @@ if(force_fps && mpctx->sh_video){
   mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,mpctx->sh_video->fps,mpctx->sh_video->frametime);
 }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 if ( use_gui ) {
     if ( mpctx->sh_audio ) guiIntfStruct.AudioType=mpctx->sh_audio->channels; else guiIntfStruct.AudioType=0;
     if ( !mpctx->sh_video && mpctx->sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
@@ -3772,7 +3772,7 @@ if(!mpctx->sh_video) {
 //    current_module="draw_osd";
 //    if(vo_config_count) mpctx->video_out->draw_osd();
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if(use_gui) guiEventHandling();
 #endif
 
@@ -3921,7 +3921,7 @@ if(mpctx->rel_seek_secs || mpctx->abs_seek_pos){
   edl_decision = 0;
 }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
       if(use_gui){
         guiEventHandling();
 	if(mpctx->demuxer->file_format==DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength>2){
@@ -3946,7 +3946,7 @@ if(mpctx->rel_seek_secs || mpctx->abs_seek_pos){
 	 }
 #endif
       }
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
 } // while(!mpctx->eof)
 
@@ -4054,7 +4054,7 @@ while(mpctx->playtree_iter != NULL) {
         break;
 }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 if(use_gui && !mpctx->playtree_iter) {
 #ifdef CONFIG_DVDREAD
     if(!guiIntfStruct.DiskChanged)