abstract music completely

This commit is contained in:
Glenn Maynard
2003-01-21 02:16:40 +00:00
parent 749b2f36a7
commit 6cd9b429b7
15 changed files with 32 additions and 31 deletions
+5 -5
View File
@@ -476,7 +476,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
else
if( m_MusicWheel.NextSort() )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
// m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
@@ -568,7 +568,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
}
else
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenStage" );
}
break;
@@ -593,7 +593,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
{
if( m_MusicWheel.NextSort() )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
// m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
@@ -678,7 +678,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
void ScreenSelectMusic::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
@@ -760,7 +760,7 @@ void ScreenSelectMusic::AfterMusicChange()
break;
case TYPE_SONG:
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_fPlaySampleCountdown = SAMPLE_MUSIC_DELAY;
for( int pn = 0; pn < NUM_PLAYERS; ++pn) {