Merge remote-tracking branch 'remotes/flokuep/release-0.3' into develop

Conflicts:
	Vocaluxe/Base/CDataBase.cs

VocaluxeLib/Songs/CSong.cs

@@ -147,6 +147,10 @@ namespace VocaluxeLib.Songs
 
         public readonly List<string> Language = new List<string>();
 
+        public int DataBaseSongID = -1;
+        public string DateAdded = "";
+        public int NumPlayed = 0;
+
         // Notes
         public readonly CNotes Notes = new CNotes();
 
@@ -240,6 +244,10 @@ namespace VocaluxeLib.Songs
             foreach (string value in song.Language)
                 Language.Add(value);
 
+            DataBaseSongID = song.DataBaseSongID;
+            DateAdded = song.DateAdded;
+            NumPlayed = song.NumPlayed;
+
             Notes = new CNotes(song.Notes);
         }
 
@@ -353,10 +361,12 @@ namespace VocaluxeLib.Songs
                                 if (value != "")
                                     ArtistSorting = value;
                                 break;
+                            case "DUETSINGERP1":
                             case "P1":
                                 if (value != "")
                                     DuetPart1 = value;
                                 break;
+                            case "DUETSINGERP2":
                             case "P2":
                                 if (value != "")
                                     DuetPart2 = value;
@@ -528,6 +538,8 @@ namespace VocaluxeLib.Songs
             sr.Dispose();
             _CheckFiles();
 
+            CBase.DataBase.GetDataBaseSongInfos(Artist, Title, out NumPlayed, out DateAdded, out DataBaseSongID);
+
             //Before saving this tags to .txt: Check, if ArtistSorting and Artist are equal, then don't save this tag.
             if (ArtistSorting == "")
                 ArtistSorting = Artist;