X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fvolume.cpp;h=b59afb98171ddf05183446d0951632cea711cd65;hb=5ef8f53ba52f4f01124b62b63c5a77cd73f41f0a;hp=c46af3dcd151b799a64d6456e4b6d9864d79a7f2;hpb=0015dff93141e9e4cb231280ea7b08f9bdfdd4d8;p=vuplus_dvbapp

diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
index c46af3d..b59afb9 100644
--- a/lib/dvb/volume.cpp
+++ b/lib/dvb/volume.cpp
@@ -1,20 +1,14 @@
+#include <lib/base/eerror.h>
 #include <lib/dvb/volume.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#if HAVE_DVB_API_VERSION < 3
-#define VIDEO_DEV "/dev/dvb/card0/video0"
-#define AUDIO_DEV "/dev/dvb/card0/audio0"
-#include <ost/audio.h>
-#include <ost/video.h>
-#else
 #define VIDEO_DEV "/dev/dvb/adapter0/video0"
 #define AUDIO_DEV "/dev/dvb/adapter0/audio0"
 #include <linux/dvb/audio.h>
 #include <linux/dvb/video.h>
-#endif
 
 eDVBVolumecontrol* eDVBVolumecontrol::instance = NULL;
 
@@ -43,13 +37,11 @@ void eDVBVolumecontrol::closeMixer(int fd)
 
 void eDVBVolumecontrol::volumeUp(int left, int right)
 {
-	printf("[volume.cpp] Volume up\n");
 	setVolume(leftVol + left, rightVol + right);
 }
 
 void eDVBVolumecontrol::volumeDown(int left, int right)
 {
-	printf("[volume.cpp] Volume down\n");
 	setVolume(leftVol - left, rightVol - right);
 }
 
@@ -73,33 +65,18 @@ void eDVBVolumecontrol::setVolume(int left, int right)
 	right = 63 - rightVol * 63 / 100;
 		/* now range is 63..0, where 0 is loudest */
 
-#if HAVE_DVB_API_VERSION < 3
-	audioMixer_t mixer;
-#else
 	audio_mixer_t mixer;
-#endif
 
-#if HAVE_DVB_API_VERSION < 3
-		/* convert to linear scale. 0 = loudest, ..63 */
-	mixer.volume_left = 63.0-pow(1.068241, 63-left);
-	mixer.volume_right = 63.0-pow(1.068241, 63-right);
-#else
 	mixer.volume_left = left;
 	mixer.volume_right = right;
-#endif
 
-	printf("Setvolume: %d %d (raw)\n", leftVol, rightVol);
-	printf("Setvolume: %d %d (-1db)\n", left, right);
-#if HAVE_DVB_API_VERSION < 3
-	printf("Setvolume: %d %d (lin)\n", mixer.volume_left, mixer.volume_right);
-#endif
+	eDebug("Setvolume: %d %d (raw)", leftVol, rightVol);
+	eDebug("Setvolume: %d %d (-1db)", left, right);
 
 	int fd = openMixer();
 	if (fd >= 0)
 	{
-#ifdef HAVE_DVB_API_VERSION
 		ioctl(fd, AUDIO_SET_MIXER, &mixer);
-#endif
 		closeMixer(fd);
 		return;
 	}
@@ -107,7 +84,7 @@ void eDVBVolumecontrol::setVolume(int left, int right)
 	//HACK?
 	FILE *f;
 	if((f = fopen("/proc/stb/avs/0/volume", "wb")) == NULL) {
-		printf("cannot open /proc/stb/avs/0/volume\n");
+		eDebug("cannot open /proc/stb/avs/0/volume(%m)");
 		return;
 	}
 
@@ -118,8 +95,6 @@ void eDVBVolumecontrol::setVolume(int left, int right)
 
 int eDVBVolumecontrol::getVolume()
 {
-	if (isMuted())
-		return 0;
 	return leftVol;
 }
 
@@ -132,16 +107,14 @@ bool eDVBVolumecontrol::isMuted()
 void eDVBVolumecontrol::volumeMute()
 {
 	int fd = openMixer();
-#ifdef HAVE_DVB_API_VERSION	
 	ioctl(fd, AUDIO_SET_MUTE, true);
-#endif
 	closeMixer(fd);
 	muted = true;
 
 	//HACK?
 	FILE *f;
 	if((f = fopen("/proc/stb/audio/j1_mute", "wb")) == NULL) {
-		printf("cannot open /proc/stb/audio/j1_mute\n");
+		eDebug("cannot open /proc/stb/audio/j1_mute(%m)");
 		return;
 	}
 	
@@ -153,16 +126,14 @@ void eDVBVolumecontrol::volumeMute()
 void eDVBVolumecontrol::volumeUnMute()
 {
 	int fd = openMixer();
-#ifdef HAVE_DVB_API_VERSION
 	ioctl(fd, AUDIO_SET_MUTE, false);
-#endif
 	closeMixer(fd);
 	muted = false;
 
 	//HACK?
 	FILE *f;
 	if((f = fopen("/proc/stb/audio/j1_mute", "wb")) == NULL) {
-		printf("cannot open /proc/stb/audio/j1_mute\n");
+		eDebug("cannot open /proc/stb/audio/j1_mute(%m)");
 		return;
 	}