mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 20:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slightly tweaked linear vs non-linear volume prefs in PulseOut.

Browse Source
This commit is contained in:
casey langen 2017-03-11 01:52:09 +00:00
parent dd065e14b3
commit eef1097d9e
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/contrib/pulseout/PulseOut.cpp
View File

@ -45,7 +45,7 @@ static musik::core::sdk::IPreferences* prefs = nullptr;
extern "C" void SetPreferences(musik::core::sdk::IPreferences* prefs) {
::prefs = prefs;
prefs->GetBool("force_sw_volume", false);
prefs->GetBool("force_linear_volume", false);
prefs->Save();
}
@ -57,7 +57,7 @@ PulseOut::PulseOut() {
this->volumeUpdated = false;
this->channels = 0;
this->rate = 0;
this->hwVolume = false;
this->linearVolume = false;
}
PulseOut::~PulseOut() {
@ -117,12 +117,7 @@ void PulseOut::OpenDevice(musik::core::sdk::IBuffer* buffer) {
this->rate = buffer->SampleRate();
this->channels = buffer->Channels();
this->state = StatePlaying;
this->hwVolume = pa_blocking_has_hw_volume(this->audioConnection, 0);
if (::prefs && ::prefs->GetBool("force_sw_volume", false)) {
this->hwVolume = false;
}
this->linearVolume = ::prefs->GetBool("force_linear_volume", false);
this->SetVolume(this->volume);
}
}
@ -164,12 +159,10 @@ void PulseOut::SetVolume(double volume) {
this->volumeUpdated = false;
if (this->audioConnection) {
int normalized;
if (this->hwVolume) {
//std::cerr << "PulseOut: hw volume!\n";
if (this->linearVolume) {
normalized = (int) round((double) PA_VOLUME_NORM * volume);
}
else {
//std::cerr << "PulseOut: sw volume!\n";
normalized = (int) pa_sw_volume_from_linear(this->volume);
}
this->volumeUpdated = pa_blocking_set_volume(this->audioConnection, normalized, 0) == 0;

2
src/contrib/pulseout/PulseOut.h
View File

@ -77,5 +77,5 @@ class PulseOut : public musik::core::sdk::IOutput {
int channels, rate;
double volume;
bool volumeUpdated;
bool hwVolume;
bool linearVolume;
};