diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-31 11:46:46 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-31 11:46:46 +0000 |
commit | 947903ce8d0db2df2e0fca35d8e8225711e6165b (patch) | |
tree | 03881ecad5252c311647e74ec7fa93edddfb7b68 /libvo | |
parent | 3807f396a5e78939771efceb5d2ef3ff34b0e4ba (diff) | |
download | mpv-947903ce8d0db2df2e0fca35d8e8225711e6165b.tar.bz2 mpv-947903ce8d0db2df2e0fca35d8e8225711e6165b.tar.xz |
removed obsoleted Terminate_Display_Process, using vo_x11_uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4441 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_gl.c | 13 | ||||
-rw-r--r-- | libvo/vo_gl2.c | 12 |
2 files changed, 4 insertions, 21 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 3d2baad7ec..aeb6007a13 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -293,16 +293,6 @@ get_info(void) 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 @@ static void uninit(void) { saver_on(mDisplay); // screen saver back on - XDestroyWindow( mDisplay,mywindow ); + + vo_x11_uninit(mDisplay, mywindow); } static uint32_t preinit(const char *arg) diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 1d5587f182..54fd975416 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -948,15 +948,6 @@ get_info(void) 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 @@ static void uninit(void) { saver_on(mDisplay); // screen saver back on - XDestroyWindow( mDisplay,mywindow ); + + vo_x11_uninit(mDisplay, mywindow); } static uint32_t preinit(const char *arg) |