[Mplayer-cvslog] CVS: main/libao2 ao_mpegpes.c,1.6,1.7

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libao2
In directory mplayer:/var/tmp.root/cvs-serv3105

Modified Files:
	ao_mpegpes.c 
Log Message:
compilation fixed

Index: ao_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ao_mpegpes.c	21 Feb 2002 16:02:26 -0000	1.6
+++ ao_mpegpes.c	21 Feb 2002 17:22:03 -0000	1.7
@@ -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 @@
 
 // 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 @@
 	    return CONTROL_OK;
 	  }
 	  return CONTROL_ERROR;
-	}
     }
+#endif
     return CONTROL_UNKNOWN;
 }