Mercurial > mplayer.hg

changeset 2627:29bc08cc8e43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
kurva gui.
author pontscho
date Fri, 02 Nov 2001 10:26:58 +0000
parents da9777831e1b
children e8f13573d378
files Makefile mencoder.c
diffstat 2 files changed, 22 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Nov 02 03:22:33 2001 +0000
+++ b/Makefile	Fri Nov 02 10:26:58 2001 +0000
@@ -122,9 +122,6 @@
 MENCODER_DEP += Gui/libgui.a
 endif
 
-mplayerwithoutlink: $(MPLAYER_DEP)	
-	@for a in $(PARTS); do $(MAKE) -C $$a all ; done
-
 $(PRG):	$(MPLAYER_DEP)
 	$(CC) -rdynamic $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
 
--- a/mencoder.c	Fri Nov 02 03:22:33 2001 +0000
+++ b/mencoder.c	Fri Nov 02 10:26:58 2001 +0000
@@ -109,6 +109,28 @@
 
 //---------------------------------------------------------------------------
 
+// dummy datas for gui :(
+
+#ifdef HAVE_NEW_GUI
+float rel_seek_secs=0;
+int abs_seek_pos=0;
+int use_gui=0;
+
+void exit_player(char* how){
+}
+void vo_x11_putkey(int key){
+}
+void vo_setwindow( int w,int g ) {
+}
+void vo_setwindowsize( int w,int h ) {
+}
+
+int       vo_resize = 0;
+int       vo_expose = 0;
+
+#endif
+// ---
+
 // mini dummy libvo:
 
 static unsigned char* vo_image=NULL;