[Mplayer-cvslog] CVS: main/libvo vo_gl.c,1.18,1.19 vo_gl2.c,1.12,1.13

[Alex Beregszaszi]

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

Modified Files:
	vo_gl.c vo_gl2.c 
Log Message:
removed obsoleted Terminate_Display_Process, using vo_x11_uninit

Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vo_gl.c	31 Jan 2002 09:52:45 -0000	1.18
+++ vo_gl.c	31 Jan 2002 11:46:46 -0000	1.19
@@ -293,16 +293,6 @@
 	return &vo_info;
 }
 
-static void 
-Terminate_Display_Process(void) 
-{
-	getchar();	/* wait for enter to remove window */
-	XDestroyWindow(mDisplay, mywindow);
-	XCloseDisplay(mDisplay);
-	X_already_started = 0;
-}
-
-
 static void check_events(void)
 {
     int e=vo_x11_check_events(mDisplay);
@@ -475,7 +465,8 @@
 uninit(void)
 {
   saver_on(mDisplay); // screen saver back on
-  XDestroyWindow( mDisplay,mywindow );
+
+  vo_x11_uninit(mDisplay, mywindow);
 }
 
 static uint32_t preinit(const char *arg)

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_gl2.c	31 Jan 2002 09:52:45 -0000	1.12
+++ vo_gl2.c	31 Jan 2002 11:46:46 -0000	1.13
@@ -948,15 +948,6 @@
 	return &vo_info;
 }
 
-static void 
-Terminate_Display_Process(void) 
-{
-	getchar();	/* wait for enter to remove window */
-	XDestroyWindow(mDisplay, mywindow);
-	XCloseDisplay(mDisplay);
-	X_already_started = 0;
-}
-
 static int gl_handlekey(int key)
 {
 	if(key=='a'||key=='A')
@@ -1101,7 +1092,8 @@
 uninit(void)
 {
   saver_on(mDisplay); // screen saver back on
-  XDestroyWindow( mDisplay,mywindow );
+
+  vo_x11_uninit(mDisplay, mywindow);
 }
 
 static uint32_t preinit(const char *arg)