Mercurial > mplayer.hg
changeset 4443:cf62fa252821
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
| author | alex |
|---|---|
| date | Thu, 31 Jan 2002 11:56:11 +0000 |
| parents | 49c410f359e0 |
| children | b09348223925 |
| files | libvo/vo_x11.c |
| diffstat | 1 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_x11.c Thu Jan 31 11:50:59 2002 +0000 +++ b/libvo/vo_x11.c Thu Jan 31 11:56:11 2002 +0000 @@ -431,16 +431,6 @@ 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 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 @@ { memset(vaa,0,sizeof(vo_vaa_t)); } +