[Mplayer-cvslog] CVS: main Makefile,1.155,1.156 mplayer.c,1.401,1.402 mplayer.h,1.3,1.4

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv6782

Modified Files:
	Makefile mplayer.c mplayer.h 
Log Message:
new interface ? :)

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- Makefile	20 Feb 2002 17:02:31 -0000	1.155
+++ Makefile	21 Feb 2002 22:48:35 -0000	1.156
@@ -194,7 +194,7 @@
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(GUI_LIBS) $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) $(VIDIX_LIBS) -Linput -linput -lm
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(GUI_LIBS) $(AO_LIBS) $(LIB_LOADER) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) $(VIDIX_LIBS) -Linput -linput -lm
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- mplayer.c	21 Feb 2002 16:02:26 -0000	1.401
+++ mplayer.c	21 Feb 2002 22:48:35 -0000	1.402
@@ -70,7 +70,7 @@
 #endif
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/mplayer/play.h"
+#include "Gui/interface.h"
 #endif
 
 #ifdef HAVE_NEW_INPUT
@@ -741,7 +741,7 @@
 //      mplShMem->Playing= (gui_no_filename) ? 0 : 1;
       while(mplShMem->Playing!=1){
 	usleep(20000);
-	EventHandling();
+	guiEventHandling();
       }
 
 play_dvd:
@@ -1657,7 +1657,7 @@
 	  }
       }
 #ifdef HAVE_NEW_GUI
-      if(use_gui) EventHandling();
+      if(use_gui) guiEventHandling();
 #endif
       video_out->check_events(); // check events AST
     } else {
@@ -1747,7 +1747,7 @@
 
 #ifdef HAVE_NEW_GUI
       if(use_gui){
-	EventHandling();
+	guiEventHandling();
       }
 #endif
 
@@ -2001,7 +2001,7 @@
 #endif /* HAVE_NEW_INPUT */
 #ifdef HAVE_NEW_GUI
              if(use_gui){
-		EventHandling();
+		guiEventHandling();
 		if(mplShMem->Playing!=2 || (rel_seek_secs || abs_seek_pos))
 		  { gui_pause_flag=1; break; } // end of pause or seek
              }

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer.h	4 Jun 2001 18:41:34 -0000	1.3
+++ mplayer.h	21 Feb 2002 22:48:35 -0000	1.4
@@ -2,84 +2,6 @@
 #ifndef __MPLAYER_MAIN
 #define __MPLAYER_MAIN
 
-extern int divx_quality;
-
-extern char* filename;
-extern int i;
-extern char *seek_to_sec;
-extern int seek_to_byte;
-extern int f; // filedes
-extern int stream_type;
-extern stream_t* stream;
-extern int file_format;
-extern int has_audio;
-//int has_video=1;
-//
-extern int audio_format;
-#ifdef ALSA_TIMER
-extern int alsa;
-#else
-extern int alsa;
-#endif
-extern int audio_buffer_size;
-extern int audio_id;
-extern int video_id;
-extern int dvdsub_id;
-extern float default_max_pts_correction;
-extern int delay_corrected;
-extern float force_fps;
-extern float audio_delay;
-extern int vcd_track;
-#ifdef VCD_CACHE
-extern int vcd_cache_size;
-#endif
-extern int index_mode;  // -1=untouched  0=don't use index  1=use (geneate) index
-#ifdef AVI_SYNC_BPS
-extern int pts_from_bps;
-#else
-extern int pts_from_bps;
-#endif
-extern char* title;
-// screen info:
-extern char* video_driver; //"mga"; // default
-vo_functions_t *video_out;
-extern int fullscreen;
-extern int vidmode;
-extern int softzoom;
-extern int screen_size_x;//SCREEN_SIZE_X;
-extern int screen_size_y;//SCREEN_SIZE_Y;
-extern int screen_size_xy;
-// movie info:
-extern int out_fmt;
-extern char *dsp;
-extern int force_ni;
-extern char *conffile;
-extern int conffile_fd;
-extern char *font_name;
-extern float font_factor;
-extern char *sub_name;
-extern float sub_delay;
-extern float sub_fps;
-extern int   sub_auto;
-extern char *stream_dump_name;
-extern int stream_dump_type;
-//int user_bpp=0;
-
-extern int verbose;
-
-extern int osd_level;
-extern int nogui;
-
-float a_frame;    // Audio
-
-extern float rel_seek_secs;
-
-extern int osd_visible;
-extern int osd_function;
-extern int osd_last_pts;
-
-extern int mplayer(int argc,char* argv[], char *envp[]);
-extern void parse_cfgfiles( void );
-extern void exit_player(char* how);
+extern int use_gui;
 
 #endif