summaryrefslogtreecommitdiffstats
path: root/src/sources
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-05-15 15:54:28 +0200
committerUwe Klotz <uklotz@mixxx.org>2021-05-15 16:14:52 +0200
commit36d0cf6f47eda4966215c8acca0e86776c7ad5f3 (patch)
tree3aed2fcbcfb34cd51f83e7bc8dbf781c0ccaac5c /src/sources
parent1a84a44dde020dc1020cd523570d7075db5dbc12 (diff)
Track: Rename member functions for imported metadata
Diffstat (limited to 'src/sources')
-rw-r--r--src/sources/soundsourceproxy.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sources/soundsourceproxy.cpp b/src/sources/soundsourceproxy.cpp
index 598e617297..bf44cea95d 100644
--- a/src/sources/soundsourceproxy.cpp
+++ b/src/sources/soundsourceproxy.cpp
@@ -546,10 +546,10 @@ bool SoundSourceProxy::updateTrackFromSource(
// existing track metadata should not be updated implicitly, i.e.
// if the user did not explicitly choose to (re-)import metadata
// explicitly from this file.
- bool mergeImportedMetadata = false;
+ bool mergeExtraMetadataFromSource = false;
if (metadataSynchronized && mode == UpdateTrackFromSourceMode::Once) {
// No (re-)import needed or desired, only merge missing properties
- mergeImportedMetadata = true;
+ mergeExtraMetadataFromSource = true;
}
// Save for later to replace the unreliable and imprecise audio
@@ -562,7 +562,7 @@ bool SoundSourceProxy::updateTrackFromSource(
QImage coverImg;
DEBUG_ASSERT(coverImg.isNull());
QImage* pCoverImg = nullptr; // pointer also serves as a flag
- if (!mergeImportedMetadata) {
+ if (!mergeExtraMetadataFromSource) {
const auto coverInfo = m_pTrack->getCoverInfo();
if (coverInfo.source == CoverInfo::USER_SELECTED &&
coverInfo.type == CoverInfo::FILE) {
@@ -593,13 +593,13 @@ bool SoundSourceProxy::updateTrackFromSource(
}
// Partial import
- if (mergeImportedMetadata) {
+ if (mergeExtraMetadataFromSource) {
// No reimport of embedded cover image desired in this case
DEBUG_ASSERT(!pCoverImg);
if (metadataImported.first == mixxx::MetadataSource::ImportResult::Succeeded) {
// Partial import of properties that are not (yet) stored
// in the database
- return m_pTrack->mergeImportedMetadata(trackMetadata);
+ return m_pTrack->mergeExtraMetadataFromSource(trackMetadata);
} else {
// Nothing to do if no metadata has been imported
return false;