summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/controllers/dlgprefcontroller.h6
-rw-r--r--src/controllers/hid/hidcontrollerpreset.h6
-rw-r--r--src/controllers/midi/midicontrollerpreset.h6
-rw-r--r--src/preferences/dialog/dlgprefautodj.h8
-rw-r--r--src/preferences/dialog/dlgprefbeats.h6
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.h6
-rw-r--r--src/preferences/dialog/dlgprefcolors.h6
-rw-r--r--src/preferences/dialog/dlgprefdeck.h6
-rw-r--r--src/preferences/dialog/dlgprefeffects.h6
-rw-r--r--src/preferences/dialog/dlgprefeq.h6
-rw-r--r--src/preferences/dialog/dlgprefkey.h6
-rw-r--r--src/preferences/dialog/dlgpreflv2.h6
-rw-r--r--src/preferences/dialog/dlgprefmodplug.h7
-rw-r--r--src/preferences/dialog/dlgprefrecord.h6
-rw-r--r--src/preferences/dialog/dlgprefreplaygain.h6
-rw-r--r--src/preferences/dialog/dlgprefsound.h6
-rw-r--r--src/preferences/dialog/dlgprefvinyl.h10
-rw-r--r--src/preferences/dialog/dlgprefwaveform.h6
-rw-r--r--src/track/serato/tags.cpp2
19 files changed, 59 insertions, 58 deletions
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 17e0d2c834..c50bffe6a3 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -33,11 +33,11 @@ class DlgPrefController : public DlgPreferencePage {
public slots:
/// Called when the preference dialog (not this page) is shown to the user.
- void slotUpdate();
+ void slotUpdate() override;
/// Called when the user clicks the global "Apply" button.
- void slotApply();
+ void slotApply() override;
/// Called when the user clicks the global "Reset to Defaults" button.
- void slotResetToDefaults();
+ void slotResetToDefaults() override;
QUrl helpUrl() const override;
diff --git a/src/controllers/hid/hidcontrollerpreset.h b/src/controllers/hid/hidcontrollerpreset.h
index 77cfc7f34b..93108f4304 100644
--- a/src/controllers/hid/hidcontrollerpreset.h
+++ b/src/controllers/hid/hidcontrollerpreset.h
@@ -15,7 +15,7 @@ class HidControllerPreset : public ControllerPreset {
bool savePreset(const QString& fileName) const override;
- virtual void accept(ControllerPresetVisitor* visitor);
- virtual void accept(ConstControllerPresetVisitor* visitor) const;
- virtual bool isMappable() const;
+ void accept(ControllerPresetVisitor* visitor) override;
+ void accept(ConstControllerPresetVisitor* visitor) const override;
+ bool isMappable() const override;
};
diff --git a/src/controllers/midi/midicontrollerpreset.h b/src/controllers/midi/midicontrollerpreset.h
index 530e1e3495..3b6534b2ca 100644
--- a/src/controllers/midi/midicontrollerpreset.h
+++ b/src/controllers/midi/midicontrollerpreset.h
@@ -19,9 +19,9 @@ class MidiControllerPreset : public ControllerPreset {
bool savePreset(const QString& fileName) const override;
- virtual void accept(ControllerPresetVisitor* visitor);
- virtual void accept(ConstControllerPresetVisitor* visitor) const;
- virtual bool isMappable() const;
+ virtual void accept(ControllerPresetVisitor* visitor) override;
+ virtual void accept(ConstControllerPresetVisitor* visitor) const override;
+ virtual bool isMappable() const override;
// Input mappings
void addInputMapping(uint16_t key, MidiInputMapping mapping);
diff --git a/src/preferences/dialog/dlgprefautodj.h b/src/preferences/dialog/dlgprefautodj.h
index e0838c2d13..1be7440ca0 100644
--- a/src/preferences/dialog/dlgprefautodj.h
+++ b/src/preferences/dialog/dlgprefautodj.h
@@ -14,10 +14,10 @@ class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg {
virtual ~DlgPrefAutoDJ();
public slots:
- void slotUpdate();
- void slotApply();
- void slotResetToDefaults();
- void slotCancel() ;
+ void slotUpdate() override;
+ void slotApply() override;
+ void slotResetToDefaults() override;
+ void slotCancel() override;
private slots:
void slotSetAutoDjMinimumAvailable(int);
diff --git a/src/preferences/dialog/dlgprefbeats.h b/src/preferences/dialog/dlgprefbeats.h
index aaed9daf62..2e09913297 100644
--- a/src/preferences/dialog/dlgprefbeats.h
+++ b/src/preferences/dialog/dlgprefbeats.h
@@ -25,9 +25,9 @@ class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
public slots:
// Apply changes to widget
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
private slots:
void pluginSelected(int i);
diff --git a/src/preferences/dialog/dlgprefbroadcast.h b/src/preferences/dialog/dlgprefbroadcast.h
index cfaabf7ede..4e55b89722 100644
--- a/src/preferences/dialog/dlgprefbroadcast.h
+++ b/src/preferences/dialog/dlgprefbroadcast.h
@@ -25,9 +25,9 @@ class DlgPrefBroadcast : public DlgPreferencePage, public Ui::DlgPrefBroadcastDl
public slots:
/** Apply changes to widget */
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
void broadcastEnabledChanged(double value);
void checkBoxEnableReconnectChanged(int value);
void checkBoxLimitReconnectsChanged(int value);
diff --git a/src/preferences/dialog/dlgprefcolors.h b/src/preferences/dialog/dlgprefcolors.h
index 029894af90..c148968d4c 100644
--- a/src/preferences/dialog/dlgprefcolors.h
+++ b/src/preferences/dialog/dlgprefcolors.h
@@ -21,11 +21,11 @@ class DlgPrefColors : public DlgPreferencePage, public Ui::DlgPrefColorsDlg {
public slots:
/// Called when the preference dialog (not this page) is shown to the user.
- void slotUpdate();
+ void slotUpdate() override;
/// Called when the user clicks the global "Apply" button.
- void slotApply();
+ void slotApply() override;
/// Called when the user clicks the global "Reset to Defaults" button.
- void slotResetToDefaults();
+ void slotResetToDefaults() override;
signals:
void apply(const QString&);
diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h
index ff28b4d677..41788ab9cf 100644
--- a/src/preferences/dialog/dlgprefdeck.h
+++ b/src/preferences/dialog/dlgprefdeck.h
@@ -61,9 +61,9 @@ class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg {
virtual ~DlgPrefDeck();
public slots:
- void slotUpdate();
- void slotApply();
- void slotResetToDefaults();
+ void slotUpdate() override;
+ void slotApply() override;
+ void slotResetToDefaults() override;
void slotMoveIntroStartCheckbox(bool checked);
void slotRateRangeComboBox(int index);
diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h
index 5665c5f5a0..c9d6b034ea 100644
--- a/src/preferences/dialog/dlgprefeffects.h
+++ b/src/preferences/dialog/dlgprefeffects.h
@@ -16,9 +16,9 @@ class DlgPrefEffects : public DlgPreferencePage, public Ui::DlgPrefEffectsDlg {
EffectsManager* pEffectsManager);
virtual ~DlgPrefEffects();
- void slotUpdate();
- void slotApply();
- void slotResetToDefaults();
+ void slotUpdate() override;
+ void slotApply() override;
+ void slotResetToDefaults() override;
private slots:
void availableEffectsListItemSelected(const QModelIndex& selected);
diff --git a/src/preferences/dialog/dlgprefeq.h b/src/preferences/dialog/dlgprefeq.h
index 790f5e6669..d4a4b8493f 100644
--- a/src/preferences/dialog/dlgprefeq.h
+++ b/src/preferences/dialog/dlgprefeq.h
@@ -55,9 +55,9 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg {
// Update Lo EQ
void slotUpdateLoEQ();
// Apply changes to widget
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
void slotUpdateEqAutoReset(int);
void slotUpdateGainAutoReset(int);
void slotBypass(int state);
diff --git a/src/preferences/dialog/dlgprefkey.h b/src/preferences/dialog/dlgprefkey.h
index 7310dbec8a..f25c6ff68d 100644
--- a/src/preferences/dialog/dlgprefkey.h
+++ b/src/preferences/dialog/dlgprefkey.h
@@ -24,9 +24,9 @@ class DlgPrefKey : public DlgPreferencePage, Ui::DlgPrefKeyDlg {
public slots:
// Apply changes to widget
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
private slots:
void pluginSelected(int i);
diff --git a/src/preferences/dialog/dlgpreflv2.h b/src/preferences/dialog/dlgpreflv2.h
index 0498e6d6c4..ff38c07020 100644
--- a/src/preferences/dialog/dlgpreflv2.h
+++ b/src/preferences/dialog/dlgpreflv2.h
@@ -20,11 +20,11 @@ class DlgPrefLV2 : public DlgPreferencePage, public Ui::DlgPrefLV2Dlg {
public slots:
/// Called when the preference dialog (not this page) is shown to the user.
- void slotUpdate();
+ void slotUpdate() override;
/// Called when the user clicks the global "Apply" button.
- void slotApply();
+ void slotApply() override;
/// Called when the user clicks the global "Reset to Defaults" button.
- void slotResetToDefaults();
+ void slotResetToDefaults() override;
private slots:
void slotDisplayParameters();
diff --git a/src/preferences/dialog/dlgprefmodplug.h b/src/preferences/dialog/dlgprefmodplug.h
index a66ec132ad..87b967c889 100644
--- a/src/preferences/dialog/dlgprefmodplug.h
+++ b/src/preferences/dialog/dlgprefmodplug.h
@@ -20,10 +20,9 @@ class DlgPrefModplug : public DlgPreferencePage {
virtual ~DlgPrefModplug();
public slots:
- /** Apply changes to widget */
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
void loadSettings();
void saveSettings();
diff --git a/src/preferences/dialog/dlgprefrecord.h b/src/preferences/dialog/dlgprefrecord.h
index 72707cbd7f..f07f8b25e5 100644
--- a/src/preferences/dialog/dlgprefrecord.h
+++ b/src/preferences/dialog/dlgprefrecord.h
@@ -21,9 +21,9 @@ class DlgPrefRecord : public DlgPreferencePage, public Ui::DlgPrefRecordDlg {
public slots:
// Apply changes to widget
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
// Dialog to browse for recordings directory
void slotBrowseRecordingsDir();
diff --git a/src/preferences/dialog/dlgprefreplaygain.h b/src/preferences/dialog/dlgprefreplaygain.h
index 5549253e46..7204f12302 100644
--- a/src/preferences/dialog/dlgprefreplaygain.h
+++ b/src/preferences/dialog/dlgprefreplaygain.h
@@ -24,9 +24,9 @@ class DlgPrefReplayGain: public DlgPreferencePage,
void slotSetRGAnalyzerChanged();
void slotSetReanalyze();
- void slotApply();
- void slotUpdate();
- void slotResetToDefaults();
+ void slotApply() override;
+ void slotUpdate() override;
+ void slotResetToDefaults() override;
signals:
void apply(const QString &);
diff --git a/src/preferences/dialog/dlgprefsound.h b/src/preferences/dialog/dlgprefsound.h
index 99547f2afa..cd2ae7cb6a 100644
--- a/src/preferences/dialog/dlgprefsound.h
+++ b/src/preferences/dialog/dlgprefsound.h
@@ -59,9 +59,9 @@ class DlgPrefSound : public DlgPreferencePage, public Ui::DlgPrefSoundDlg {
void updatedAPI();
public slots:
- void slotUpdate(); // called on show
- void slotApply(); // called on ok button
- void slotResetToDefaults();
+ void slotUpdate() override; // called on show
+ void slotApply() override; // called on ok button
+ void slotResetToDefaults() override;
void bufferUnderflow(double count);
void masterLatencyChanged(double latency);
void latencyCompensationSpinboxChanged(double value);
diff --git a/src/preferences/dialog/dlgprefvinyl.h b/src/preferences/dialog/dlgprefvinyl.h
index b3daa7f4df..4da8210002 100644
--- a/src/preferences/dialog/dlgprefvinyl.h
+++ b/src/preferences/dialog/dlgprefvinyl.h
@@ -37,12 +37,12 @@ class DlgPrefVinyl : public DlgPreferencePage, Ui::DlgPrefVinylDlg {
QUrl helpUrl() const override;
public slots:
- void slotUpdate();
- void slotApply();
- void slotResetToDefaults();
+ void slotUpdate() override;
+ void slotApply() override;
+ void slotResetToDefaults() override;
- void slotHide();
- void slotShow();
+ void slotHide() override;
+ void slotShow() override;
void VinylTypeSlotApply();
void slotVinylGainApply();
void slotUpdateVinylGain();
diff --git a/src/preferences/dialog/dlgprefwaveform.h b/src/preferences/dialog/dlgprefwaveform.h
index d1cb7ebbd0..c6a0a652e5 100644
--- a/src/preferences/dialog/dlgprefwaveform.h
+++ b/src/preferences/dialog/dlgprefwaveform.h
@@ -18,9 +18,9 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
virtual ~DlgPrefWaveform();
public slots:
- void slotUpdate();
- void slotApply();
- void slotResetToDefaults();
+ void slotUpdate() override;
+ void slotApply() override;
+ void slotResetToDefaults() override;
void slotSetWaveformEndRender(int endTime);
private slots:
diff --git a/src/track/serato/tags.cpp b/src/track/serato/tags.cpp
index 0409a9c26a..ae64668d8a 100644
--- a/src/track/serato/tags.cpp
+++ b/src/track/serato/tags.cpp
@@ -155,6 +155,8 @@ double SeratoTags::guessTimingOffsetMillis(
double timingOffset = 0;
if (taglib::getFileTypeFromFileName(filePath) == taglib::FileType::MP3) {
#if defined(__COREAUDIO__)
+ Q_UNUSED(signalInfo);
+
int timingShiftCase = mp3guessenc_timing_shift_case(filePath.toStdString().c_str());
// TODO: Find missing timing offsets
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 05:43:59 +0000