diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-31 11:56:11 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-31 11:56:11 +0000 |
| commit | 7b9afd33307557cc91f7296d34b87c3c8ed05921 (patch) | |
| tree | 1d43c0d5822f5111869932caf16f687fb30dd6e5 /libvo/vo_x11.c | |
| parent | af79d7fa53fbac8d49c43edc9a3b0cc272f82c16 (diff) | |
| download | mpv-7b9afd33307557cc91f7296d34b87c3c8ed05921.tar.bz2 mpv-7b9afd33307557cc91f7296d34b87c3c8ed05921.tar.xz | |
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4444 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 7c6d040787..283ec7f933 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -431,16 +431,6 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t static const vo_info_t* get_info( void ) { return &vo_info; } -static void Terminate_Display_Process( void ) -{ - getchar(); /* wait for enter to remove window */ - - freeMyXImage(); - - XDestroyWindow( mDisplay,mywindow ); - XCloseDisplay( mDisplay ); -} - static void Display_Image( XImage *myximage,uint8_t *ImageData ) { #ifdef DISP @@ -593,19 +583,14 @@ static uint32_t query_format( uint32_t format ) static void uninit(void) { + freeMyXImage(); saver_on(mDisplay); // screen saver back on -#ifdef HAVE_NEW_GUI - if ( vo_window == None ) -#endif - { - XDestroyWindow( mDisplay,mywindow ); - } #ifdef HAVE_XF86VM vo_vm_close(mDisplay); #endif -printf("vo: uninit!\n"); + vo_x11_uninit(mDisplay, mywindow); } static uint32_t preinit(const char *arg) @@ -617,3 +602,4 @@ static void query_vaa(vo_vaa_t *vaa) { memset(vaa,0,sizeof(vo_vaa_t)); } + |