Mercurial > mplayer.hg
changeset 4440:0824e6605974
removed obsoleted Terminate_Display_Process, using vo_x11_uninit
| author | alex |
|---|---|
| date | Thu, 31 Jan 2002 11:46:46 +0000 |
| parents | 682af066d7bf |
| children | 90814d64a840 |
| files | libvo/vo_gl.c libvo/vo_gl2.c |
| diffstat | 2 files changed, 4 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl.c Thu Jan 31 11:45:25 2002 +0000 +++ b/libvo/vo_gl.c Thu Jan 31 11:46:46 2002 +0000 @@ -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)
--- a/libvo/vo_gl2.c Thu Jan 31 11:45:25 2002 +0000 +++ b/libvo/vo_gl2.c Thu Jan 31 11:46:46 2002 +0000 @@ -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)