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

add AutoDJ xfader recenter option (default off) #13303

Merged
merged 3 commits into from
Jun 6, 2024
Merged

add AutoDJ xfader recenter option (default off) #13303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
113c113
Pref AutoDJ: simplify, remove temp config settings
ronso0 May 28, 2024
00de96b
AutoDJ: add option for xfader auto-recenter after disabling
ronso0 May 29, 2024
77459a0
Pref AutoDJ: simplify setting the time
ronso0 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/library/autodj/autodjprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,10 @@ AutoDJProcessor::AutoDJError AutoDJProcessor::toggleAutoDJ(bool enable) {
for (const auto& pDeck : std::as_const(m_decks)) {
pDeck->disconnect(this);
}
if (m_pConfig->getValue<bool>(ConfigKey(kConfigKey,
QStringLiteral("center_xfader_when_disabling")))) {
m_pCOCrossfader->set(0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it make more sense to set use crossfader_set_default here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, butfor that we'd need another control, either via ControlObject::get() or another member.
I'd prefer to stick to the crossfader CO.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair. I just thought the _set_default was more expressive.

}
emitAutoDJStateChanged(m_eState);
}
return ADJ_OK;
Expand Down
161 changes: 42 additions & 119 deletions src/preferences/dialog/dlgprefautodj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,181 +8,104 @@ DlgPrefAutoDJ::DlgPrefAutoDJ(QWidget* pParent,
m_pConfig(pConfig) {
setupUi(this);

// The auto-DJ replay-age for randomly-selected tracks
connect(RequeueIgnoreCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefAutoDJ::slotToggleRequeueIgnore);

// Auto DJ random enqueue
connect(RandomQueueCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefAutoDJ::slotToggleRandomQueue);

setScrollSafeGuardForAllInputWidgets(this);
}

void DlgPrefAutoDJ::slotUpdate() {
// The minimum available for randomly-selected tracks
MinimumAvailableSpinBox->setValue(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "MinimumAvailable"), 20));
connect(MinimumAvailableSpinBox,
QOverload<int>::of(&QSpinBox::valueChanged),
this,
&DlgPrefAutoDJ::slotSetMinimumAvailable);

// The auto-DJ replay-age for randomly-selected tracks
RequeueIgnoreCheckBox->setChecked(m_pConfig->getValue(
ConfigKey("[Auto DJ]", "UseIgnoreTime"), false));
connect(RequeueIgnoreCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefAutoDJ::slotToggleRequeueIgnore);
RequeueIgnoreTimeEdit->setTime(
QTime::fromString(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "IgnoreTime"), "23:59"),
RequeueIgnoreTimeEdit->displayFormat()));
RequeueIgnoreTimeEdit->setEnabled(
RequeueIgnoreCheckBox->checkState() == Qt::Checked);
connect(RequeueIgnoreTimeEdit,
&QTimeEdit::timeChanged,
this,
&DlgPrefAutoDJ::slotSetRequeueIgnoreTime);

// Auto DJ random enqueue
RandomQueueCheckBox->setChecked(m_pConfig->getValue(
ConfigKey("[Auto DJ]", "EnableRandomQueue"), false));
// 5-arbitrary

RandomQueueMinimumSpinBox->setValue(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "RandomQueueMinimumAllowed"), 5));
// "[Auto DJ], Requeue" is set by 'Repeat Playlist' toggle in DlgAutoDj GUI.
// If it's checked un-check 'Random Queue'
slotConsiderRepeatPlaylistState(
// TODO Add 'Repeat' checkbox here, or add a hint why the checkbox may be disabled
considerRepeatPlaylistState(
m_pConfig->getValue<bool>(ConfigKey("[Auto DJ]", "Requeue")));
slotToggleRandomQueue(
m_pConfig->getValue<bool>(
ConfigKey("[Auto DJ]", "EnableRandomQueue"))
? Qt::Checked
: Qt::Unchecked);
// Be ready to enable and modify the minimum number and un/check the checkbox
connect(RandomQueueCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefAutoDJ::slotToggleRandomQueue);
connect(RandomQueueMinimumSpinBox,
QOverload<int>::of(&QSpinBox::valueChanged),
this,
&DlgPrefAutoDJ::slotSetRandomQueueMin);

setScrollSafeGuardForAllInputWidgets(this);
}

