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

move to next vo if /dev/3dfx could not be opened 

open it on preinit not at config time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17163 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
iive 2005-12-10 22:30:30 +00:00
parent 8c7dfbfe0c
commit 8ed3a2fbb0
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvo/vo_3dfx.c
View File

@ -101,6 +101,8 @@ static Window mywindow;
static int bpp; static int bpp;
static XWindowAttributes attribs; static XWindowAttributes attribs;
static int fd=-1;
static void static void
restore(void) restore(void)
@ -307,11 +309,12 @@ update_target(void)
static int static int
config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{ {
int fd;
char *name = ":0.0"; char *name = ":0.0";
pioData data; pioData data;
uint32_t retval; uint32_t retval;
//TODO use x11_common for X and window handling
if(getenv("DISPLAY")) if(getenv("DISPLAY"))
name = getenv("DISPLAY"); name = getenv("DISPLAY");
display = XOpenDisplay(name); display = XOpenDisplay(name);
@ -328,9 +331,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
//alarm(120); //alarm(120);
// Open driver device // Open driver device
if ( (fd = open("/dev/3dfx",O_RDWR) ) == -1) if ( fd == -1 )
{ {
printf("Couldn't open /dev/3dfx\n"); printf("Device not opened /dev/3dfx\n");
return -1; return -1;
} }
@ -350,7 +353,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
if ((retval = ioctl(fd,_IOC(_IOC_READ,'3',3,0),&data)) < 0) if ((retval = ioctl(fd,_IOC(_IOC_READ,'3',3,0),&data)) < 0)
{ {
printf("Error: %d\n",retval); printf("Error: %d\n",retval);
//return -1; return -1;
} }
// Ask 3dfx driver for base memory address 1 // Ask 3dfx driver for base memory address 1
@ -361,7 +364,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
if ((retval = ioctl(fd,_IOC(_IOC_READ,'3',3,0),&data)) < 0) if ((retval = ioctl(fd,_IOC(_IOC_READ,'3',3,0),&data)) < 0)
{ {
printf("Error: %d\n",retval); printf("Error: %d\n",retval);
//return -1; return -1;
} }
// Map all 3dfx memory areas // Map all 3dfx memory areas
@ -406,8 +409,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
//XF86DGADirectVideo(display,0,XF86DGADirectGraphics); //| XF86DGADirectMouse | XF86DGADirectKeyb); //XF86DGADirectVideo(display,0,XF86DGADirectGraphics); //| XF86DGADirectMouse | XF86DGADirectKeyb);
#endif #endif
/* fd is deliberately not closed - if it were, mmaps might be released??? */
atexit(restore); atexit(restore);
printf("(display) 3dfx initialized %p\n",memBase1); printf("(display) 3dfx initialized %p\n",memBase1);
@ -469,6 +470,8 @@ query_format(uint32_t format)
static void static void
uninit(void) uninit(void)
{ {
if( fd != -1 )
close(fd);
} }
@ -478,6 +481,12 @@ static void check_events(void)
static int preinit(const char *arg) static int preinit(const char *arg)
{ {
if ( (fd = open("/dev/3dfx",O_RDWR) ) == -1)
{
printf("Couldn't open /dev/3dfx\n");
return -1;
}
if(arg) if(arg)
{ {
printf("vo_3dfx: Unknown subdevice: %s\n",arg); printf("vo_3dfx: Unknown subdevice: %s\n",arg);