Mercurial > mplayer.hg
diff libvo/vo_mpegpes.c @ 8594:00326905484b
DVB-HEAD (aka. NEWSTRUCT) detection & support
patch by Dimitrios Dimitrakos <mail@dimitrios.de>
| author | arpi |
|---|---|
| date | Sat, 28 Dec 2002 12:04:58 +0000 |
| parents | 5b39e79af5fe |
| children | 0694a2fba3dd |
line wrap: on
line diff
--- a/libvo/vo_mpegpes.c Sat Dec 28 11:39:31 2002 +0000 +++ b/libvo/vo_mpegpes.c Sat Dec 28 12:04:58 2002 +0000 @@ -26,9 +26,11 @@ #include <unistd.h> #include "mp_msg.h" - +#ifdef HAVE_DVB_HEAD +#define HAVE_DVB 1 +#endif #ifdef HAVE_DVB - +#ifndef HAVE_DVB_HEAD #include <sys/poll.h> #include <sys/ioctl.h> @@ -41,6 +43,20 @@ #include <ost/video.h> #include <ost/audio.h> +#else +#define true 1 +#define false 0 +#include <sys/poll.h> + +#include <sys/ioctl.h> +#include <stdio.h> +#include <time.h> + +#include <linux/dvb/dmx.h> +#include <linux/dvb/frontend.h> +#include <linux/dvb/video.h> +#include <linux/dvb/audio.h> +#endif #endif #include "config.h" @@ -86,6 +102,7 @@ #ifdef HAVE_DVB if(!arg){ //|O_NONBLOCK +#ifndef HAVE_DVB_HEAD if((vo_mpegpes_fd = open("/dev/ost/video",O_RDWR)) < 0){ perror("DVB VIDEO DEVICE: "); return -1; @@ -94,6 +111,16 @@ perror("DVB AUDIO DEVICE: "); return -1; } +#else + if((vo_mpegpes_fd = open("/dev/dvb/adapter0/video0",O_RDWR)) < 0){ + perror("DVB VIDEO DEVICE: "); + return -1; + } + if((vo_mpegpes_fd2 = open("/dev/dvb/adapter0/audio0",O_RDWR|O_NONBLOCK)) < 0){ + perror("DVB AUDIO DEVICE: "); + return -1; + } +#endif if ( (ioctl(vo_mpegpes_fd,VIDEO_SET_BLANK, false) < 0)){ perror("DVB VIDEO SET BLANK: "); return -1;