void DlgPrefAutoDJ::slotUpdate() {
// Re-center the crossfader instantly when AutoDJ is disabled
CenterXfaderCheckBox->setChecked(m_pConfig->getValue(
ConfigKey("[Auto DJ]", "center_xfader_when_disabling"), false));
Comment on lines +62 to +63
Copy link
Member

@Swiftb0y Swiftb0y May 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be nice if these defaults were constexpr statics. Currently they're duplicated a bunch of times.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jep, moving all repeatedly used pref ConfigKeys (preferences, and respective engine units) to other files.
I have some changes stashed already, but I prefer to do that in a separate PR.

}

void DlgPrefAutoDJ::slotApply() {
//Copy from Buffer to actual values
m_pConfig->setValue(ConfigKey("[Auto DJ]","MinimumAvailable"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "MinimumAvailableBuff"), 20));
m_pConfig->setValue(ConfigKey("[Auto DJ]", "MinimumAvailable"),
MinimumAvailableSpinBox->value());

m_pConfig->setValue(ConfigKey("[Auto DJ]", "IgnoreTime"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "IgnoreTimeBuff"), "23:59"));
m_pConfig->setValue(ConfigKey("[Auto DJ]", "UseIgnoreTime"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "UseIgnoreTimeBuff"), false));
RequeueIgnoreCheckBox->isChecked());
const QString ignTimeStr =
RequeueIgnoreTimeEdit->time().toString();
m_pConfig->setValue(ConfigKey("[Auto DJ]", "IgnoreTime"), ignTimeStr);

m_pConfig->setValue(ConfigKey("[Auto DJ]", "RandomQueueMinimumAllowed"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "RandomQueueMinimumAllowedBuff"), 5));
m_pConfig->setValue(ConfigKey("[Auto DJ]", "EnableRandomQueue"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "EnableRandomQueueBuff"), false));
}

void DlgPrefAutoDJ::slotCancel() {
// Load actual values and reset Buffer Values where ever needed
MinimumAvailableSpinBox->setValue(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "MinimumAvailable"), 20));
RandomQueueCheckBox->isChecked());
m_pConfig->setValue(
ConfigKey("[Auto DJ]", "RandomQueueMinimumAllowed"),
RandomQueueMinimumSpinBox->value());

RequeueIgnoreTimeEdit->setTime(
QTime::fromString(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "IgnoreTime"), "23:59"),
RequeueIgnoreTimeEdit->displayFormat()));
RequeueIgnoreCheckBox->setChecked(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "UseIgnoreTime"), false));
RequeueIgnoreTimeEdit->setEnabled(
RequeueIgnoreCheckBox->checkState() == Qt::Checked);
m_pConfig->setValue(ConfigKey("[Auto DJ]", "UseIgnoreTimeBuff"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "UseIgnoreTime"), false));

RandomQueueMinimumSpinBox->setValue(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "RandomQueueMinimumAllowed"), 5));
RandomQueueCheckBox->setChecked(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "EnableRandomQueue"), false));
m_pConfig->setValue(ConfigKey("[Auto DJ]", "EnableRandomQueueBuff"),
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "EnableRandomQueue"), false));
slotToggleRandomQueue(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "EnableRandomQueue"), false)
? Qt::Checked
: Qt::Unchecked);
slotToggleRandomQueue(
m_pConfig->getValue<bool>(ConfigKey("[Auto DJ]", "Requeue")));
m_pConfig->setValue(ConfigKey("[Auto DJ]", "center_xfader_when_disabling"),
CenterXfaderCheckBox->isChecked());
}

void DlgPrefAutoDJ::slotResetToDefaults() {
// Re-queue tracks in AutoDJ
MinimumAvailableSpinBox->setValue(20);

RequeueIgnoreTimeEdit->setTime(QTime::fromString(
"23:59", RequeueIgnoreTimeEdit->displayFormat()));
RequeueIgnoreCheckBox->setChecked(false);
m_pConfig->setValue(ConfigKey("[Auto DJ]", "UseIgnoreTimeBuff"), false);
RequeueIgnoreTimeEdit->setEnabled(false);
RequeueIgnoreTimeEdit->setTime(QTime::fromString("23:59"));

RandomQueueMinimumSpinBox->setValue(5);
RandomQueueCheckBox->setChecked(false);
m_pConfig->setValue(ConfigKey("[Auto DJ]", "EnableRandomQueueBuff"), false);
RandomQueueMinimumSpinBox->setEnabled(false);
RandomQueueCheckBox->setEnabled(true);
}
RandomQueueMinimumSpinBox->setEnabled(false);
RandomQueueMinimumSpinBox->setValue(5);

