From a7bd77b6bb0b3306a7c79089e970e091a0be2e9b Mon Sep 17 00:00:00 2001 From: ronso0 Date: Thu, 6 Feb 2025 14:05:52 +0100 Subject: [PATCH] --- trace / debug --- src/engine/enginemixer.cpp | 16 ++++++++++++++ src/preferences/dialog/dlgprefmixer.cpp | 28 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/src/engine/enginemixer.cpp b/src/engine/enginemixer.cpp index 737ed068b4d..f16d4994a8d 100644 --- a/src/engine/enginemixer.cpp +++ b/src/engine/enginemixer.cpp @@ -208,6 +208,22 @@ EngineMixer::EngineMixer(UserSettingsPointer pConfig, m_pBoothEnabled->setReadOnly(); m_pHeadphoneEnabled->setReadOnly(); + connect(m_pXFaderCurve.get(), + &ControlObject::valueChanged, + this, + [](double value) { + qWarning() << " ."; + qWarning() << " xFader curve changed:" << value; + qWarning() << " ."; + }); + connect(m_pXFaderCalibration.get(), + &ControlObject::valueChanged, + this, + [](double value) { + qWarning() << " ."; + qWarning() << " xFader cali changed: " << value; + qWarning() << " ."; + }); // Note: the EQ Rack is set in EffectsManager::setupDefaults(); } diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp index 5bdf5cbf8f6..c568e3a1c9e 100644 --- a/src/preferences/dialog/dlgprefmixer.cpp +++ b/src/preferences/dialog/dlgprefmixer.cpp @@ -816,6 +816,9 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() { return; } + qWarning() << " ."; + qWarning() << " ."; + qWarning() << " slotUpdateXFaderFromConfigOrControls"; // Read values from config only on first update if the xfader curve controls // are still at their default values. This should detect if controller mappings // (or skin attributes) have changed the xfader controls. @@ -826,6 +829,7 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() { m_xfModeCO->get() == m_xfModeCO->getDefault() && m_xfReverseCO->get() == m_xfReverseCO->getDefault(); if (readCfg) { + qWarning() << " --> init from config"; m_xFaderTransform = m_pConfig->getValue(kXfaderCurveKey, EngineXfader::kTransformDefault); // "xFaderCalibration" is not stored in the config and it's not expsoed // with a slider here. Each time the slider is touched it's calculated @@ -839,7 +843,14 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() { } else { // Update xfader from controls slotXFaderControlChanged(); + qWarning() << " --> from controls"; } + qWarning().noquote() << " mode: " + << QString(m_xFaderMode == MIXXX_XFADER_CONSTPWR ? "Const" : "Addi"); + qWarning() << " transform: " << m_xFaderTransform; + qWarning() << " calibration:" << m_xFaderCal; + qWarning().noquote() << " reverse: " + << QString(m_xFaderReverse ? "Yes" : "normal"); checkBoxReverse->setChecked(m_xFaderReverse); @@ -853,6 +864,7 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() { // m_xFaderCal and calls drawXfaderDisplay(). // This would overwrite the m_cal value we read from the calibration CO, // so block it. + qWarning() << " --> SliderXFader->setValue" << sliderVal; SliderXFader->blockSignals(readCfg); SliderXFader->setValue(static_cast(std::round(sliderVal))); SliderXFader->blockSignals(false); @@ -860,13 +872,17 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() { // Same here buttonGroupCrossfaderModes->blockSignals(true); if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) { + qWarning() << " --> radioButtonConstantPower->setChecked"; radioButtonConstantPower->setChecked(true); } else { + qWarning() << " --> radioButtonAdditive->setChecked"; radioButtonAdditive->setChecked(true); } buttonGroupCrossfaderModes->blockSignals(false); drawXfaderDisplay(); + qWarning() << " ."; + qWarning() << " ."; } void DlgPrefMixer::drawXfaderDisplay() { @@ -961,10 +977,16 @@ void DlgPrefMixer::drawXfaderDisplay() { } void DlgPrefMixer::slotXFaderReverseBoxToggled() { + qWarning() << " ."; + qWarning() << " slotXFaderReverseChanged"; + qWarning() << " ."; m_xFaderReverse = checkBoxReverse->isChecked(); } void DlgPrefMixer::slotXFaderSliderChanged() { + qWarning() << " ."; + qWarning() << " slotXFaderWidgetsChanged"; + qWarning() << " ."; // m_xFaderTransform is in the range of 1 to 1000 while 50 % slider results // to ~2, which represents a medium rounded fader curve. double transform = RescalerUtils::linearToOneByX( @@ -987,6 +1009,9 @@ void DlgPrefMixer::slotXFaderSliderChanged() { } void DlgPrefMixer::slotXFaderModeToggled() { + qWarning() << " ."; + qWarning() << " slotXFaderModeToggled"; + qWarning() << " ."; m_xFaderMode = radioButtonConstantPower->isChecked() ? MIXXX_XFADER_CONSTPWR : MIXXX_XFADER_ADDITIVE; @@ -995,6 +1020,9 @@ void DlgPrefMixer::slotXFaderModeToggled() { } void DlgPrefMixer::slotXFaderControlChanged() { + qWarning() << " ."; + qWarning() << " slotXFaderControlChanged"; + qWarning() << " ."; m_xFaderTransform = m_xfCurveCO->get(); m_xFaderCal = m_xfCalibrationCO->get(); m_xFaderMode = static_cast(m_xfModeCO->get());