diff options
| author | jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-10-11 12:02:20 +0000 |
|---|---|---|
| committer | jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-10-11 12:02:20 +0000 |
| commit | 44554c7908f7e2405a249331f00a35703f5939c2 (patch) | |
| tree | bd1a5d2be22e4b4494e0b66331dbfb16dcceb3c5 /Game/Code/Screens/UScreenMain.pas | |
| parent | 0d997f8433e982584a0ab67a6d630d12f4314759 (diff) | |
| download | usdx-44554c7908f7e2405a249331f00a35703f5939c2.tar.gz usdx-44554c7908f7e2405a249331f00a35703f5939c2.tar.xz usdx-44554c7908f7e2405a249331f00a35703f5939c2.zip | |
Added IAudioPlayback Interface and implementation for BASS.
Created "AudioPlayback" Global Singleton, which removed the need
for the "Music" Global variable. This was done because global singleton objects are
a recognized better "design pattern" achieving the same thing as global variables, but
in a nicer way.
I will be working to
a) separate IAudioPlayback in to separate "Playback" and "Input" Interfaces
b) build a FFMpeg class that implements IAudioPlayback
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@504 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/Screens/UScreenMain.pas | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas index aecc40bb..cb7390cc 100644 --- a/Game/Code/Screens/UScreenMain.pas +++ b/Game/Code/Screens/UScreenMain.pas @@ -92,7 +92,7 @@ begin //Credits_Y := 600;
//Credits_Alpha := 0;
//Credits_Visible := True;
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenCredits);
end;
end;
@@ -100,20 +100,20 @@ begin begin
if (Ini.Players >= 1) AND (Length(DLLMan.Plugins)>=1) then
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenPartyOptions);
end;
end;
SDLK_S:
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenStatMain);
end;
SDLK_E:
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenEdit);
end;
@@ -124,7 +124,7 @@ begin begin
if (Length(Songs.Song) >= 1) then
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
if (Ini.Players >= 0) and (Ini.Players <= 3) then PlayersPlay := Ini.Players + 1;
if (Ini.Players = 4) then PlayersPlay := 6;
@@ -141,7 +141,7 @@ begin begin
if (Length(DLLMan.Plugins)>=1) then
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenPartyOptions);
end
else //show error message, No Plugins Loaded
@@ -152,25 +152,29 @@ begin end;
//Stats
- if Interaction = 2 then begin
- Music.PlayStart;
+ if Interaction = 2 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenStatMain);
end;
//Editor
- if Interaction = 3 then begin
- Music.PlayStart;
+ if Interaction = 3 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenEdit);
end;
//Options
- if Interaction = 4 then begin
- Music.PlayStart;
+ if Interaction = 4 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptions);
end;
//Exit
- if Interaction = 5 then begin
+ if Interaction = 5 then
+ begin
Result := false;
end;
end;
|