X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/13e0981f5ff72d2708c21f8dd42461306268e66e..97d46aee1158e549c110d66a0e1c4185c3cbbdf3:/lib/dvb/volume.cpp

diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
index 8a88480f..6409dba8 100644
--- a/lib/dvb/volume.cpp
+++ b/lib/dvb/volume.cpp
@@ -1,3 +1,4 @@
+#include <lib/base/eerror.h>
 #include <lib/dvb/volume.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -43,13 +44,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,21 +72,26 @@ 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   
+#if HAVE_DVB_API_VERSION < 3
 	audioMixer_t mixer;
 #else
 	audio_mixer_t mixer;
 #endif
 
-#ifdef HAVE_DVB_API_VERSION
+#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);
-	printf("Setvolume: %d %d (lin)\n", mixer.volume_left, mixer.volume_right);
+	eDebug("Setvolume: %d %d (raw)", leftVol, rightVol);
+	eDebug("Setvolume: %d %d (-1db)", left, right);
+#if HAVE_DVB_API_VERSION < 3
+	eDebug("Setvolume: %d %d (lin)", mixer.volume_left, mixer.volume_right);
+#endif
 
 	int fd = openMixer();
 	if (fd >= 0)
@@ -102,7 +106,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;
 	}
 
@@ -113,8 +117,6 @@ void eDVBVolumecontrol::setVolume(int left, int right)
 
 int eDVBVolumecontrol::getVolume()
 {
-	if (isMuted())
-		return 0;
 	return leftVol;
 }
 
@@ -136,7 +138,7 @@ void eDVBVolumecontrol::volumeMute()
 	//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;
 	}
 	
@@ -157,7 +159,7 @@ void eDVBVolumecontrol::volumeUnMute()
 	//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;
 	}