Changed ScreenSelectMusic and Song to look for preview.ogg and use it for a sample if it exists instead of the music file. Sample length still comes from simfile. Changed foreach_ordered to work on tables with string and number keys.

2015-03-01 15:40:16 -07:00
parent caa7d12204
commit 9381276fd3
5 changed files with 53 additions and 12 deletions
@@ -1477,6 +1477,26 @@ RString Song::GetPreviewVidPath() const
 	return GetSongAssetPath( m_sPreviewVidFile, m_sSongDir );
 }

+RString Song::GetPreviewMusicPath() const
+{
+	RString preview= GetSongDir() + "preview.ogg";
+	if(FILEMAN->DoesFileExist(preview))
+	{
+		return preview;
+	}
+	return GetMusicPath();
+}
+
+float Song::GetPreviewStartSeconds() const
+{
+	RString preview= GetSongDir() + "preview.ogg";
+	if(FILEMAN->DoesFileExist(preview))
+	{
+		return 0.0f;
+	}
+	return m_fMusicSampleStartSeconds;
+}
+
 RString Song::GetDisplayMainTitle() const
 {
 	if(!PREFSMAN->m_bShowNativeLanguage) return GetTranslitMainTitle();