[musicdb] adds setting to allow overriding of tag info with online info, defaulting...

diff --git a/language/English/strings.po b/language/English/strings.po
index 504bd77..80c02aa 100755 (executable)
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -9635,8 +9635,20 @@ msgctxt "#20199"
 msgid "Downloading artist info failed"
 msgstr ""
 
-#empty strings from id 20200 to 20239
 #string id's 20200 thru 20211 are reserved for speedstrings (LocalizeStrings.cpp)
+#empty strings from id 20212 to 20219
+
+#: system/settings/settings.xml
+msgctxt "#20220"
+msgid "Override song tags with online information"
+msgstr ""
+
+#: system/settings/settings.xml
+msgctxt "#20221"
+msgid "With this enabled, any information that is downloaded for albums and artists will override anything you have set in your song tags, such as genres, year, song artists etc. Useful if you have MusicBrainz identifiers in your song tags."
+msgstr ""
+
+#empty strings from id 20222 to 20239
 
 #: xbmc/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#20240"

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index ab1d267..799fe16 100644 (file)
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -1312,6 +1312,11 @@
           </constraints>
           <control type="button" format="addon" />
         </setting>
+        <setting id="musiclibrary.overridetags" type="boolean" label="20220" help="20221">
+          <level>1</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
         <setting id="musiclibrary.updateonstartup" type="boolean" label="22000" help="36259">
           <level>1</level>
           <default>false</default>

diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
index 52eea47..53f090e 100644 (file)
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -922,7 +922,7 @@ loop:
   }
   else if (albumDownloadStatus == INFO_ADDED)
   {
-    album.MergeScrapedAlbum(albumInfo.GetAlbum());
+    album.MergeScrapedAlbum(albumInfo.GetAlbum(), CSettings::Get().GetBool("musiclibrary.overridetags"));
     m_musicDatabase.Open();
     m_musicDatabase.UpdateAlbum(album);
     GetAlbumArtwork(album.idAlbum, album);
@@ -953,7 +953,7 @@ loop:
   }
   else if (artistDownloadStatus == INFO_ADDED)
   {
-    artist.MergeScrapedArtist(artistInfo.GetArtist());
+    artist.MergeScrapedArtist(artistInfo.GetArtist(), CSettings::Get().GetBool("musiclibrary.overridetags"));
     m_musicDatabase.Open();
     m_musicDatabase.UpdateArtist(artist);
     m_musicDatabase.GetArtistPath(artist.idArtist, artist.strPath);