Merge branch 'master' into obi/master

[enigma2.git] / lib / dvb / volume.cpp

diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
index 9cfcf2ee65221bd70c6cd855c529bdfc4e38e2cb..6409dba86bf9adb7b477e0dc3a2676d897687114 100644 (file)
--- 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);
 }
 
@@ -64,48 +63,60 @@ int eDVBVolumecontrol::checkVolume(int vol)
 
 void eDVBVolumecontrol::setVolume(int left, int right)
 {
+               /* left, right is 0..100 */
        leftVol = checkVolume(left);
        rightVol = checkVolume(right);
        
+               /* convert to -1dB steps */
        left = 63 - leftVol * 63 / 100;
        right = 63 - rightVol * 63 / 100;
-       
-#if HAVE_DVB_API_VERSION < 3   
-               audioMixer_t mixer;
+               /* now range is 63..0, where 0 is loudest */
+
+#if HAVE_DVB_API_VERSION < 3
+       audioMixer_t mixer;
 #else
-               audio_mixer_t mixer;
+       audio_mixer_t mixer;
 #endif
 
-#ifdef HAVE_DVB_API_VERSION
-               mixer.volume_left = (left * left) / 64;
-               mixer.volume_right = (right * right) / 64;
+#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
+
+       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();
+       int fd = openMixer();
+       if (fd >= 0)
+       {
 #ifdef HAVE_DVB_API_VERSION
                ioctl(fd, AUDIO_SET_MIXER, &mixer);
 #endif
                closeMixer(fd);
-               
-               printf("Setvolume: %d %d\n", leftVol, rightVol);
-               printf("Setvolume: %d %d\n", left, right);              
-               
+               return;
+       }
+
        //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;
        }
-       
-       fprintf(f, "%d", left);
+
+       fprintf(f, "%d", left); /* in -1dB */
 
        fclose(f);
 }
 
 int eDVBVolumecontrol::getVolume()
 {
-       if (isMuted())
-               return 0;
        return leftVol;
 }
 
@@ -127,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;
        }
        
@@ -148,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;
        }