equal
deleted
inserted
replaced
|
1 diff -ruN ./libao2/ao_mpegpes.c /usr/src/MPlayer-0.90rc1/libao2/ao_mpegpes.c |
|
2 --- ./libao2/ao_mpegpes.c Sun Oct 6 03:08:04 2002 |
|
3 +++ /usr/src/MPlayer-0.90rc1/libao2/ao_mpegpes.c Wed Dec 11 15:47:20 2002 |
|
4 @@ -15,7 +15,7 @@ |
|
5 #include "../mp_msg.h" |
|
6 |
|
7 #ifdef HAVE_DVB |
|
8 -#include <ost/audio.h> |
|
9 -audioMixer_t dvb_mixer={255,255}; |
|
10 +#include <linux/dvb/audio.h> |
|
11 +audio_mixer_t dvb_mixer={255,255}; |
|
12 #endif |
|
13 extern int vo_mpegpes_fd; |
|
14 diff -ruN ./libvo/vo_mpegpes.c /usr/src/MPlayer-0.90rc1/libvo/vo_mpegpes.c |
|
15 --- ./libvo/vo_mpegpes.c Mon Nov 11 16:20:26 2002 |
|
16 +++ /usr/src/MPlayer-0.90rc1/libvo/vo_mpegpes.c Wed Dec 11 15:54:49 2002 |
|
17 @@ -35,12 +35,14 @@ |
|
18 #include <stdio.h> |
|
19 #include <time.h> |
|
20 |
|
21 -#include <ost/dmx.h> |
|
22 -#include <ost/frontend.h> |
|
23 -#include <ost/sec.h> |
|
24 -#include <ost/video.h> |
|
25 -#include <ost/audio.h> |
|
26 - |
|
27 +#include <linux/dvb/video.h> |
|
28 +#include <linux/dvb/audio.h> |
|
29 +#ifndef true |
|
30 +#define true 1 |
|
31 +#endif |
|
32 +#ifndef false |
|
33 +#define false 0 |
|
34 +#endif |
|
35 #endif |
|
36 |
|
37 #include "config.h" |
|
38 @@ -86,11 +88,11 @@ |
|
39 #ifdef HAVE_DVB |
|
40 if(!arg){ |
|
41 //|O_NONBLOCK |
|
42 - if((vo_mpegpes_fd = open("/dev/ost/video",O_RDWR)) < 0){ |
|
43 + if((vo_mpegpes_fd = open("/dev/dvb/adapter0/video0",O_RDWR)) < 0){ |
|
44 perror("DVB VIDEO DEVICE: "); |
|
45 return -1; |
|
46 } |
|
47 - if((vo_mpegpes_fd2 = open("/dev/ost/audio",O_RDWR|O_NONBLOCK)) < 0){ |
|
48 + if((vo_mpegpes_fd2 = open("/dev/dvb/adapter0/audio0",O_RDWR|O_NONBLOCK)) < 0){ |
|
49 perror("DVB AUDIO DEVICE: "); |
|
50 return -1; |
|
51 } |