[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.54,1.55

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv25882

Modified Files:
	vo_x11.c 
Log Message:
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- vo_x11.c	31 Jan 2002 09:52:45 -0000	1.54
+++ vo_x11.c	31 Jan 2002 11:56:11 -0000	1.55
@@ -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));
 }
+