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

abstract music completely

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundManager.h
+3 -2
View File
@@ -31,6 +31,8 @@ class RageSoundManager
/* Prefs: */
float MixVolume;
RageSound *music;
public:
RageMutex lock;
@@ -58,9 +60,8 @@ public:
set<RageSound *> all_sounds;
void PlayMusic(CString file, bool loop = true, float start_sec = -1, float length_sec = -1);
void StopMusic() { PlayMusic(""); }
static void MixAudio(Sint16 *dst, const Sint16 *src, Uint32 len, float volume);
RageSound *music;
};
/* This inputs and outputs 16-bit 44khz stereo input. */
stepmania/src/ScreenAttract.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ void ScreenAttract::Input( const DeviceInput& DeviceI, const InputEventType type
break;
case MENU_BUTTON_COIN:
Screen::MenuCoin( MenuI.player ); // increment coins, play sound
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
::Sleep( 200 ); // do a little pause, like the arcade does
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
@@ -117,7 +117,7 @@ void ScreenAttract::Input( const DeviceInput& DeviceI, const InputEventType type
// fall through
case PrefsManager::COIN_FREE:
case PrefsManager::COIN_HOME:
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","insert coin") );
::Sleep( 200 ); // do a little pause, like the arcade does
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
stepmania/src/ScreenEditMenu.cpp
+2 -2
View File
@@ -150,7 +150,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
return;
}
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
// get the style
@@ -168,7 +168,7 @@ void ScreenEditMenu::MenuBack( PlayerNumber pn )
{
m_Menu.TweenOffScreenToBlack( SM_None, true );
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Fade.CloseWipingLeft( SM_GoToPrevScreen );
}
stepmania/src/ScreenEz2SelectMusic.cpp
+6 -6
View File
@@ -61,7 +61,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
if(PREVIEWMUSICMODE == 1)
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
iConfirmSelection = 0;
}
@@ -273,7 +273,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
}
else
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenStage" );
}
break;
@@ -294,7 +294,7 @@ void ScreenEz2SelectMusic::MenuRight( PlayerNumber pn, const InputEventType type
void ScreenEz2SelectMusic::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
@@ -392,7 +392,7 @@ void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn )
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1)
{
iConfirmSelection = 0;
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
}
m_iSelection[pn]--;
@@ -424,7 +424,7 @@ void ScreenEz2SelectMusic::HarderDifficulty( PlayerNumber pn )
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1)
{
iConfirmSelection = 0;
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
}
m_iSelection[pn]++;
@@ -446,7 +446,7 @@ void ScreenEz2SelectMusic::MusicChanged()
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1)
{
iConfirmSelection = 0;
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
}
int pn;
stepmania/src/ScreenEz2SelectPlayer.cpp
+2 -2
View File
@@ -175,7 +175,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
break;
case SM_GoToPrevScreen:
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
case SM_GoToNextScreen:
@@ -193,7 +193,7 @@ presses the button bound to back
void ScreenEz2SelectPlayer::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
g_fTickEarlySecondsCache = TICK_EARLY_SECONDS;
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
/* It's OK to operate on GAMESTATE here, but not in the constructor */
stepmania/src/ScreenSelectCourse.cpp
+1 -1
View File
@@ -316,7 +316,7 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn )
void ScreenSelectCourse::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
stepmania/src/ScreenSelectMode.cpp
+2 -2
View File
@@ -216,7 +216,7 @@ void ScreenSelectMode::HandleScreenMessage( const ScreenMessage SM )
m_Menu.TweenOffScreenToMenu( SM_GoToNextScreen );
break;
case SM_GoToPrevScreen:
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
case SM_GoToNextScreen:
@@ -289,7 +289,7 @@ presses the button bound to back
************************************/
void ScreenSelectMode::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
stepmania/src/ScreenSelectMusic.cpp
+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) {
stepmania/src/ScreenSelectStyle.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ void ScreenSelectStyle::HandleScreenMessage( const ScreenMessage SM )
MenuStart(PLAYER_INVALID);
break;
case SM_GoToPrevScreen:
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
case SM_GoToNextScreen:
@@ -290,7 +290,7 @@ void ScreenSelectStyle::MenuStart( PlayerNumber pn )
void ScreenSelectStyle::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
stepmania/src/ScreenSelectStyle5th.cpp
+2 -2
View File
@@ -219,7 +219,7 @@ void ScreenSelectStyle5th::HandleScreenMessage( const ScreenMessage SM )
MenuStart(PLAYER_1);
break;
case SM_GoToPrevScreen:
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
case SM_GoToNextScreen:
@@ -291,7 +291,7 @@ void ScreenSelectStyle5th::MenuStart( PlayerNumber pn )
void ScreenSelectStyle5th::MenuBack( PlayerNumber pn )
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
stepmania/src/ScreenSongOptions.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ void ScreenSongOptions::GoToPrevState()
void ScreenSongOptions::GoToNextState()
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SCREENMAN->SetNewScreen( "ScreenStage" );
}
stepmania/src/ScreenStage.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ enum StageMode
ScreenStage::ScreenStage()
{
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
g_StageType = (StageType)STAGE_TYPE;
stepmania/src/ScreenTest.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ ScreenTest::ScreenTest()
current = NULL;
cur_screen = -1;
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
SetScreen(0);
}
stepmania/src/TransitionKeepAlive.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ void TransitionKeepAlive::OpenWipingRight( ScreenMessage send_when_done )
void TransitionKeepAlive::OpenWipingLeft( ScreenMessage send_when_done )
{
if( STOP_MUSIC_ON_NEXT )
SOUNDMAN->music->StopPlaying();
SOUNDMAN->StopMusic();
this->SetTransitionTime( KEEP_ALIVE_BACKWARD_TRANSITION_TIME );