Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor Preferences fixes #12399

Merged
merged 2 commits into from
Dec 6, 2023
Merged

minor Preferences fixes #12399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a97fad
Pref Mixer, xfader: avoid rounding issues (default value vs. Reset to…
ronso0 Nov 9, 2023
8668d92
Controller mapping: don't print warning if no mapping is configured
ronso0 Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/controllers/legacycontrollermappingfilehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ QFileInfo findScriptFile(std::shared_ptr<LegacyControllerMapping> mapping,
// static
std::shared_ptr<LegacyControllerMapping> LegacyControllerMappingFileHandler::loadMapping(
const QFileInfo& mappingFile, const QDir& systemMappingsPath) {
if (mappingFile.path().isEmpty()) {
return nullptr;
}
if (!mappingFile.exists() || !mappingFile.isReadable()) {
qDebug() << "Mapping" << mappingFile.absoluteFilePath()
<< "does not exist or is unreadable.";
Expand Down
16 changes: 9 additions & 7 deletions src/preferences/dialog/dlgprefmixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ void DlgPrefMixer::slotResetToDefaults() {
EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
SliderXFader->minimum(),
SliderXFader->maximum());
SliderXFader->setValue(static_cast<int>(sliderVal));
SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));

m_xFaderMode = MIXXX_XFADER_ADDITIVE;
radioButtonAdditive->setChecked(true);
Expand Down Expand Up @@ -728,7 +728,7 @@ void DlgPrefMixer::slotUpdate() {
EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
SliderXFader->minimum(),
SliderXFader->maximum());
SliderXFader->setValue(static_cast<int>(sliderVal + 0.5));
SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));

m_xFaderMode = m_pConfig->getValueString(kXfaderModeKey).toInt();
if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
Expand Down Expand Up @@ -903,12 +903,14 @@ void DlgPrefMixer::slotUpdateXFader() {

// m_transform is in the range of 1 to 1000 while 50 % slider results
// to ~2, which represents a medium rounded fader curve.
m_transform = RescalerUtils::linearToOneByX(
SliderXFader->value(),
SliderXFader->minimum(),
SliderXFader->maximum(),
EngineXfader::kTransformMax) -
double transform = RescalerUtils::linearToOneByX(
SliderXFader->value(),
SliderXFader->minimum(),
SliderXFader->maximum(),
EngineXfader::kTransformMax) -
1 + EngineXfader::kTransformMin;
// Round to 4 decimal places to avoid round-trip offsets with default 1.0
m_transform = std::round(transform * 10000) / 10000;
m_cal = EngineXfader::getPowerCalibration(m_transform);

drawXfaderDisplay();
Expand Down
11 changes: 4 additions & 7 deletions src/preferences/dialog/dlgprefmixerdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,20 @@
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
<number>100000</number>
</property>
<property name="singleStep">
<number>1</number>
<number>1000</number>
</property>
<property name="pageStep">
<number>1</number>
<number>1000</number>
</property>
<property name="value">
<number>50</number>
<number>50000</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickInterval">
<number>5</number>
</property>
</widget>
</item>
<item>
Expand Down