volume is now log.scale in driver

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

diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
index 8a88480f331f7b7a0dcb129bf47169922c916b89..c46af3dcd151b799a64d6456e4b6d9864d79a7f2 100644 (file)
--- a/lib/dvb/volume.cpp
+++ b/lib/dvb/volume.cpp
@@ -73,21 +73,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);
+#if HAVE_DVB_API_VERSION < 3
        printf("Setvolume: %d %d (lin)\n", mixer.volume_left, mixer.volume_right);
+#endif
 
        int fd = openMixer();
        if (fd >= 0)