use PlayMusic

This commit is contained in:
Glenn Maynard
2003-01-02 07:39:58 +00:00
parent 18320299f0
commit 94216ccaa2
22 changed files with 23 additions and 23 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ ScreenCaution::ScreenCaution()
this->SendScreenMessage( SM_StartClosing, 3 );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","caution music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","caution music") );
}
+1 -1
View File
@@ -62,7 +62,7 @@ ScreenEditMenu::ScreenEditMenu()
m_Fade.SetOpened();
this->AddChild( &m_Fade);
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","edit menu music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","edit menu music") );
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
+1 -1
View File
@@ -625,7 +625,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
else
m_Menu.TweenOnScreenFromBlack( SM_None );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","evaluation music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","evaluation music") );
}
+1 -1
View File
@@ -102,7 +102,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select player intro") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select player music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select player music") );
TweenOnScreen();
m_Menu.TweenOnScreenFromBlack( SM_None );
+1 -1
View File
@@ -36,7 +36,7 @@ ScreenGameOver::ScreenGameOver()
m_Fade.OpenWipingRight( SM_None );
this->AddChild( &m_Fade );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","game over music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","game over music") );
this->SendScreenMessage( SM_PlayAnnouncer, 0.5 );
this->SendScreenMessage( SM_StartFadingOut, 5 );
+1 -1
View File
@@ -84,7 +84,7 @@ ScreenGraphicOptions::ScreenGraphicOptions() :
UpdateRefreshRates();
m_Menu.StopTimer();
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","graphic options music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","graphic options music") );
}
+1 -1
View File
@@ -77,7 +77,7 @@ ScreenHowToPlay::ScreenHowToPlay()
m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_BIAS_BEGIN );
m_sprHowToPlay.SetTweenX( CENTER_X );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","how to play music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","how to play music") );
}
ScreenHowToPlay::~ScreenHowToPlay()
+1 -1
View File
@@ -67,7 +67,7 @@ ScreenInputOptions::ScreenInputOptions() :
false );
m_Menu.StopTimer();
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","input options music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","input options music") );
}
void ScreenInputOptions::ImportOptions()
+1 -1
View File
@@ -70,7 +70,7 @@ ScreenMachineOptions::ScreenMachineOptions() :
false );
m_Menu.StopTimer();
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","machine options music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","machine options music") );
}
void ScreenMachineOptions::ImportOptions()
+1 -1
View File
@@ -102,7 +102,7 @@ ScreenMapControllers::ScreenMapControllers()
m_Menu.TweenOnScreenFromBlack( SM_None );
this->AddChild( &m_Menu );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","map controllers music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","map controllers music") );
Refresh();
}
+1 -1
View File
@@ -188,7 +188,7 @@ ScreenMusicScroll::ScreenMusicScroll()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("music scroll") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","music scroll music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","music scroll music") );
m_Fade.OpenWipingRight();
}
+1 -1
View File
@@ -91,7 +91,7 @@ ScreenNetworkWaiting::ScreenNetworkWaiting()
m_textPlayerList.SetXY( PLAYER_LIST_X, PLAYER_LIST_Y );
this->AddChild( &m_textPlayerList );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","network waiting music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","network waiting music") );
m_Menu.TweenOnScreenFromBlack( SM_None );
+1 -1
View File
@@ -78,7 +78,7 @@ MUSIC->Stop();
//s[0].s.SetStartSeconds(45);
//s[0].s.SetPositionSeconds();
// s[4].s.SetLengthSeconds(1);
//s[0].s.SetPlaybackRate(.9);
s[0].s.SetPlaybackRate(1.20);
//s[0].s.SetStopMode(RageSound::M_LOOP);
//s[0].s.Play();
+2 -2
View File
@@ -62,7 +62,7 @@ ScreenSelectCourse::ScreenSelectCourse()
{
LOG->Trace( "ScreenSelectCourse::ScreenSelectCourse()" );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select course music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") );
m_bMadeChoice = false;
m_bGoToOptions = false;
@@ -132,7 +132,7 @@ ScreenSelectCourse::ScreenSelectCourse()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select course intro") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select course music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") );
UpdateOptionsDisplays();
+1 -1
View File
@@ -176,7 +176,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
m_Menu.TweenOnScreenFromMenu( SM_None );
TweenOnScreen();
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select difficulty music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select difficulty music") );
m_fLockInputTime = LOCK_INPUT_TIME;
}
+1 -1
View File
@@ -62,7 +62,7 @@ ScreenSelectGame::ScreenSelectGame() :
m_Menu.SetTimer( 99 );
m_Menu.StopTimer();
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select game music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select game music") );
}
void ScreenSelectGame::ImportOptions()
+1 -1
View File
@@ -167,7 +167,7 @@ ScreenSelectGroup::ScreenSelectGroup()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group intro") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select group music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select group music") );
m_Menu.TweenOnScreenFromMenu( SM_None );
TweenOnScreen();
+1 -1
View File
@@ -126,7 +126,7 @@ ScreenSelectMode::ScreenSelectMode()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select style music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
RefreshModeChoices();
+1 -1
View File
@@ -807,7 +807,7 @@ void ScreenSelectMusic::PlayMusicSample()
pSong->m_fMusicSampleLengthSeconds);
}
// else
// MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select music music") );
// SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select music music") );
}
void ScreenSelectMusic::UpdateOptionsDisplays()
+1 -1
View File
@@ -103,7 +103,7 @@ ScreenSelectStyle::ScreenSelectStyle()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select style music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
AfterChange();
TweenOnScreen();
+1 -1
View File
@@ -178,7 +178,7 @@ ScreenSelectStyle5th::ScreenSelectStyle5th()
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select style music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
m_soundChange.PlayRandom();
TweenOnScreen();
+1 -1
View File
@@ -170,7 +170,7 @@ ScreenTitleMenu::ScreenTitleMenu()
LoseFocus( i );
GainFocus( m_TitleMenuChoice );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","title menu music") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","title menu music") );
this->SendScreenMessage( SM_PlayAttract, SECONDS_BETWEEN_ATTRACT );
this->SendScreenMessage( SM_FadeToDemonstration, SECONDS_BEFORE_DEMONSTRATION );