[Mplayer-cvslog] CVS: main/libvo geometry.c,1.9,1.10 vo_vesa.c,1.94,1.95 vo_xvidix.c,1.60,1.61

[Alex Beregszaszi]

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

Modified Files:
	geometry.c vo_vesa.c vo_xvidix.c 
Log Message:
remove exit_player and exit references

Index: geometry.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geometry.c	20 Apr 2003 15:09:19 -0000	1.9
+++ geometry.c	31 Aug 2003 18:33:02 -0000	1.10
@@ -4,18 +4,10 @@
 #include <string.h>
 #include "geometry.h"
 #include "../mp_msg.h"
-#include "../mplayer.h" /* exit_player() */
 
 /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
 char *vo_geometry = NULL;
 
-int geometry_error()
-{
-	mp_msg(MSGT_VO, MSGL_ERR, "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);
-	exit_player(NULL);		/* ????? what else could we do ? */
-	return 0;
-}
-
 #define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1;
 
 // xpos,ypos: position of the left upper corner
@@ -50,7 +42,11 @@
 		     {
 		      RESET_GEOMETRY
 		      if(sscanf(vo_geometry, "%i%%", &xper) != 1)
-			return geometry_error();
+		      {
+			mp_msg(MSGT_VO, MSGL_ERR,
+			    "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);
+			return 0;
+		      }
 		     }
 		    }
 		   }

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vo_vesa.c	9 Jul 2003 19:05:16 -0000	1.94
+++ vo_vesa.c	31 Aug 2003 18:33:02 -0000	1.95
@@ -185,7 +185,7 @@
     vesa_term();
     PRINT_VBE_ERR("vbeSetWindow",err);
     printf("vo_vesa: Fatal error occured! Can't continue\n");
-    exit(-1);
+    abort();
   }
   win.low = new_offset * gran;
   win.high = win.low + video_mode_info.WinSize*1024;
@@ -387,7 +387,7 @@
       vesa_term();
       PRINT_VBE_ERR("vbeSetDisplayStart",err);
       printf("vo_vesa: Fatal error occured! Can't continue\n");
-      exit(EXIT_FAILURE);
+      abort();
     }
     multi_idx = multi_idx ? 0 : 1;
     win.ptr = dga_buffer = video_base + multi_buff[multi_idx];

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- vo_xvidix.c	3 Aug 2003 17:26:25 -0000	1.60
+++ vo_xvidix.c	31 Aug 2003 18:33:02 -0000	1.61
@@ -32,7 +32,6 @@
 
 #include "vosub_vidix.h"
 #include "../vidix/vidixlib.h"
-#include "../mplayer.h" /* exit_player() */
 
 #ifdef HAVE_NEW_GUI
 #include "../Gui/interface.h"
@@ -188,7 +187,7 @@
 	    vo_screenwidth, vo_screenheight) != 0)
         {
 	    mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
-    	    exit_player("vidix error"); /* !!! */
+    	    abort();
 	}
 	vidix_start();
     }