RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

remove exit_player and exit references 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10735 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-31 18:33:02 +00:00
parent 3eec29218f
commit 1450231f23
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libvo/geometry.c
View File

@ -4,18 +4,10 @@
#include <string.h> #include <string.h>
#include "geometry.h" #include "geometry.h"
#include "../mp_msg.h" #include "../mp_msg.h"
#include "../mplayer.h" /* exit_player() */
/* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */ /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
char *vo_geometry = NULL; 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; #define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1;
// xpos,ypos: position of the left upper corner // xpos,ypos: position of the left upper corner
@ -50,7 +42,11 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
{ {
RESET_GEOMETRY RESET_GEOMETRY
if(sscanf(vo_geometry, "%i%%", &xper) != 1) 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;
}
} }
} }
} }

4
libvo/vo_vesa.c
View File

@ -185,7 +185,7 @@ static inline void __vbeSwitchBank(unsigned long offset)
vesa_term(); vesa_term();
PRINT_VBE_ERR("vbeSetWindow",err); PRINT_VBE_ERR("vbeSetWindow",err);
printf("vo_vesa: Fatal error occured! Can't continue\n"); printf("vo_vesa: Fatal error occured! Can't continue\n");
exit(-1); abort();
} }
win.low = new_offset * gran; win.low = new_offset * gran;
win.high = win.low + video_mode_info.WinSize*1024; win.high = win.low + video_mode_info.WinSize*1024;
@ -387,7 +387,7 @@ static void flip_page(void)
vesa_term(); vesa_term();
PRINT_VBE_ERR("vbeSetDisplayStart",err); PRINT_VBE_ERR("vbeSetDisplayStart",err);
printf("vo_vesa: Fatal error occured! Can't continue\n"); printf("vo_vesa: Fatal error occured! Can't continue\n");
exit(EXIT_FAILURE); abort();
} }
multi_idx = multi_idx ? 0 : 1; multi_idx = multi_idx ? 0 : 1;
win.ptr = dga_buffer = video_base + multi_buff[multi_idx]; win.ptr = dga_buffer = video_base + multi_buff[multi_idx];

3
libvo/vo_xvidix.c
View File

@ -32,7 +32,6 @@
#include "vosub_vidix.h" #include "vosub_vidix.h"
#include "../vidix/vidixlib.h" #include "../vidix/vidixlib.h"
#include "../mplayer.h" /* exit_player() */
#ifdef HAVE_NEW_GUI #ifdef HAVE_NEW_GUI
#include "../Gui/interface.h" #include "../Gui/interface.h"
@ -188,7 +187,7 @@ static void set_window(int force_update)
vo_screenwidth, vo_screenheight) != 0) vo_screenwidth, vo_screenheight) != 0)
{ {
mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno)); mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
exit_player("vidix error"); /* !!! */ abort();
} }
vidix_start(); vidix_start();
} }