void DlgPrefAutoDJ::slotSetMinimumAvailable(int a_iValue) {
m_pConfig->setValue(ConfigKey("[Auto DJ]", "MinimumAvailableBuff"), a_iValue);
CenterXfaderCheckBox->setChecked(false);
}

void DlgPrefAutoDJ::slotToggleRequeueIgnore(int buttonState) {
bool checked = buttonState == Qt::Checked;
m_pConfig->setValue(ConfigKey("[Auto DJ]", "UseIgnoreTimeBuff"), checked);
RequeueIgnoreTimeEdit->setEnabled(checked);
}

void DlgPrefAutoDJ::slotSetRequeueIgnoreTime(const QTime& a_rTime) {
QString str = a_rTime.toString(RequeueIgnoreTimeEdit->displayFormat());
m_pConfig->set(ConfigKey("[Auto DJ]", "IgnoreTimeBuff"), str);
RequeueIgnoreTimeEdit->setEnabled(buttonState == Qt::Checked);
}

void DlgPrefAutoDJ::slotSetRandomQueueMin(int a_iValue) {
m_pConfig->setValue(ConfigKey("[Auto DJ]", "RandomQueueMinimumAllowedBuff"), a_iValue);
}

void DlgPrefAutoDJ::slotConsiderRepeatPlaylistState(bool enable) {
if (enable) {
// Requeue is enabled
RandomQueueCheckBox->setChecked(false);
// ToDo(ronso0): Redundant? If programmatic checkbox change is signaled
// to slotToggleRandomQueue
RandomQueueMinimumSpinBox->setEnabled(false);
m_pConfig->setValue(ConfigKey("[Auto DJ]", "EnableRandomQueueBuff"),
false);
} else {
RandomQueueMinimumSpinBox->setEnabled(
m_pConfig->getValue(
ConfigKey("[Auto DJ]", "EnableRandomQueueBuff"), false));
}
void DlgPrefAutoDJ::considerRepeatPlaylistState(bool enable) {
RandomQueueMinimumSpinBox->setEnabled(enable);
}

void DlgPrefAutoDJ::slotToggleRandomQueue(int buttonState) {
bool enable = buttonState == Qt::Checked;
// Toggle the option to select minimum tracks
RandomQueueMinimumSpinBox->setEnabled(enable);
m_pConfig->setValue(ConfigKey("[Auto DJ]", "EnableRandomQueueBuff"),
enable);
RandomQueueMinimumSpinBox->setEnabled(buttonState == Qt::Checked);
}
7 changes: 2 additions & 5 deletions src/preferences/dialog/dlgprefautodj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@ class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg {
void slotUpdate() override;
void slotApply() override;
void slotResetToDefaults() override;
void slotCancel() override;

private slots:
void slotSetMinimumAvailable(int);
void slotToggleRequeueIgnore(int buttonState);
void slotSetRequeueIgnoreTime(const QTime& a_rTime);
void slotSetRandomQueueMin(int);
void slotConsiderRepeatPlaylistState(bool);
void slotToggleRandomQueue(int buttonState);

private:
void considerRepeatPlaylistState(bool);

UserSettingsPointer m_pConfig;
};
67 changes: 67 additions & 0 deletions src/preferences/dialog/dlgprefautodjdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,72 @@
</widget>
</item>

<item>
<widget class="QGroupBox" name="CrossfaderBehaviour">
<property name="title">
<string>Crossfader Behaviour</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<layout class="QGridLayout" name="CrossfaderBehaviourLayout">

<item row="0" column="0">
<widget class="QLabel" name="CenterXfaderLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Reset the Crossfader back to center after disabling AutoDJ</string>
</property>
<property name="buddy">
<cstring>CenterXfaderCheckBox</cstring>
</property>
</widget>
</item>

<item row="0" column="1">
<widget class="QCheckBox" name="CenterXfaderCheckBox"/>
</item>

<item row="0" column="2">
<spacer name="horizontalSpacerxfaderbehaviour">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</spacer>
</item>

<item row="1" column="0" colspan="3">
<widget class="QLabel" name="CenterXfaderHintText">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="text">
<string>Hint: Resetting the crossfader to center will cause a drop of the main output's volume if you've selected "Constant Power" crossfader curve in the Mixer preferences.</string>
</property>
</widget>
</item>

</layout>
</widget>
</item>

<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand All @@ -270,5 +336,6 @@
</layout>
</widget>
<resources/>
<!-- tabstops -->
<connections/>
</ui>