From 076d7e8a88473f18b22d2648dd6cd9bf3b5e9628 Mon Sep 17 00:00:00 2001 From: pontscho Date: Fri, 2 Nov 2001 10:26:58 +0000 Subject: [PATCH] kurva gui. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2628 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 --- mencoder.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 799fe5579d..450c4e2907 100644 --- a/Makefile +++ b/Makefile @@ -122,9 +122,6 @@ MPLAYER_DEP += Gui/libgui.a 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 diff --git a/mencoder.c b/mencoder.c index 1f00eff8a4..4f7a03cbbd 100644 --- a/mencoder.c +++ b/mencoder.c @@ -109,6 +109,28 @@ static int cfg_include(struct config *conf, char *filename){ //--------------------------------------------------------------------------- +// 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;