aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/volume.cpp
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-01-28 13:53:15 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-01-28 13:53:15 +0000
commit0015dff93141e9e4cb231280ea7b08f9bdfdd4d8 (patch)
tree6ef54c614ebd0d1383cb252256a2b227fdc4e477 /lib/dvb/volume.cpp
parent43b204fbde9c5b36848320079eb7e9576536ddc3 (diff)
downloadenigma2-0015dff93141e9e4cb231280ea7b08f9bdfdd4d8.tar.gz
enigma2-0015dff93141e9e4cb231280ea7b08f9bdfdd4d8.zip
volume is now log.scale in driver
Diffstat (limited to 'lib/dvb/volume.cpp')
-rw-r--r--lib/dvb/volume.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
index 8a88480f..c46af3dc 100644
--- 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)