aboutsummaryrefslogtreecommitdiffhomepage
path: root/libao2
diff options
context:
space:
mode:
authorGravatar arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-21 17:22:03 +0000
committerGravatar arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-21 17:22:03 +0000
commit64f2fee0a90c4da81715515b15afe3a50797b7fc (patch)
treecb69f8e08c898d4ddfb41df2dff8c7b1241107f9 /libao2
parent50657061a84c1d3081d6306b06e90a5bd8c29701 (diff)
compilation fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4793 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_mpegpes.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index 1ddf1dd042..9fb9f18f9e 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -7,13 +7,20 @@
#include "afmt.h"
+#ifdef HAVE_DVB
+#include <ost/audio.h>
audioMixer_t dvb_mixer={255,255};
extern int vo_mpegpes_fd;
extern int vo_mpegpes_fd2;
+#endif
static ao_info_t info =
{
- "mpeg-pes audio output",
+#ifdef HAVE_DVB
+ "DVB audio output",
+#else
+ "Mpeg-PES audio output",
+#endif
"mpegpes",
"A'rpi",
""
@@ -24,18 +31,16 @@ LIBAO_EXTERN(mpegpes)
// to set/get/query special features/parameters
static int control(int cmd,int arg){
+#ifdef HAVE_DVB
switch(cmd){
case AOCONTROL_GET_VOLUME:
- {
if(vo_mpegpes_fd2>=0){
((ao_control_vol_t*)(arg))->left=dvb_mixer.volume_left/2.56;
((ao_control_vol_t*)(arg))->right=dvb_mixer.volume_right/2.56;
return CONTROL_OK;
}
return CONTROL_ERROR;
- }
case AOCONTROL_SET_VOLUME:
- {
if(vo_mpegpes_fd2>=0){
dvb_mixer.volume_left=((ao_control_vol_t)(arg)).left*2.56;
dvb_mixer.volume_right=((ao_control_vol_t)(arg)).right*2.56;
@@ -49,8 +54,8 @@ static int control(int cmd,int arg){
return CONTROL_OK;
}
return CONTROL_ERROR;
- }
}
+#endif
return CONTROL_UNKNOWN;
}