Actually check if songs are available

This commit is contained in:
Flamefire committed 2014-03-19 14:54:57 +01:00
1 parent ba4888d63d
commit 2e14767e77
1 file changed
+2 -5
+2 -5
View File
@@ -138,16 +138,13 @@ namespace Vocaluxe.Base
_Volume = CConfig.BackgroundMusicVolume; _Volume = CConfig.BackgroundMusicVolume;
_VideoEnabled = (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON); _VideoEnabled = (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON);
_MusicSource = CConfig.BackgroundMusicSource; SetMusicSource(CConfig.BackgroundMusicSource);
List<string> soundFiles = CHelper.ListSoundFiles(CSettings.FolderBackgroundMusic, true, true); List<string> soundFiles = CHelper.ListSoundFiles(CSettings.FolderBackgroundMusic, true, true);
foreach (string path in soundFiles) foreach (string path in soundFiles)
_BGMusicFiles.Add(new CPlaylistElement(path)); _BGMusicFiles.Add(new CPlaylistElement(path));
if (_MusicSource != EBackgroundMusicSource.TR_CONFIG_ONLY_OWN_MUSIC)
_AddBackgroundMusic();
IsPlaying = false; IsPlaying = false;
_Initialized = true; _Initialized = true;
} }
@@ -355,7 +352,7 @@ namespace Vocaluxe.Base
private static void _AddOwnMusic() private static void _AddOwnMusic()
{ {
if (_OwnMusicAdded) if (_OwnMusicAdded || !_OwnSongsAvailable)
return; return;
foreach (CSong song in CSongs.AllSongs) foreach (CSong song in CSongs.AllSongs)
_NotPlayedFiles.Add(new CPlaylistElement(song)); _NotPlayedFiles.Add(new CPlaylistElement(song));