actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move stuff over

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-02 08:13:34 +00:00
parent bfb263fee4
commit 6f91b6fa0a
39 changed files with 128 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBattery.h
+3 -3
View File
@@ -15,7 +15,7 @@
#include "LifeMeter.h" #include "LifeMeter.h"
#include "Sprite.h" #include "Sprite.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "RageSoundSample.h" #include "RageSound.h"
class LifeMeterBattery : public LifeMeter class LifeMeterBattery : public LifeMeter
@@ -50,8 +50,8 @@ private:
BitmapText m_textNumLives; BitmapText m_textNumLives;
BitmapText m_textPercent; BitmapText m_textPercent;
RageSoundSample m_soundLoseLife; RageSound m_soundLoseLife;
RageSoundSample m_soundGainLife; RageSound m_soundGainLife;
}; };
stepmania/src/MenuElements.h
+2 -2
View File
@@ -76,8 +76,8 @@ public:
TransitionKeepAlive m_KeepAlive; // going back and forward TransitionKeepAlive m_KeepAlive; // going back and forward
TransitionInvisible m_Invisible; // for going forward to Menu TransitionInvisible m_Invisible; // for going forward to Menu
RageSoundSample m_soundSwoosh; RageSound m_soundSwoosh;
RageSoundSample m_soundBack; RageSound m_soundBack;
}; };
#endif #endif
stepmania/src/MenuTimer.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ void MenuTimer::Update( float fDeltaTime )
float fNewSecondsLeft = fOldSecondsLeft - fDeltaTime; float fNewSecondsLeft = fOldSecondsLeft - fDeltaTime;
if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("hurry up") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") );
else if( fOldSecondsLeft > 5 && fNewSecondsLeft < 5 ) // transition to below 5 else if( fOldSecondsLeft > 5 && fNewSecondsLeft < 5 ) // transition to below 5
{ {
m_textDigit1.SetEffectGlowing( 10, RageColor(1,0,0,0), RageColor(1,0,0,1) ); m_textDigit1.SetEffectGlowing( 10, RageColor(1,0,0,0), RageColor(1,0,0,1) );
stepmania/src/MenuTimer.h
+2 -2
View File
@@ -15,7 +15,7 @@
#include "Song.h" #include "Song.h"
#include "ActorFrame.h" #include "ActorFrame.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "RageSoundSample.h" #include "RageSound.h"
class MenuTimer : public ActorFrame class MenuTimer : public ActorFrame
@@ -41,7 +41,7 @@ protected:
BitmapText m_textDigit1; BitmapText m_textDigit1;
BitmapText m_textDigit2; BitmapText m_textDigit2;
RageSoundSample m_soundBeep; RageSound m_soundBeep;
}; };
#endif #endif
stepmania/src/MusicWheel.h
+5 -5
View File
@@ -167,11 +167,11 @@ protected:
// bool m_bUseRandomExtra; // bool m_bUseRandomExtra;
RageSoundSample m_soundChangeMusic; RageSound m_soundChangeMusic;
RageSoundSample m_soundChangeSort; RageSound m_soundChangeSort;
RageSoundSample m_soundExpand; RageSound m_soundExpand;
RageSoundSample m_soundStart; RageSound m_soundStart;
RageSoundSample m_soundLocked; RageSound m_soundLocked;
CString GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so ); CString GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so );
bool WheelItemIsVisible(int n); bool WheelItemIsVisible(int n);
stepmania/src/RageSoundManager.h
-3
View File
@@ -9,9 +9,6 @@
class RageSound; class RageSound;
//#define PlayOnceStreamed PlayOnce
//#define PlayOnceStreamedFromDir PlayOnceFromDir
class RageSoundManager class RageSoundManager
{ {
/* Set of sounds that we've taken over (and are responsible for deleting /* Set of sounds that we've taken over (and are responsible for deleting
stepmania/src/RandomSample.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ bool RandomSample::LoadSound( CString sSoundFilePath )
{ {
LOG->Trace( "RandomSample::LoadSound( %s )", sSoundFilePath.GetString() ); LOG->Trace( "RandomSample::LoadSound( %s )", sSoundFilePath.GetString() );
RageSoundSample* pSS = new RageSoundSample; RageSound *pSS = new RageSound;
pSS->Load( sSoundFilePath ); pSS->Load( sSoundFilePath );
stepmania/src/RandomSample.h
+2 -2
View File
@@ -11,7 +11,7 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
*/ */
#include "RageSoundSample.h" #include "RageSound.h"
#include "RageUtil.h" #include "RageUtil.h"
class RandomSample class RandomSample
@@ -39,7 +39,7 @@ private:
bool LoadSound( CString sSoundFilePath ); bool LoadSound( CString sSoundFilePath );
CArray<RageSoundSample*, RageSoundSample*> m_pSamples; CArray<RageSound*, RageSound*> m_pSamples;
int m_iIndexLastPlayed; int m_iIndexLastPlayed;
}; };
stepmania/src/ScreenCaution.cpp
+3 -3
View File
@@ -71,7 +71,7 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM )
m_Wipe.CloseWipingRight( SM_GoToNextScreen ); m_Wipe.CloseWipingRight( SM_GoToNextScreen );
break; break;
case SM_DoneOpening: case SM_DoneOpening:
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("caution") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("caution") );
break; break;
case SM_GoToPrevScreen: case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
@@ -87,7 +87,7 @@ void ScreenCaution::MenuStart( PlayerNumber pn )
if( pn != PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] ) if( pn != PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] )
{ {
GAMESTATE->m_bSideIsJoined[pn] = true; GAMESTATE->m_bSideIsJoined[pn] = true;
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
return; // don't fall though return; // don't fall though
} }
@@ -102,6 +102,6 @@ void ScreenCaution::MenuBack( PlayerNumber pn )
return; return;
this->ClearMessageQueue(); this->ClearMessageQueue();
m_FadeWipe.CloseWipingLeft( SM_GoToPrevScreen ); m_FadeWipe.CloseWipingLeft( SM_GoToPrevScreen );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu back") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu back") );
} }
stepmania/src/ScreenEdit.cpp
+7 -7
View File
@@ -285,7 +285,7 @@ ScreenEdit::ScreenEdit()
m_textShortcuts.SetText( SHORTCUT_TEXT ); m_textShortcuts.SetText( SHORTCUT_TEXT );
m_soundChangeLine.Load( THEME->GetPathTo("Sounds","edit change line"), 10 ); m_soundChangeLine.Load( THEME->GetPathTo("Sounds","edit change line") );
m_soundChangeSnap.Load( THEME->GetPathTo("Sounds","edit change snap") ); m_soundChangeSnap.Load( THEME->GetPathTo("Sounds","edit change snap") );
m_soundMarker.Load( THEME->GetPathTo("Sounds","edit marker") ); m_soundMarker.Load( THEME->GetPathTo("Sounds","edit marker") );
m_soundInvalid.Load( THEME->GetPathTo("Sounds","menu invalid") ); m_soundInvalid.Load( THEME->GetPathTo("Sounds","menu invalid") );
@@ -340,7 +340,7 @@ bool ScreenEdit::PlayTicks() const
bool bFreeze; bool bFreeze;
// HACK: Play the sound a little bit early to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. // HACK: Play the sound a little bit early to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing.
fPositionSeconds += (SOUND->GetPlayLatency()+0.018f) * m_soundMusic.GetPlaybackRate(); // HACK: Add 0.015 seconds to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. fPositionSeconds += (SOUNDMAN->GetPlayLatency()+0.018f) * m_soundMusic.GetPlaybackRate(); // HACK: Add 0.015 seconds to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing.
GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fPositionSeconds, fSongBeat, fBPS, bFreeze ); GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fPositionSeconds, fSongBeat, fBPS, bFreeze );
int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
@@ -758,7 +758,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
GAMESTATE->m_pCurSong->Save(); GAMESTATE->m_pCurSong->Save();
SCREENMAN->SystemMessage( "Saved as SM and DWI." ); SCREENMAN->SystemMessage( "Saved as SM and DWI." );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","edit save") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","edit save") );
} }
break; break;
case SDLK_UP: case SDLK_UP:
@@ -1259,7 +1259,7 @@ void ScreenEdit::InputActionMenu( const DeviceInput& DeviceI, const InputEventTy
MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] ); MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] );
if( DeviceI.button == SDLK_RETURN ) if( DeviceI.button == SDLK_RETURN )
{ {
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
int iMenuKey = ACTION_MENU_ITEM_KEY[m_iMenuSelection]; int iMenuKey = ACTION_MENU_ITEM_KEY[m_iMenuSelection];
InputEdit( DeviceInput(DEVICE_KEYBOARD,iMenuKey), IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput() ); InputEdit( DeviceInput(DEVICE_KEYBOARD,iMenuKey), IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput() );
} }
@@ -1271,7 +1271,7 @@ void ScreenEdit::InputActionMenu( const DeviceInput& DeviceI, const InputEventTy
TransitionToEdit(); TransitionToEdit();
MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] ); MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
InputEdit( DeviceI, IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput() ); InputEdit( DeviceI, IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput() );
} }
} }
@@ -1339,7 +1339,7 @@ void ScreenEdit::InputNamingMenu( const DeviceInput& DeviceI, const InputEventTy
MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] ); MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] );
break; break;
case SDLK_RETURN: case SDLK_RETURN:
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
const std::pair<int, bool>& pairMenuKey = NAMING_MENU_ITEM_KEY[m_iMenuSelection]; const std::pair<int, bool>& pairMenuKey = NAMING_MENU_ITEM_KEY[m_iMenuSelection];
InputNamingMenu( DeviceInput(DEVICE_KEYBOARD,pairMenuKey.first), IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput(), pairMenuKey.second ); InputNamingMenu( DeviceInput(DEVICE_KEYBOARD,pairMenuKey.first), IET_FIRST_PRESS, GameInput(), MenuInput(), StyleInput(), pairMenuKey.second );
break; break;
@@ -1451,7 +1451,7 @@ void ScreenEdit::MenuItemGainFocus( BitmapText* menuitem )
{ {
menuitem->SetEffectCamelion( 2.5, RageColor(1,1,1,1), RageColor(0,1,0,1) ); menuitem->SetEffectCamelion( 2.5, RageColor(1,1,1,1), RageColor(0,1,0,1) );
menuitem->SetZoom( 0.7f ); menuitem->SetZoom( 0.7f );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","edit menu change") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","edit menu change") );
} }
void ScreenEdit::MenuItemLoseFocus( BitmapText* menuitem ) void ScreenEdit::MenuItemLoseFocus( BitmapText* menuitem )
stepmania/src/ScreenEdit.h
+5 -5
View File
@@ -77,10 +77,10 @@ protected:
NoteData m_Clipboard; NoteData m_Clipboard;
RageSoundSample m_soundChangeLine; RageSound m_soundChangeLine;
RageSoundSample m_soundChangeSnap; RageSound m_soundChangeSnap;
RageSoundSample m_soundMarker; RageSound m_soundMarker;
RageSoundSample m_soundInvalid; RageSound m_soundInvalid;
TransitionFade m_Fade; TransitionFade m_Fade;
@@ -104,7 +104,7 @@ protected:
BitmapText m_textNamingMenu[NUM_NAMING_MENU_ITEMS]; BitmapText m_textNamingMenu[NUM_NAMING_MENU_ITEMS];
int m_iRowLastCrossed; int m_iRowLastCrossed;
RageSoundSample m_soundAssistTick; RageSound m_soundAssistTick;
}; };
stepmania/src/ScreenEditMenu.cpp
+1 -1
View File
@@ -146,7 +146,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
if( !GAMESTATE->m_pCurSong->HasMusic() ) if( !GAMESTATE->m_pCurSong->HasMusic() )
{ {
SCREENMAN->SystemMessage( "This song is missing a music file and cannot be edited" ); SCREENMAN->SystemMessage( "This song is missing a music file and cannot be edited" );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu invalid") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu invalid") );
return; return;
} }
stepmania/src/ScreenEvaluation.cpp
+18 -18
View File
@@ -565,11 +565,11 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_sprTryExtraStage.SetEffectGlowing( 1.0f ); m_sprTryExtraStage.SetEffectGlowing( 1.0f );
this->AddChild( &m_sprTryExtraStage ); this->AddChild( &m_sprTryExtraStage );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","evaluation extra stage") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","evaluation extra stage") );
} }
else if( bOneHasNewRecord && ANNOUNCER->HasSoundsFor("evaluation new record") ) else if( bOneHasNewRecord && ANNOUNCER->HasSoundsFor("evaluation new record") )
{ {
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation new record") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation new record") );
} }
else else
{ {
@@ -579,13 +579,13 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
case RM_ARCADE_STAGE: case RM_ARCADE_STAGE:
switch( max_grade ) switch( max_grade )
{ {
case GRADE_E: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation e") ); break; case GRADE_E: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation e") ); break;
case GRADE_D: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation d") ); break; case GRADE_D: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation d") ); break;
case GRADE_C: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation c") ); break; case GRADE_C: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation c") ); break;
case GRADE_B: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation b") ); break; case GRADE_B: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation b") ); break;
case GRADE_A: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation a") ); break; case GRADE_A: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation a") ); break;
case GRADE_AA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation aa") ); break; case GRADE_AA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation aa") ); break;
case GRADE_AAA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation aaa") ); break; case GRADE_AAA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation aaa") ); break;
case GRADE_NO_DATA: case GRADE_NO_DATA:
default: default:
ASSERT(0); // invalid grade ASSERT(0); // invalid grade
@@ -595,13 +595,13 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
case RM_ARCADE_SUMMARY: case RM_ARCADE_SUMMARY:
switch( max_grade ) switch( max_grade )
{ {
case GRADE_E: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final e") ); break; case GRADE_E: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final e") ); break;
case GRADE_D: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final d") ); break; case GRADE_D: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final d") ); break;
case GRADE_C: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final c") ); break; case GRADE_C: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final c") ); break;
case GRADE_B: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final b") ); break; case GRADE_B: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final b") ); break;
case GRADE_A: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final a") ); break; case GRADE_A: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final a") ); break;
case GRADE_AA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final aa") ); break; case GRADE_AA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final aa") ); break;
case GRADE_AAA: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation final aaa") ); break; case GRADE_AAA: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation final aaa") ); break;
case GRADE_NO_DATA: case GRADE_NO_DATA:
default: default:
ASSERT(0); // invalid grade ASSERT(0); // invalid grade
@@ -833,7 +833,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
SCREENMAN->SetNewScreen( "ScreenFinalEvaluation" ); SCREENMAN->SetNewScreen( "ScreenFinalEvaluation" );
break; break;
case SM_PlayCheer: case SM_PlayCheer:
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("evaluation cheer") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") );
break; break;
} }
} }
@@ -883,7 +883,7 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn )
/* Tween the screen out, but leave the MenuElements where they are. /* Tween the screen out, but leave the MenuElements where they are.
* Play the "swoosh" sound manually (would normally be played by the ME * Play the "swoosh" sound manually (would normally be played by the ME
* tween out). */ * tween out). */
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu swoosh") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu swoosh") );
TweenOffScreen(); TweenOffScreen();
SCREENMAN->SendMessageToTopScreen( SM_GoToFinalEvaluation, MENU_ELEMENTS_TWEEN_TIME ); SCREENMAN->SendMessageToTopScreen( SM_GoToFinalEvaluation, MENU_ELEMENTS_TWEEN_TIME );
} }
stepmania/src/ScreenEz2SelectMusic.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void ScreenEz2SelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy
if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START ) if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START )
{ {
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
m_bGoToOptions = true; m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 ); m_sprOptionsMessage.SetState( 1 );
} }
stepmania/src/ScreenEz2SelectMusic.h
+1 -1
View File
@@ -58,7 +58,7 @@ protected:
int i_ErrorDetected; int i_ErrorDetected;
RageSoundSample m_soundSelect; RageSound m_soundSelect;
}; };
stepmania/src/ScreenEz2SelectPlayer.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select player intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select player intro") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select player music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select player music") );
stepmania/src/ScreenEz2SelectPlayer.h
+2 -2
View File
@@ -9,7 +9,7 @@ Andrew Livy
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "RageSoundSample.h" #include "RageSound.h"
#include "MenuElements.h" #include "MenuElements.h"
@@ -37,6 +37,6 @@ private:
MenuElements m_Menu; MenuElements m_Menu;
RageSoundSample m_soundSelect; RageSound m_soundSelect;
BGAnimation m_Background; BGAnimation m_Background;
}; };
stepmania/src/ScreenGameOver.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ void ScreenGameOver::HandleScreenMessage( const ScreenMessage SM )
switch( SM ) switch( SM )
{ {
case SM_PlayAnnouncer: case SM_PlayAnnouncer:
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("game over") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("game over") );
break; break;
case SM_StartFadingOut: case SM_StartFadingOut:
m_Fade.CloseWipingRight( SM_GoToNextScreen ); m_Fade.CloseWipingRight( SM_GoToNextScreen );
stepmania/src/ScreenGameplay.cpp
+5 -5
View File
@@ -676,7 +676,7 @@ bool ScreenGameplay::PlayTicks() const
bool bFreeze; bool bFreeze;
// HACK: Play the sound a little bit early to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing. // HACK: Play the sound a little bit early to account for the fact that the middle of the tick sounds occurs 0.015 seconds into playing.
fPositionSeconds += (SOUND->GetPlayLatency()+g_fTickEarlySecondsCache) * m_soundMusic.GetPlaybackRate(); fPositionSeconds += (SOUNDMAN->GetPlayLatency()+g_fTickEarlySecondsCache) * m_soundMusic.GetPlaybackRate();
GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fPositionSeconds, fSongBeat, fBPS, bFreeze ); GAMESTATE->m_pCurSong->GetBeatAndBPSFromElapsedTime( fPositionSeconds, fSongBeat, fBPS, bFreeze );
int iRowNow = BeatToNoteRowNotRounded( fSongBeat ); int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
@@ -887,7 +887,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
&& !m_Fade.IsClosing() ) && !m_Fade.IsClosing() )
{ {
m_soundMusic.StopPlaying(); m_soundMusic.StopPlaying();
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","insert coin") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","insert coin") );
::Sleep( 1000 ); // do a little pause, like the arcade does ::Sleep( 1000 ); // do a little pause, like the arcade does
this->SendScreenMessage( SM_GoToTitleMenu, 0 ); this->SendScreenMessage( SM_GoToTitleMenu, 0 );
} }
@@ -994,7 +994,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
(DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT) ) (DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT) )
{ {
m_DancingState = STATE_OUTRO; m_DancingState = STATE_OUTRO;
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu back") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu back") );
/* Hmm. There are a bunch of subtly different ways we can /* Hmm. There are a bunch of subtly different ways we can
* tween out: * tween out:
* 1. Keep rendering the song, and keep it moving. This might * 1. Keep rendering the song, and keep it moving. This might
@@ -1227,7 +1227,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
else else
{ {
this->SendScreenMessage( SM_ShowCleared, 1 ); this->SendScreenMessage( SM_ShowCleared, 1 );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("gameplay cleared") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
} }
} }
} }
@@ -1472,7 +1472,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
SCREENMAN->SendMessageToTopScreen( SM_GoToScreenAfterFail, 5.0f ); SCREENMAN->SendMessageToTopScreen( SM_GoToScreenAfterFail, 5.0f );
break; break;
case SM_PlayFailComment: case SM_PlayFailComment:
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("gameplay failed") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay failed") );
break; break;
case SM_GoToScreenAfterFail: case SM_GoToScreenAfterFail:
stepmania/src/ScreenGameplay.h
+2 -4
View File
@@ -149,11 +149,9 @@ private:
int m_iRowLastCrossed; int m_iRowLastCrossed;
RageSoundSample m_soundAssistTick;
RageSoundSample m_soundToasty;
RageSound m_soundAssistTick;
RageSound m_soundToasty;
RageSound m_soundMusic; RageSound m_soundMusic;
}; };
stepmania/src/ScreenMusicScroll.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ ScreenMusicScroll::ScreenMusicScroll()
this->AddChild( &m_Fade ); this->AddChild( &m_Fade );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("music scroll") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","music scroll music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","music scroll music") );
stepmania/src/ScreenOptions.h
+4 -4
View File
@@ -106,10 +106,10 @@ protected:
BitmapText m_textExplanation; BitmapText m_textExplanation;
RageSoundSample m_SoundChangeCol; RageSound m_SoundChangeCol;
RageSoundSample m_SoundNextRow; RageSound m_SoundNextRow;
RageSoundSample m_SoundPrevRow; RageSound m_SoundPrevRow;
RageSoundSample m_SoundStart; RageSound m_SoundStart;
TransitionInvisible m_Wipe; TransitionInvisible m_Wipe;
}; };
stepmania/src/ScreenPlayerOptions.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ ScreenPlayerOptions::ScreenPlayerOptions() :
NUM_PLAYER_OPTIONS_LINES, NUM_PLAYER_OPTIONS_LINES,
true ); true );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("player options intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
} }
stepmania/src/ScreenPrompt.cpp
+3 -3
View File
@@ -77,7 +77,7 @@ ScreenPrompt::ScreenPrompt( ScreenMessage SM_SendWhenDone, CString sText, bool b
m_textAnswer[m_bAnswer].SetEffectGlowing(); m_textAnswer[m_bAnswer].SetEffectGlowing();
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu prompt") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu prompt") );
} }
void ScreenPrompt::Update( float fDeltaTime ) void ScreenPrompt::Update( float fDeltaTime )
@@ -135,7 +135,7 @@ void ScreenPrompt::MenuRight( PlayerNumber pn )
m_rectAnswerBox.SetTweenXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() ); m_rectAnswerBox.SetTweenXY( m_textAnswer[m_bAnswer].GetX(), m_textAnswer[m_bAnswer].GetY() );
m_rectAnswerBox.SetTweenZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f ); m_rectAnswerBox.SetTweenZoomX( m_textAnswer[m_bAnswer].GetWidestLineWidthInSourcePixels()+10.0f );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","edit change line") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","edit change line") );
} }
void ScreenPrompt::MenuStart( PlayerNumber pn ) void ScreenPrompt::MenuStart( PlayerNumber pn )
@@ -155,7 +155,7 @@ void ScreenPrompt::MenuStart( PlayerNumber pn )
m_textAnswer[1].BeginTweening( 0.2f ); m_textAnswer[1].BeginTweening( 0.2f );
m_textAnswer[1].SetTweenDiffuse( RageColor(1,1,1,0) ); m_textAnswer[1].SetTweenDiffuse( RageColor(1,1,1,0) );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
if( m_bAnswer ) if( m_bAnswer )
if( m_pOnYes ) if( m_pOnYes )
stepmania/src/ScreenSelectCourse.cpp
+3 -3
View File
@@ -129,7 +129,7 @@ ScreenSelectCourse::ScreenSelectCourse()
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","select music change options") ); m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","select music change options") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select course intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course intro") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") );
@@ -216,7 +216,7 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type,
{ {
m_bGoToOptions = true; m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 ); m_sprOptionsMessage.SetState( 1 );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
return; return;
} }
@@ -279,7 +279,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn )
switch( m_MusicWheel.GetSelectedType() ) switch( m_MusicWheel.GetSelectedType() )
{ {
case TYPE_COURSE: case TYPE_COURSE:
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select course comment general") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select course comment general") );
TweenOffScreen(); TweenOffScreen();
stepmania/src/ScreenSelectCourse.h
+3 -3
View File
@@ -12,7 +12,7 @@
#include "Screen.h" #include "Screen.h"
#include "Sprite.h" #include "Sprite.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "RageSoundSample.h" #include "RageSound.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "MusicWheel.h" #include "MusicWheel.h"
#include "CourseContentsFrame.h" #include "CourseContentsFrame.h"
@@ -60,8 +60,8 @@ protected:
bool m_bGoToOptions; bool m_bGoToOptions;
Sprite m_sprOptionsMessage; Sprite m_sprOptionsMessage;
RageSoundSample m_soundSelect; RageSound m_soundSelect;
RageSoundSample m_soundOptionsChange; RageSound m_soundOptionsChange;
}; };
stepmania/src/ScreenSelectDifficulty.cpp
+6 -6
View File
@@ -171,7 +171,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
m_soundSelect.Load( THEME->GetPathTo("Sounds", "menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds", "menu start") );
m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") ); m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty intro") );
m_Menu.TweenOnScreenFromMenu( SM_None ); m_Menu.TweenOnScreenFromMenu( SM_None );
TweenOnScreen(); TweenOnScreen();
@@ -402,11 +402,11 @@ void ScreenSelectDifficulty::MenuStart( PlayerNumber pn )
switch( iSelection ) switch( iSelection )
{ {
case 0: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment easy") ); break; case 0: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment easy") ); break;
case 1: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment medium") ); break; case 1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment medium") ); break;
case 2: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment hard") ); break; case 2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment hard") ); break;
case 3: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment oni") ); break; case 3: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment oni") ); break;
case 4: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty comment endless") ); break; case 4: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select difficulty comment endless") ); break;
} }
if( iSelection >= 3 ) // chose something on page 2 if( iSelection >= 3 ) // chose something on page 2
stepmania/src/ScreenSelectDifficulty.h
+2 -2
View File
@@ -61,8 +61,8 @@ private:
Sprite m_sprJoinMessagehadow[NUM_PLAYERS]; Sprite m_sprJoinMessagehadow[NUM_PLAYERS];
Sprite m_sprOK[NUM_PLAYERS]; Sprite m_sprOK[NUM_PLAYERS];
RageSoundSample m_soundChange; RageSound m_soundChange;
RageSoundSample m_soundSelect; RageSound m_soundSelect;
RandomSample m_soundDifficult; RandomSample m_soundDifficult;
int m_iSelection[NUM_PLAYERS]; int m_iSelection[NUM_PLAYERS];
stepmania/src/ScreenSelectGroup.cpp
+3 -3
View File
@@ -165,7 +165,7 @@ ScreenSelectGroup::ScreenSelectGroup()
m_soundChange.Load( THEME->GetPathTo("Sounds","select group change") ); m_soundChange.Load( THEME->GetPathTo("Sounds","select group change") );
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select group music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select group music") );
@@ -285,9 +285,9 @@ void ScreenSelectGroup::MenuStart( PlayerNumber pn )
GAMESTATE->m_sPreferredGroup = m_GroupList.GetSelectionName(); GAMESTATE->m_sPreferredGroup = m_GroupList.GetSelectionName();
if( 0 == stricmp(GAMESTATE->m_sPreferredGroup, "All Music") ) if( 0 == stricmp(GAMESTATE->m_sPreferredGroup, "All Music") )
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group comment all music") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment all music") );
else else
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group comment general") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group comment general") );
TweenOffScreen(); TweenOffScreen();
stepmania/src/ScreenSelectMode.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ ScreenSelectMode::ScreenSelectMode()
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
m_soundChange.Load( THEME->GetPathTo("Sounds","select style change"), 10 ); m_soundChange.Load( THEME->GetPathTo("Sounds","select style change"), 10 );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
stepmania/src/ScreenSelectMode.h
+2 -2
View File
@@ -66,6 +66,6 @@ protected:
BGAnimation m_BGAnimations[MAX_MODE_CHOICES]; BGAnimation m_BGAnimations[MAX_MODE_CHOICES];
MenuElements m_Menu; MenuElements m_Menu;
RageSoundSample m_soundSelect; RageSound m_soundSelect;
RageSoundSample m_soundChange; RageSound m_soundChange;
}; };
stepmania/src/ScreenSelectMusic.cpp
+5 -5
View File
@@ -231,7 +231,7 @@ ScreenSelectMusic::ScreenSelectMusic()
m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","select music change options") ); m_soundOptionsChange.Load( THEME->GetPathTo("Sounds","select music change options") );
m_soundLocked.Load( THEME->GetPathTo("Sounds","select music wheel locked") ); m_soundLocked.Load( THEME->GetPathTo("Sounds","select music wheel locked") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") );
m_bMadeChoice = false; m_bMadeChoice = false;
m_bGoToOptions = false; m_bGoToOptions = false;
@@ -430,7 +430,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
{ {
m_bGoToOptions = true; m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 ); m_sprOptionsMessage.SetState( 1 );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
return; return;
} }
@@ -625,11 +625,11 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
} }
if( bIsNew ) if( bIsNew )
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music comment new") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") );
else if( bIsHard ) else if( bIsHard )
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") );
else else
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select music comment general") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment general") );
TweenOffScreen(); TweenOffScreen();
stepmania/src/ScreenSelectMusic.h
+4 -4
View File
@@ -82,10 +82,10 @@ protected:
Sprite m_sprOptionsMessage; Sprite m_sprOptionsMessage;
float m_fPlaySampleCountdown; float m_fPlaySampleCountdown;
RageSoundSample m_soundSelect; RageSound m_soundSelect;
RageSoundSample m_soundChangeNotes; RageSound m_soundChangeNotes;
RageSoundSample m_soundOptionsChange; RageSound m_soundOptionsChange;
RageSoundSample m_soundLocked; RageSound m_soundLocked;
}; };
stepmania/src/ScreenSelectStyle.cpp
+7 -7
View File
@@ -101,7 +101,7 @@ ScreenSelectStyle::ScreenSelectStyle()
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
@@ -242,7 +242,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
{ {
if( pn!=PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] ) if( pn!=PLAYER_INVALID && !GAMESTATE->m_bSideIsJoined[pn] )
{ {
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
GAMESTATE->m_bSideIsJoined[pn] = true; GAMESTATE->m_bSideIsJoined[pn] = true;
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
UpdateEnabledDisabled(); UpdateEnabledDisabled();
@@ -253,11 +253,11 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName;
sCurStyleName.MakeLower(); sCurStyleName.MakeLower();
if( -1!=sCurStyleName.Find("single") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment single") ); if( -1!=sCurStyleName.Find("single") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment single") );
else if( -1!=sCurStyleName.Find("versus") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment versus") ); else if( -1!=sCurStyleName.Find("versus") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment versus") );
else if( -1!=sCurStyleName.Find("double") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment double") ); else if( -1!=sCurStyleName.Find("double") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") );
else if( -1!=sCurStyleName.Find("couple") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); else if( -1!=sCurStyleName.Find("couple") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") );
else if( -1!=sCurStyleName.Find("solo") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); else if( -1!=sCurStyleName.Find("solo") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") );
m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen ); m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
GAMESTATE->m_bPlayersCanJoin = false; GAMESTATE->m_bPlayersCanJoin = false;
stepmania/src/ScreenSelectStyle5th.cpp
+6 -6
View File
@@ -176,7 +176,7 @@ ScreenSelectStyle5th::ScreenSelectStyle5th()
m_soundChange.Load( THEME->GetPathTo("Graphics","select style change") ); m_soundChange.Load( THEME->GetPathTo("Graphics","select style change") );
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style intro") );
SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") ); SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
@@ -276,11 +276,11 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn )
CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName; CString sCurStyleName = GAMESTATE->GetCurrentStyleDef()->m_szName;
sCurStyleName.MakeLower(); sCurStyleName.MakeLower();
if( -1!=sCurStyleName.Find("single") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment single") ); if( -1!=sCurStyleName.Find("single") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment single") );
else if( -1!=sCurStyleName.Find("versus") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment versus") ); else if( -1!=sCurStyleName.Find("versus") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment versus") );
else if( -1!=sCurStyleName.Find("double") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment double") ); else if( -1!=sCurStyleName.Find("double") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment double") );
else if( -1!=sCurStyleName.Find("couple") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment couple") ); else if( -1!=sCurStyleName.Find("couple") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment couple") );
else if( -1!=sCurStyleName.Find("solo") ) SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style comment solo") ); else if( -1!=sCurStyleName.Find("solo") ) SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select style comment solo") );
this->ClearMessageQueue(); this->ClearMessageQueue();
stepmania/src/ScreenStage.cpp
+10 -10
View File
@@ -80,20 +80,20 @@ ScreenStage::ScreenStage()
const int iStageNo = GAMESTATE->GetStageIndex()+1; const int iStageNo = GAMESTATE->GetStageIndex()+1;
switch( iStageNo ) switch( iStageNo )
{ {
case 1: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 1") ); break; case 1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 1") ); break;
case 2: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 2") ); break; case 2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 2") ); break;
case 3: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 3") ); break; case 3: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 3") ); break;
case 4: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 4") ); break; case 4: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 4") ); break;
case 5: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage 5") ); break; case 5: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage 5") ); break;
default: ; break; // play nothing default: ; break; // play nothing
} }
} }
break; break;
case MODE_FINAL: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage final") ); break; case MODE_FINAL: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage final") ); break;
case MODE_EXTRA1: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break; case MODE_EXTRA1: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra1") ); break;
case MODE_EXTRA2: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break; case MODE_EXTRA2: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage extra2") ); break;
case MODE_ONI: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage oni") ); break; case MODE_ONI: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage oni") ); break;
case MODE_ENDLESS: SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("stage endless") ); break; case MODE_ENDLESS: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage endless") ); break;
default: ASSERT(0); default: ASSERT(0);
} }
stepmania/src/ScreenTextEntry.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuesti
m_textAnswer.SetText( m_sAnswer ); m_textAnswer.SetText( m_sAnswer );
this->AddChild( &m_textAnswer ); this->AddChild( &m_textAnswer );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu prompt") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu prompt") );
} }
void ScreenTextEntry::Update( float fDeltaTime ) void ScreenTextEntry::Update( float fDeltaTime )
@@ -182,7 +182,7 @@ void ScreenTextEntry::MenuStart( PlayerNumber pn )
m_textAnswer.BeginTweening( 0.2f ); m_textAnswer.BeginTweening( 0.2f );
m_textAnswer.SetTweenDiffuse( RageColor(1,1,1,0) ); m_textAnswer.SetTweenDiffuse( RageColor(1,1,1,0) );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","menu start") );
if( m_bCancelled ) { if( m_bCancelled ) {
if( m_pOnCancel ) m_pOnCancel(); if( m_pOnCancel ) m_pOnCancel();
stepmania/src/ScreenTitleMenu.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ ScreenTitleMenu::ScreenTitleMenu()
this->AddChild( &m_Fade ); this->AddChild( &m_Fade );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("title menu game name") ); SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("title menu game name") );
m_soundAttract.Load( ANNOUNCER->GetPathTo("title menu attract") ); m_soundAttract.Load( ANNOUNCER->GetPathTo("title menu attract") );
stepmania/src/TransitionBackWipe.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
protected: protected:
Quad m_quad; Quad m_quad;
RageSoundSample m_soundBack; RageSound m_soundBack;
}; };