Merge branch 'danielbair-stable' into stable

This commit is contained in:
Fred Gleason 2018-05-29 15:40:27 +00:00
commit 3ea62636d5
2 changed files with 6 additions and 6 deletions

View File

@ -1140,7 +1140,7 @@ bool MainObject::alsaSetInputVolume(int card,int stream,int level)
{
#ifdef ALSA
if(level>-10000) {
alsa_input_volume[card][stream]=pow10((double)level/2000.0);
alsa_input_volume[card][stream]=pow(10.0,(double)level/2000.0);
alsa_input_volume_db[card][stream]=level;
}
else {
@ -1158,7 +1158,7 @@ bool MainObject::alsaSetOutputVolume(int card,int stream,int port,int level)
{
#ifdef ALSA
if(level>-10000) {
alsa_output_volume[card][port][stream]=pow10((double)level/2000.0);
alsa_output_volume[card][port][stream]=pow(10.0,(double)level/2000.0);
alsa_output_volume_db[card][port][stream]=level;
}
else {
@ -1366,7 +1366,7 @@ bool MainObject::alsaSetPassthroughLevel(int card,int in_port,int out_port,
#ifdef ALSA
if(level>-10000) {
alsa_passthrough_volume[card][in_port][out_port]=
pow10((double)level/2000.0);
pow(10.0,(double)level/2000.0);
alsa_passthrough_volume_db[card][in_port][out_port]=level;
}
else {

View File

@ -1071,7 +1071,7 @@ bool MainObject::jackSetInputVolume(int card,int stream,int level)
}
if(level>-10000) {
jack_input_volume[stream]=
(jack_default_audio_sample_t)pow10((double)level/2000.0);
(jack_default_audio_sample_t)pow(10.0,(double)level/2000.0);
jack_input_volume_db[stream]=level;
}
else {
@ -1094,7 +1094,7 @@ bool MainObject::jackSetOutputVolume(int card,int stream,int port,int level)
}
if(level>-10000) {
jack_output_volume[port][stream]=
(jack_default_audio_sample_t)pow10((double)level/2000.0);
(jack_default_audio_sample_t)pow(10.0,(double)level/2000.0);
jack_output_volume_db[port][stream]=level;
}
else {
@ -1315,7 +1315,7 @@ bool MainObject::jackSetPassthroughLevel(int card,int in_port,int out_port,
}
if(level>-10000) {
jack_passthrough_volume[in_port][out_port]=
(jack_default_audio_sample_t)pow10((double)level/2000.0);
(jack_default_audio_sample_t)pow(10.0,(double)level/2000.0);
jack_passthrough_volume_db[in_port][out_port]=level;
}
else {