diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-21 22:48:47 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-21 22:48:47 +0000 |
| commit | fe8edf976759aef5328f2f52556277e7bad15031 (patch) | |
| tree | 05b89440b45ca6346e760587ae7a9c6b96d89ac2 /Gui | |
| parent | 9be78192bba31c64dcc9c4e17dee38cfbd92ab34 (diff) | |
| download | mpv-fe8edf976759aef5328f2f52556277e7bad15031.tar.bz2 mpv-fe8edf976759aef5328f2f52556277e7bad15031.tar.xz | |
new interface ? :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4799 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/gui.mak | 2 | ||||
| -rw-r--r-- | Gui/interface.c | 25 | ||||
| -rw-r--r-- | Gui/interface.h | 14 | ||||
| -rw-r--r-- | Gui/mplayer/play.c | 6 |
4 files changed, 40 insertions, 7 deletions
diff --git a/Gui/gui.mak b/Gui/gui.mak index dfcdc40b86..5e2e05bb6e 100644 --- a/Gui/gui.mak +++ b/Gui/gui.mak @@ -10,6 +10,6 @@ MPLAYERSRCS = $(MPLAYERDIR)mplayer.c $(MPLAYERDIR)widgets.c $(MPLAYERDIR)play.c $(MPLAYERDIR)psignal.c $(GTKSRCS) MPLAYEROBJS = $(MPLAYERSRCS:.c=.o) -SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c events.c timer.c error.c +SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c events.c timer.c error.c interface.c OBJS = $(SRCS:.c=.o) diff --git a/Gui/interface.c b/Gui/interface.c new file mode 100644 index 0000000000..c4b1fba858 --- /dev/null +++ b/Gui/interface.c @@ -0,0 +1,25 @@ + + +#include "ws.h" +#include "mplayer/play.h" +#include "interface.h" +#include "../mplayer.h" + +void guiGetEvent( int type,char * arg ) +{ + switch ( type ) + { + case guiXEvent: + wsEvents( wsDisplay,(XEvent *)arg,NULL ); + break; + case guiCEvent: + break; + } +} + +void guiEventHandling( void ) +{ + if ( use_gui && !mplShMem->Playing ) wsHandleEvents(); + mplTimerHandler(0); // handle GUI timer events + if ( mplShMem->SkinChange ) { ChangeSkin(); mplShMem->SkinChange=0; } +} diff --git a/Gui/interface.h b/Gui/interface.h new file mode 100644 index 0000000000..f3580a37e0 --- /dev/null +++ b/Gui/interface.h @@ -0,0 +1,14 @@ + +#ifndef _INTERFACE_H +#define _INTERFACE_H + +#include "mplayer/play.h" +#include "../mplayer.h" + +#define guiXEvent 0 +#define guiCEvent 1 + +extern void guiGetEvent( int type,char * arg ); +extern void guiEventHandling( void ); + +#endif
\ No newline at end of file diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 0eaef673d7..c38ee2d98f 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -225,12 +225,6 @@ void ChangeSkin( void ) btnModify( evFullScreen,!appMPlayer.subWindow.isFullScreen ); } -void EventHandling( void ) -{ - wsHandleEvents();mplTimerHandler(0); // handle GUI timer events - if ( mplShMem->SkinChange ) { ChangeSkin(); mplShMem->SkinChange=0; } -} - void mplResizeToMovieSize( unsigned int width,unsigned int height ) { if ( !appMPlayer.subWindow.isFullScreen ) |