summaryrefslogtreecommitdiffstats
path: root/src/sources
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-05-13 18:05:02 +0200
committerUwe Klotz <uklotz@mixxx.org>2021-05-13 18:53:56 +0200
commit788b3a361f20f82ffa4574ccdf56c059302d5ea8 (patch)
tree57a57db9e74b6ab56a0de14b8483d1a2706b4e7d /src/sources
parentf4182250475974575487220233bd464769ce513d (diff)
Track metadata import/update: Rename enumeration
Diffstat (limited to 'src/sources')
-rw-r--r--src/sources/soundsourceproxy.cpp6
-rw-r--r--src/sources/soundsourceproxy.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/sources/soundsourceproxy.cpp b/src/sources/soundsourceproxy.cpp
index 3d6cdaa30f..7893f67037 100644
--- a/src/sources/soundsourceproxy.cpp
+++ b/src/sources/soundsourceproxy.cpp
@@ -513,7 +513,7 @@ SoundSourceProxy::importTrackMetadataAndCoverImage(
}
void SoundSourceProxy::updateTrackFromSource(
- ImportTrackMetadataMode importTrackMetadataMode) {
+ UpdateTrackFromSourceMode mode) {
DEBUG_ASSERT(m_pTrack);
if (getUrl().isEmpty()) {
@@ -543,8 +543,7 @@ void SoundSourceProxy::updateTrackFromSource(
// if the user did not explicitly choose to (re-)import metadata
// explicitly from this file.
bool mergeImportedMetadata = false;
- if (metadataSynchronized &&
- (importTrackMetadataMode == ImportTrackMetadataMode::Once)) {
+ if (metadataSynchronized && mode == UpdateTrackFromSourceMode::Once) {
// No (re-)import needed or desired, only merge missing properties
mergeImportedMetadata = true;
}
@@ -707,7 +706,6 @@ void SoundSourceProxy::updateTrackFromSource(
DEBUG_ASSERT(coverInfo.source == CoverInfo::GUESSED);
m_pTrack->setCoverInfo(coverInfo);
}
-
}
mixxx::AudioSourcePointer SoundSourceProxy::openAudioSource(
diff --git a/src/sources/soundsourceproxy.h b/src/sources/soundsourceproxy.h
index 02594658a7..485daacd40 100644
--- a/src/sources/soundsourceproxy.h
+++ b/src/sources/soundsourceproxy.h
@@ -105,7 +105,7 @@ class SoundSourceProxy {
/// Controls which (metadata/coverart) and how tags are (re-)imported from
/// audio files when creating a SoundSourceProxy.
- enum class ImportTrackMetadataMode {
+ enum class UpdateTrackFromSourceMode {
// Import both track metadata and cover image once for new track objects.
// Otherwise the request is ignored and the track object is not modified.
Once,
@@ -140,7 +140,7 @@ class SoundSourceProxy {
/// properly. The application log will contain warning messages for a detailed
/// analysis in case unexpected behavior has been reported.
void updateTrackFromSource(
- ImportTrackMetadataMode importTrackMetadataMode = ImportTrackMetadataMode::Default);
+ UpdateTrackFromSourceMode mode = UpdateTrackFromSourceMode::Default);
/// Opening the audio source through the proxy will update the
/// audio properties of the corresponding track object. Returns