diff gui/wm/ws.c @ 33768:cee9987bc81d

Remove guiExit(). Integrate it into mplayer().

--- a/gui/wm/ws.c	Fri Jul 08 21:57:18 2011 +0000
+++ b/gui/wm/ws.c	Sat Jul 09 10:23:47 2011 +0000
@@ -424,7 +424,7 @@
 
     if (depth < 15) {
         mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ColorDepthTooLow);
-        guiExit(EXIT_ERROR);
+        mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
     XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo);
@@ -550,7 +550,7 @@
 
         if (i == wsWLCount) {
             mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows);
-            guiExit(EXIT_ERROR);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
         wsWindowList[i] = win;
@@ -1358,7 +1358,7 @@
 
         if (win->xImage == NULL) {
             mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
-            guiExit(EXIT_ERROR);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
         win->Shminfo.shmid = shmget(IPC_PRIVATE, win->xImage->bytes_per_line * win->xImage->height, IPC_CREAT | 0777);
@@ -1366,7 +1366,7 @@
         if (win->Shminfo.shmid < 0) {
             XDestroyImage(win->xImage);
             mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
-            guiExit(EXIT_ERROR);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
         win->Shminfo.shmaddr = (char *)shmat(win->Shminfo.shmid, 0, 0);
@@ -1378,7 +1378,7 @@
                 shmdt(win->Shminfo.shmaddr);
 
             mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
-            guiExit(EXIT_ERROR);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
 
         win->xImage->data     = win->Shminfo.shmaddr;
@@ -1394,7 +1394,7 @@
 
         if ((win->xImage->data = malloc(win->xImage->bytes_per_line * win->xImage->height)) == NULL) {
             mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_NotEnoughMemoryDrawBuffer);
-            guiExit(EXIT_ERROR);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
     }