This commit is contained in:
Glenn Maynard
2002-12-29 23:35:44 +00:00
parent 8acd92ef0a
commit bbc7fa5f81
2 changed files with 26 additions and 20 deletions
+25 -19
View File
@@ -52,8 +52,9 @@ MUSIC->Stop();
HEEEEEEEEELP.SetText( HEEEEEEEEELP.SetText(
"p Play\n" "p Play\n"
"s Stop\n" "s Stop\n"
"l Toggle looping\n" "l Set looping\n"
"a Toggle autostop\n"); "a Set autostop\n"
"c Set continue");
for(int i = 0; i < nsounds; ++i) for(int i = 0; i < nsounds; ++i)
{ {
@@ -65,21 +66,22 @@ MUSIC->Stop();
s[0].txt.SetXY(150, 100); s[0].txt.SetXY(150, 100);
s[1].txt.SetXY(450, 100); s[1].txt.SetXY(450, 100);
s[2].txt.SetXY(150, 250); s[2].txt.SetXY(150, 250);
// s[3].txt.SetXY(450, 250); s[3].txt.SetXY(450, 250);
// s[4].txt.SetXY(150, 400); s[4].txt.SetXY(150, 400);
s[0].s.Load("Themes/default/Sounds/_common menu music.ogg"); s[0].s.Load("Themes/default/Sounds/_common menu music.ogg");
s[1].s.Load("Themes/default/Sounds/music scroll music.ogg"); s[1].s.Load("Themes/default/Sounds/music scroll music.ogg");
s[2].s.Load("Themes/default/Sounds/evaluation extra stage.mp3"); s[2].s.Load("Themes/default/Sounds/evaluation extra stage.mp3");
// s[3].s.Load("Themes/default/Sounds/gameplay oni die.mp3"); s[3].s.Load("Themes/default/Sounds/gameplay oni die.wav");
// s[4].s.Load("Themes/default/Sounds/gameplay toasty.mp3"); s[4].s.Load("Themes/default/Sounds/gameplay toasty.mp3");
//s[0].s.SetStartSeconds(45);
//s[0].s.SetPositionSeconds();
// s[4].s.SetLengthSeconds(1);
//s[0].s.SetPlaybackRate(.9);
//s[0].s.SetStopMode(RageSound::M_LOOP);
//s[0].s.Play();
/*s[0].s.SetPositionSeconds(3);
s[0].s.SetStartSeconds(3);
s[0].s.SetLengthSeconds(1);
s[0].s.SetAutoStop(false);
s[0].s.Play();
*/
selected = 0; selected = 0;
} }
@@ -100,25 +102,26 @@ void ScreenSandbox::UpdateText(int n)
if(p) pos += ", "; if(p) pos += ", ";
pos += ssprintf("%.3f", snds[p]->GetPositionSeconds()); pos += ssprintf("%.3f", snds[p]->GetPositionSeconds());
} }
/*
s[n].txt.SetText(ssprintf( s[n].txt.SetText(ssprintf(
"%i: %s\n" "%i: %s\n"
"%s\n" "%s\n"
"%s\n" "%s\n"
"%s\n"
"(%s) of %.3f\n" "(%s) of %.3f\n"
"%s\n" "%s\n"
"%s", "%s",
n+1, fn.GetString(), n+1, fn.GetString(),
s[n].s.IsPlaying()? "Playing":"Stopped", s[n].s.IsPlaying()? "Playing":"Stopped",
s[n].s.GetLooping()? "Looping": "Not looping", // Not Member Of Rage Sound s[n].s.GetStopMode() == RageSound::M_STOP?
s[n].s.GetAutoStop()? "Stop when finished": "Continue until stopped", // Not Member Of Rage Sound "Stop when finished":
s[n].s.GetStopMode() == RageSound::M_CONTINUE?
"Continue until stopped":
"Loop",
pos.size()? pos.GetString(): "none playing", pos.size()? pos.GetString(): "none playing",
s[n].s.GetLengthSeconds(), s[n].s.GetLengthSeconds(),
s[n].s.IsStreaming()? "Streaming":"Preloaded", s[n].s.IsStreaming()? "Streaming":"Preloaded",
selected == n? "^^^^^^":"" selected == n? "^^^^^^":""
)); ));
*/
} }
void ScreenSandbox::Update(float f) void ScreenSandbox::Update(float f)
@@ -149,10 +152,13 @@ void ScreenSandbox::Input( const DeviceInput& DeviceI, const InputEventType type
s[selected].s.Stop(); s[selected].s.Stop();
break; break;
case 'l': case 'l':
// s[selected].s.SetLooping(!s[selected].s.GetLooping()); // Not Member Of RageSound s[selected].s.SetStopMode(RageSound::M_LOOP);
break; break;
case 'a': case 'a':
// s[selected].s.SetAutoStop(!s[selected].s.GetAutoStop()); // Not Member Of Rage Sound s[selected].s.SetStopMode(RageSound::M_STOP);
break;
case 'c':
s[selected].s.SetStopMode(RageSound::M_CONTINUE);
break; break;
/* case SDLK_LEFT: /* case SDLK_LEFT:
+1 -1
View File
@@ -19,7 +19,7 @@
#include "RageSound.h" #include "RageSound.h"
#include "Sample3dObject.h" #include "Sample3dObject.h"
const int nsounds = 3; const int nsounds = 5;
class ScreenSandbox : public Screen class ScreenSandbox : public Screen
{ {