Skip to content

add option to generate waveforms on analysis #998

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

Merged
daschuer merged 3 commits into from
Sep 4, 2016
Merged

add option to generate waveforms on analysis #998

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
cc48f7c
add option to generate waveforms on analysis
Be-ing Sep 2, 2016
f6b747d
more consistent naming for enabling waveform generation with analysis…
Be-ing Sep 3, 2016
9864b3e
more consistent capitalization in waveform preferences dialog
Be-ing Sep 3, 2016
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
3 changes: 3 additions & 0 deletions src/analyzer/analyzerqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@ AnalyzerQueue* AnalyzerQueue::createAnalysisFeatureAnalyzerQueue(
UserSettingsPointer pConfig, TrackCollection* pTrackCollection) {
AnalyzerQueue* ret = new AnalyzerQueue(pTrackCollection);

if (pConfig->getValue<bool>(ConfigKey("[Library]", "EnableWaveformGenerationWithAnalysis"))) {
Copy link
Copy Markdown
Contributor Author

@Be-ing Be-ing Sep 4, 2016

Choose a reason for hiding this comment

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

This is a very long name, but it is clear. Anyone have a suggestion for a shorter name that is still clear?

ret->addAnalyzer(new AnalyzerWaveform(pConfig));
}
ret->addAnalyzer(new AnalyzerGain(pConfig));
ret->addAnalyzer(new AnalyzerEbur128(pConfig));
#ifdef __VAMP__
Expand Down
5 changes: 5 additions & 0 deletions src/preferences/dialog/dlgprefwaveform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,16 @@ void DlgPrefWaveform::slotUpdate() {

WaveformSettings waveformSettings(m_pConfig);
enableWaveformCaching->setChecked(waveformSettings.waveformCachingEnabled());
enableWaveformGenerationWithAnalysis->setChecked(
waveformSettings.waveformGenerationWithAnalysisEnabled());
calculateCachedWaveformDiskUsage();
}

void DlgPrefWaveform::slotApply() {
WaveformSettings waveformSettings(m_pConfig);
waveformSettings.setWaveformCachingEnabled(enableWaveformCaching->isChecked());
waveformSettings.setWaveformGenerationWithAnalysisEnabled(
enableWaveformGenerationWithAnalysis->isChecked());
}

void DlgPrefWaveform::slotResetToDefaults() {
Expand Down Expand Up @@ -154,6 +158,7 @@ void DlgPrefWaveform::slotResetToDefaults() {

// Waveform caching enabled.
enableWaveformCaching->setChecked(true);
enableWaveformGenerationWithAnalysis->setChecked(false);
}

void DlgPrefWaveform::slotSetFrameRate(int frameRate) {
Expand Down
31 changes: 19 additions & 12 deletions src/preferences/dialog/dlgprefwaveformdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>536</width>
<height>390</height>
<height>445</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -422,7 +422,14 @@
</item>
<item row="8" column="1" colspan="3">
<layout class="QGridLayout" name="cachingGridLayout">
<item row="1" column="0" colspan="2">
<item row="3" column="1">
<widget class="QPushButton" name="clearCachedWaveforms">
<property name="text">
<string>Clear Cached Waveforms</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="waveformCachingInfo">
<property name="text">
<string>Mixxx caches the waveforms of your tracks on disk the first time you load a track. This reduces CPU usage when you are playing live but requires extra disk space.</string>
Expand All @@ -432,27 +439,27 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="clearCachedWaveforms">
<item row="3" column="0">
<widget class="QLabel" name="waveformDiskUsage">
<property name="text">
<string>Clear Cached Waveforms</string>
<string notr="true">PLACEHOLDER FOR DISK USAGE</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="enableWaveformCaching">
<property name="text">
<string>Enable Waveform Caching</string>
<string>Enable waveform caching</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="waveformDiskUsage">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="enableWaveformGenerationWithAnalysis">
<property name="text">
<string notr="true">PLACEHOLDER FOR DISK USAGE</string>
</property>
<property name="wordWrap">
<bool>true</bool>
<string>Generate waveforms when analyzing library</string>
</property>
</widget>
</item>
Expand Down
10 changes: 10 additions & 0 deletions src/preferences/waveformsettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ class WaveformSettings {
ConfigKey("[Library]", "EnableWaveformCaching"), enabled);
}

bool waveformGenerationWithAnalysisEnabled() const {
return m_pConfig->getValue<bool>(
ConfigKey("[Library]", "EnableWaveformGenerationWithAnalysis"), true);
}

void setWaveformGenerationWithAnalysisEnabled(bool enabled) {
m_pConfig->setValue<bool>(
ConfigKey("[Library]", "EnableWaveformGenerationWithAnalysis"), enabled);
}

private:
UserSettingsPointer m_pConfig;
};
Expand Down