diff options
Diffstat (limited to 'Game/Code/Screens')
28 files changed, 204 insertions, 181 deletions
diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas index 2bd0156a..b7d6d3e7 100644 --- a/Game/Code/Screens/UScreenCredits.pas +++ b/Game/Code/Screens/UScreenCredits.pas @@ -172,7 +172,7 @@ begin SDLK_BACKSPACE : begin FadeTo(@ScreenMain); - Music.PlayBack; + AudioPlayback.PlayBack; end; { SDLK_SPACE: begin @@ -288,7 +288,7 @@ begin deluxe_slidein := 0; Credits_Alpha := 0; //Music.SetLoop(true); Loop looped ned, so ne scheisse - Music.Open(soundpath + 'wome-credits-tune.mp3'); //danke kleinster liebster weeeetüüüüü!! + AudioPlayback.Open(soundpath + 'wome-credits-tune.mp3'); //danke kleinster liebster weeeetüüüüü!! // Music.Play; CTime:=0; // setlength(CTime_hold,0); @@ -344,7 +344,7 @@ end; procedure TScreenCredits.onHide; begin - Music.Stop; + AudioPlayback.Stop; end; Procedure TScreenCredits.Draw_FunkyText; @@ -445,7 +445,7 @@ const myLogoCoords: Array[0..27,0..1] of Cardinal = ((39,32),(84,32),(100,16),( begin //dis does teh muiwk y0r - Data := Music.GetFFTData; + Data := AudioPlayback.GetFFTData; Log.LogStatus('',' JB-1'); @@ -465,7 +465,7 @@ begin CRDTS_Stage:=Intro; CTime:=0; - Music.Play; + AudioPlayback.Play; end; if (CRDTS_Stage=Intro) and (CTime=Timings[7]) then @@ -1311,14 +1311,14 @@ Log.LogStatus('',' JB-4'); begin if CTime=Timings[20] then begin CTime_hold:=0; - Music.Stop; - Music.Open(soundpath + 'credits-outro-tune.mp3'); - Music.Play; - Music.SetVolume(20); - Music.SetLoop(True); + AudioPlayback.Stop; + AudioPlayback.Open(soundpath + 'credits-outro-tune.mp3'); + AudioPlayback.Play; + AudioPlayback.SetVolume(20); + AudioPlayback.SetLoop(True); end; if CTime_hold > 231 then begin - Music.Play; + AudioPlayback.Play; Ctime_hold:=0; end; glClearColor(0,0,0,0); diff --git a/Game/Code/Screens/UScreenEdit.pas b/Game/Code/Screens/UScreenEdit.pas index 93c2a5b4..a58756e6 100644 --- a/Game/Code/Screens/UScreenEdit.pas +++ b/Game/Code/Screens/UScreenEdit.pas @@ -36,14 +36,15 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenMain);
// Result := false;
end;
SDLK_RETURN:
begin
- if Interaction = 0 then begin
- Music.PlayStart;
+ if Interaction = 0 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenEditConvert);
end;
// if Interaction = 1 then begin
@@ -51,8 +52,9 @@ begin // FadeTo(@ScreenEditHeader);
// end;
- if Interaction = 1 then begin
- Music.PlayBack;
+ if Interaction = 1 then
+ begin
+ AudioPlayback.PlayBack;
FadeTo(@ScreenMain);
end;
end;
diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas index 762f84c2..1878337b 100644 --- a/Game/Code/Screens/UScreenEditConvert.pas +++ b/Game/Code/Screens/UScreenEditConvert.pas @@ -120,19 +120,21 @@ begin {$IFDEF UseMIDIPort}
MidiFile.StopPlaying;
{$ENDIF}
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenEdit);
end;
SDLK_RETURN:
begin
- if Interaction = 0 then begin
- Music.PlayStart;
+ if Interaction = 0 then
+ begin
+ AudioPlayback.PlayStart;
ScreenOpen.BackScreen := @ScreenEditConvert;
FadeTo(@ScreenOpen);
end;
- if Interaction = 1 then begin
+ if Interaction = 1 then
+ begin
Selected := false;
{$IFDEF UseMIDIPort}
MidiFile.OnMidiEvent := MidiFile1MidiEvent;
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index 22420b26..1dd3fb24 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -320,13 +320,13 @@ begin if SDL_ModState = 0 then begin
// Play Sentence
Click := true;
- Music.Stop;
+ AudioPlayback.Stop;
R := GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].StartNote);
- if R <= Music.Length then begin
- Music.MoveTo(R);
+ if R <= AudioPlayback.Length then begin
+ AudioPlayback.MoveTo(R);
PlayStopTime := GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].Koniec);
PlaySentence := true;
- Music.Play;
+ AudioPlayback.Play;
LastClick := -100;
end;
end;
@@ -349,10 +349,10 @@ begin PlaySentence := true;
Click := true;
- Music.Stop;
- Music.MoveTo(GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].StartNote)+0{-0.10});
+ AudioPlayback.Stop;
+ AudioPlayback.MoveTo(GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].StartNote)+0{-0.10});
PlayStopTime := GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].Koniec)+0;
- Music.Play;
+ AudioPlayback.Play;
LastClick := -100;
end;
end;
@@ -363,12 +363,12 @@ begin PlaySentenceMidi := false; // stop midi
PlaySentence := true;
Click := false;
- Music.Stop;
- Music.MoveTo(GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Start));
+ AudioPlayback.Stop;
+ AudioPlayback.MoveTo(GetTimeFromBeat(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Start));
PlayStopTime := (GetTimeFromBeat(
Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Start +
Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Dlugosc));
- Music.Play;
+ AudioPlayback.Play;
LastClick := -100;
end;
@@ -510,7 +510,7 @@ begin Lyric.AddCzesc(Czesci[0].Akt);
Lyric.Selected := 0;
- Music.Stop;
+ AudioPlayback.Stop;
PlaySentence := false;
end;
@@ -538,7 +538,7 @@ begin Lyric.AddCzesc(Czesci[0].Akt);
Lyric.Selected := 0;
- Music.Stop;
+ AudioPlayback.Stop;
PlaySentence := false;
end;
@@ -1188,7 +1188,7 @@ begin AktNuta := 0;
Czesci[0].Czesc[0].Nuta[0].Color := 1;
- Music.Open(Path + AktSong.Mp3);
+ AudioPlayback.Open(Path + AktSong.Mp3);
//Set Down Music Volume for Better hearability of Midi Sounds
//Music.SetVolume(40);
@@ -1262,20 +1262,22 @@ begin // mp3 music
if PlaySentence then begin
// stop the music
- if (Music.Position > PlayStopTime) then begin
- Music.Stop;
+ if (AudioPlayback.Position > PlayStopTime) then
+ begin
+ AudioPlayback.Stop;
PlaySentence := false;
end;
// click
if (Click) and (PlaySentence) then begin
// AktBeat := Floor(AktSong.BPM[0].BPM * (Music.Position - AktSong.GAP / 1000) / 60);
- AktBeat := Floor(GetMidBeat(Music.Position - AktSong.GAP / 1000));
+ AktBeat := Floor(GetMidBeat(AudioPlayback.Position - AktSong.GAP / 1000));
Text[TextDebug].Text := IntToStr(AktBeat);
if AktBeat <> LastClick then begin
for Pet := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
- if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Pet].Start = AktBeat) then begin
- Music.PlayClick;
+ if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Pet].Start = AktBeat) then
+ begin
+ AudioPlayback.PlayClick;
LastClick := AktBeat;
end;
end;
diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas index 34fc87af..df23d340 100644 --- a/Game/Code/Screens/UScreenLevel.pas +++ b/Game/Code/Screens/UScreenLevel.pas @@ -32,7 +32,7 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenName);
end;
@@ -40,7 +40,7 @@ begin begin
Ini.Difficulty := Interaction;
Ini.SaveLevel;
- Music.PlayStart;
+ AudioPlayback.PlayStart;
//Set Standard Mode
ScreenSong.Mode := 0;
FadeTo(@ScreenSong);
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;
diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas index 0d98e944..5363d2a2 100644 --- a/Game/Code/Screens/UScreenName.pas +++ b/Game/Code/Screens/UScreenName.pas @@ -156,7 +156,7 @@ begin SDLK_ESCAPE :
begin
Ini.SaveNames;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
if GoTo_SingScreen then
FadeTo(@ScreenSong)
else
@@ -168,7 +168,7 @@ begin for I := 1 to 6 do
Ini.Name[I-1] := Button[I-1].Text[0].Text;
Ini.SaveNames;
- Music.PlayStart;
+ AudioPlayback.PlayStart;
if GoTo_SingScreen then
FadeTo(@ScreenSing)
diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas index c27ee762..edf684db 100644 --- a/Game/Code/Screens/UScreenOpen.pas +++ b/Game/Code/Screens/UScreenOpen.pas @@ -57,7 +57,7 @@ begin begin
//Empty Filename and go to last Screen
FileName := '';
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(BackScreen);
end;
@@ -66,14 +66,14 @@ begin if (Interaction = 2) then begin
//Update Filename and go to last Screen
FileName := Text[TextN].Text;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(BackScreen);
end
else if (Interaction = 1) then
begin
//Empty Filename and go to last Screen
FileName := '';
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(BackScreen);
end;
end;
diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas index a1f64659..1867d03b 100644 --- a/Game/Code/Screens/UScreenOptions.pas +++ b/Game/Code/Screens/UScreenOptions.pas @@ -36,49 +36,57 @@ begin SDLK_BACKSPACE :
begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenMain);
end;
SDLK_RETURN:
begin
- if SelInteraction = 0 then begin
- Music.PlayStart;
+ if SelInteraction = 0 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsGame);
end;
- if SelInteraction = 1 then begin
- Music.PlayStart;
+ if SelInteraction = 1 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsGraphics);
end;
- if SelInteraction = 2 then begin
- Music.PlayStart;
+ if SelInteraction = 2 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsSound);
end;
- if SelInteraction = 3 then begin
- Music.PlayStart;
+ if SelInteraction = 3 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsLyrics);
end;
- if SelInteraction = 4 then begin
- Music.PlayStart;
+ if SelInteraction = 4 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsThemes);
end;
- if SelInteraction = 5 then begin
- Music.PlayStart;
+ if SelInteraction = 5 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsRecord);
end;
- if SelInteraction = 6 then begin
- Music.PlayStart;
+ if SelInteraction = 6 then
+ begin
+ AudioPlayback.PlayStart;
FadeTo(@ScreenOptionsAdvanced);
end;
- if SelInteraction = 7 then begin
+ if SelInteraction = 7 then
+ begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenMain);
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas index 63c3aa7a..271ff972 100644 --- a/Game/Code/Screens/UScreenOptionsAdvanced.pas +++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas @@ -32,7 +32,7 @@ begin SDLK_BACKSPACE :
begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
@@ -41,7 +41,7 @@ begin //if SelInteraction = 7 then begin
if SelInteraction = 6 then begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
end;
@@ -54,7 +54,7 @@ begin //SelectLoadAnimation Hidden because it is useless atm
//if (SelInteraction >= 0) and (SelInteraction <= 6) then begin
if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractInc;
end;
end;
@@ -63,7 +63,7 @@ begin //SelectLoadAnimation Hidden because it is useless atm
//if (SelInteraction >= 0) and (SelInteraction <= 6) then begin
if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractDec;
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas index 0f69f326..1d94ffa6 100644 --- a/Game/Code/Screens/UScreenOptionsGame.pas +++ b/Game/Code/Screens/UScreenOptionsGame.pas @@ -33,14 +33,14 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
RefreshSongs;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
begin
if SelInteraction = 6 then begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
RefreshSongs;
FadeTo(@ScreenOptions);
end;
@@ -51,15 +51,17 @@ begin InteractPrev;
SDLK_RIGHT:
begin
- if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
- Music.PlayOption;
+ if (SelInteraction >= 0) and (SelInteraction <= 5) then
+ begin
+ AudioPlayback.PlayOption;
InteractInc;
end;
end;
SDLK_LEFT:
begin
- if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
- Music.PlayOption;
+ if (SelInteraction >= 0) and (SelInteraction <= 5) then
+ begin
+ AudioPlayback.PlayOption;
InteractDec;
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas index d4be6974..c0ea90ff 100644 --- a/Game/Code/Screens/UScreenOptionsGraphics.pas +++ b/Game/Code/Screens/UScreenOptionsGraphics.pas @@ -32,7 +32,7 @@ begin SDLK_BACKSPACE :
begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
@@ -42,7 +42,7 @@ begin end;}
if SelInteraction = 5 then begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
end;
@@ -53,14 +53,14 @@ begin SDLK_RIGHT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 4) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractInc;
end;
end;
SDLK_LEFT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 4) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractDec;
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas index 5cadc5b9..7ef7c207 100644 --- a/Game/Code/Screens/UScreenOptionsLyrics.pas +++ b/Game/Code/Screens/UScreenOptionsLyrics.pas @@ -32,14 +32,14 @@ begin SDLK_BACKSPACE :
begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
begin
if SelInteraction = 3 then begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
end;
@@ -50,14 +50,14 @@ begin SDLK_RIGHT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractInc;
end;
end;
SDLK_LEFT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractDec;
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas index ef8b31d1..d497c637 100644 --- a/Game/Code/Screens/UScreenOptionsRecord.pas +++ b/Game/Code/Screens/UScreenOptionsRecord.pas @@ -36,14 +36,14 @@ begin SDLK_BACKSPACE: begin Ini.Save; - Music.PlayBack; + AudioPlayback.PlayBack; FadeTo(@ScreenOptions); end; SDLK_RETURN: begin if SelInteraction = 4 then begin Ini.Save; - Music.PlayBack; + AudioPlayback.PlayBack; FadeTo(@ScreenOptions); end; end; @@ -54,7 +54,7 @@ begin SDLK_RIGHT: begin if (SelInteraction >= 0) and (SelInteraction <= 3) then begin - Music.PlayOption; + AudioPlayback.PlayOption; InteractInc; end; if SelInteraction = 0 then UpdateCard; @@ -62,7 +62,7 @@ begin SDLK_LEFT: begin if (SelInteraction >= 0) and (SelInteraction <= 3) then begin - Music.PlayOption; + AudioPlayback.PlayOption; InteractDec; end; if SelInteraction = 0 then UpdateCard; diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas index 3c3e28e4..1777228b 100644 --- a/Game/Code/Screens/UScreenOptionsSound.pas +++ b/Game/Code/Screens/UScreenOptionsSound.pas @@ -32,14 +32,14 @@ begin SDLK_BACKSPACE :
begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
begin
if SelInteraction = 6 then begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
end;
@@ -50,14 +50,14 @@ begin SDLK_RIGHT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractInc;
end;
end;
SDLK_LEFT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 5) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractDec;
end;
end;
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas index 5b5f8877..cf89ac3f 100644 --- a/Game/Code/Screens/UScreenOptionsThemes.pas +++ b/Game/Code/Screens/UScreenOptionsThemes.pas @@ -35,14 +35,14 @@ begin SDLK_BACKSPACE :
begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
begin
if SelInteraction = 3 then begin
Ini.Save;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenOptions);
end;
end;
@@ -53,14 +53,14 @@ begin SDLK_RIGHT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractInc;
end;
end;
SDLK_LEFT:
begin
if (SelInteraction >= 0) and (SelInteraction <= 2) then begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractDec;
end;
end;
diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas index 30a1f8f0..ee534781 100644 --- a/Game/Code/Screens/UScreenPartyNewRound.pas +++ b/Game/Code/Screens/UScreenPartyNewRound.pas @@ -92,13 +92,13 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
CheckFadeTo(@ScreenMain,'MSG_END_PARTY');
end;
SDLK_RETURN:
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
if DLLMan.Selected.LoadSong then
begin
//Select PartyMode ScreenSong
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas index ab6bd733..714e0d99 100644 --- a/Game/Code/Screens/UScreenPartyOptions.pas +++ b/Game/Code/Screens/UScreenPartyOptions.pas @@ -63,7 +63,7 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenMain);
end;
@@ -113,7 +113,7 @@ begin //Start Party
PartySession.StartNewParty(Rounds + 2);
- Music.PlayStart;
+ AudioPlayback.PlayStart;
//Go to Player Screen
FadeTo(@ScreenPartyPlayer);
end;
@@ -125,7 +125,7 @@ begin SDLK_UP: InteractPrev;
SDLK_RIGHT:
begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractInc;
//Change Playlist2 if Playlist is Changed
@@ -140,7 +140,7 @@ begin end;
SDLK_LEFT:
begin
- Music.PlayOption;
+ AudioPlayback.PlayOption;
InteractDec;
//Change Playlist2 if Playlist is Changed
diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas index e6830ee6..24534599 100644 --- a/Game/Code/Screens/UScreenPartyPlayer.pas +++ b/Game/Code/Screens/UScreenPartyPlayer.pas @@ -184,7 +184,7 @@ begin SDLK_ESCAPE:
begin
Ini.SaveNames;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenPartyOptions);
end;
@@ -202,7 +202,7 @@ begin end;
end;
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenPartyNewRound);
end;
diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas index 6333896c..6af835f2 100644 --- a/Game/Code/Screens/UScreenPartyScore.pas +++ b/Game/Code/Screens/UScreenPartyScore.pas @@ -57,7 +57,7 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
if (PartySession.CurRound < High(PartySession.Rounds)) then
FadeTo(@ScreenPartyNewRound)
else
@@ -69,7 +69,7 @@ begin SDLK_RETURN:
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
if (PartySession.CurRound < High(PartySession.Rounds)) then
FadeTo(@ScreenPartyNewRound)
else
diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas index fecca3d1..3c7ad921 100644 --- a/Game/Code/Screens/UScreenPartyWin.pas +++ b/Game/Code/Screens/UScreenPartyWin.pas @@ -50,13 +50,13 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenMain);
end;
SDLK_RETURN:
begin
- Music.PlayStart;
+ AudioPlayback.PlayStart;
FadeTo(@ScreenMain);
end;
end;
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index 9e43f31f..e0c80297 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -146,7 +146,7 @@ begin //Sound[0].BufferLong Finish; - Music.PlayBack; + AudioPlayback.PlayBack; FadeTo(@ScreenScore); end; @@ -182,7 +182,7 @@ begin Paused := true; // pause Music - Music.Pause; + AudioPlayback.Pause; // pause Video if (AktSong.Video <> '') and FileExists(AktSong.Path + AktSong.Video) then @@ -193,9 +193,9 @@ begin Czas.Teraz := PauseTime; //Position of Notes // Position of Music - Music.MoveTo (PauseTime); + AudioPlayback.MoveTo (PauseTime); // Play Music - Music.Play; + AudioPlayback.Play; // Video if (AktSong.Video <> '') and FileExists(AktSong.Path + AktSong.Video) then @@ -451,14 +451,14 @@ begin // play music (I) - Music.CaptureStart; - Music.MoveTo(AktSong.Start); + AudioPlayback.CaptureStart; + AudioPlayback.MoveTo(AktSong.Start); // Music.Play; // prepare timer (I) // CountSkipTimeSet; Czas.Teraz := AktSong.Start; - Czas.Razem := Music.Length; + Czas.Razem := AudioPlayback.Length; if (AktSong.Finish > 0) then Czas.Razem := AktSong.Finish / 1000; Czas.OldBeat := -1; for P := 0 to High(Player) do @@ -871,7 +871,7 @@ begin end; // play music (II) - Music.Play; + AudioPlayback.Play; // prepare timer (II) CountSkipTimeSet; @@ -1147,7 +1147,7 @@ begin // check for music finish // Log.LogError('Check for music finish: ' + BoolToStr(Music.Finished) + ' ' + FloatToStr(Czas.Teraz*1000) + ' ' + IntToStr(AktSong.Finish)); if ShowFinish then begin - if (not Music.Finished) and ((AktSong.Finish = 0) or (Czas.Teraz*1000 <= AktSong.Finish)) then begin + if (not AudioPlayback.Finished) and ((AktSong.Finish = 0) or (Czas.Teraz*1000 <= AktSong.Finish)) then begin //Pause Mod: if not Paused then Sing(Self); // analyze song @@ -1201,8 +1201,8 @@ end; procedure TScreenSing.Finish; begin - Music.CaptureStop; - Music.Stop; + AudioPlayback.CaptureStop; + AudioPlayback.Stop; if Ini.SavePlayback = 1 then begin Log.BenchmarkStart(0); diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas index d18dd5bc..a05c6d4b 100644 --- a/Game/Code/Screens/UScreenSingModi.pas +++ b/Game/Code/Screens/UScreenSingModi.pas @@ -102,7 +102,7 @@ begin SDLK_BACKSPACE : begin Finish; - Music.PlayBack; + AudioPlayback.PlayBack; FadeTo(@ScreenPartyScore); end; @@ -170,7 +170,7 @@ begin end
else //Start Without Song
begin
- Music.CaptureStart;
+ AudioPlayback.CaptureStart;
end;
//Set Playerinfo
@@ -531,7 +531,7 @@ end; if ShowFinish then begin
if DllMan.Selected.LoadSong then
begin
- if (not Music.Finished) and ((AktSong.Finish = 0) or (Czas.Teraz*1000 <= AktSong.Finish)) then begin
+ if (not AudioPlayback.Finished) and ((AktSong.Finish = 0) or (Czas.Teraz*1000 <= AktSong.Finish)) then begin
//Pause Mod:
if not Paused then
Sing(Self); // analyze song
@@ -658,12 +658,12 @@ end; function LoadSound (const Name: PChar): Cardinal; stdcall; //Procedure that loads a Custom Sound begin - Result := Music.LoadCustomSound(String(Name)); + Result := AudioPlayback.LoadCustomSound(String(Name)); end; procedure PlaySound (const Index: Cardinal); stdcall; //Plays a Custom Sound begin - Music.PlayCustomSound(Index); + AudioPlayback.PlayCustomSound(Index); end; end. diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 0bf411c1..df4ec87a 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -265,7 +265,7 @@ begin begin SkipTo(CatSongs.VisibleIndex((I + Interaction) mod I2)); - Music.PlayChange; + AudioPlayback.PlayChange; ChangeMusic; SetScroll4; @@ -284,7 +284,7 @@ begin begin SkipTo(CatSongs.VisibleIndex((I + Interaction) mod I2)); - Music.PlayChange; + AudioPlayback.PlayChange; ChangeMusic; SetScroll4; @@ -326,7 +326,7 @@ begin Interaction := I - 1; //Stop Music - Music.Stop; + AudioPlayback.Stop; CatSongs.ShowCategoryList; @@ -361,8 +361,8 @@ begin end else begin - Music.Stop; - Music.PlayBack; + AudioPlayback.Stop; + AudioPlayback.PlayBack; FadeTo(@ScreenMain); end; @@ -372,7 +372,7 @@ begin //When in party Mode then Ask before Close else if (Mode = 1) then begin - Music.PlayBack; + AudioPlayback.PlayBack; CheckFadeTo(@ScreenMain,'MSG_END_PARTY'); end; end; @@ -495,7 +495,7 @@ begin FixSelected; //Play Music: - Music.PlayChange; + AudioPlayback.PlayChange; ChangeMusic; end; @@ -538,7 +538,7 @@ begin FixSelected; //Play Music: - Music.PlayChange; + AudioPlayback.PlayChange; ChangeMusic; end; end; @@ -548,8 +548,9 @@ begin SDLK_RIGHT: begin - if (Length(Songs.Song) > 0) AND (Mode = 0) then begin - Music.PlayChange; + if (Length(Songs.Song) > 0) AND (Mode = 0) then + begin + AudioPlayback.PlayChange; SelectNext; // InteractNext; // SongTarget := Interaction; @@ -563,7 +564,7 @@ begin SDLK_LEFT: begin if (Length(Songs.Song) > 0)AND (Mode = 0) then begin - Music.PlayChange; + AudioPlayback.PlayChange; SelectPrev; ChangeMusic; SetScroll4; @@ -643,9 +644,9 @@ begin end else //Random in one Category begin - SkipTo(Random(CatSongs.VisibleSongs)); + SkipTo(Random(CatSongs.VisibleSongs)); end; - Music.PlayChange; + AudioPlayback.PlayChange; ChangeMusic; SetScroll4; @@ -1410,7 +1411,7 @@ end; procedure TScreenSong.onShow; begin - Music.Stop; + AudioPlayback.Stop; if Ini.Players <= 3 then PlayersPlay := Ini.Players + 1; if Ini.Players = 4 then PlayersPlay := 6; @@ -1429,13 +1430,13 @@ begin //Load Music only when Song Preview is activated if (Ini.PreviewVolume <> 0) then begin - Music.SetLoop(false); - Music.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3); - Music.MoveTo(Music.Length / 4); - Music.Play; + AudioPlayback.SetLoop(false); + AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3); + AudioPlayback.MoveTo(AudioPlayback.Length / 4); + AudioPlayback.Play; //Set Preview Volume - Music.SetMusicVolume (Ini.PreviewVolume * 10); + AudioPlayback.SetMusicVolume (Ini.PreviewVolume * 10); {//if Music Fade is activated, Set Volume to 0 % if (Ini.PreviewFading <> 0) then Music.SetMusicVolume(0);} @@ -1478,15 +1479,15 @@ procedure TScreenSong.onHide; begin //When Music Fading is activated, Turn Music to 100 % If (Ini.PreviewVolume <> 100) or (Ini.PreviewFading <> 0) then - Music.SetMusicVolume(100); + AudioPlayback.SetMusicVolume(100); //If Preview is deactivated: Load MUsicfile now If (Ini.PreviewVolume = 0) then - Music.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3); + AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3); //When hide then Stop Music (For Party Mode Popup on Exit) - if (Display.NextScreen <> @ScreenSing) and (Display.NextScreen <> @ScreenSingModi) and (Music <> nil) then - Music.Stop; + if (Display.NextScreen <> @ScreenSing) and (Display.NextScreen <> @ScreenSingModi) and (AudioPlayback <> nil) then + AudioPlayback.Stop; end; procedure TScreenSong.DrawExtensions; @@ -1546,13 +1547,13 @@ begin begin //Start Song Fade after a little Time, to prevent Song to be Played on Scrolling if (CoverTime < 0.2) and (CoverTime + TimeSkip >= 0.2) then - Music.Play; + AudioPlayback.Play; //Update Song Volume if (CoverTime < Ini.PreviewFading) then - Music.SetMusicVolume(Round (CoverTime * Ini.PreviewVolume / Ini.PreviewFading * 10)) + AudioPlayback.SetMusicVolume(Round (CoverTime * Ini.PreviewVolume / Ini.PreviewFading * 10)) else - Music.SetMusicVolume(Ini.PreviewVolume * 10); + AudioPlayback.SetMusicVolume(Ini.PreviewVolume * 10); end; @@ -1673,18 +1674,18 @@ begin begin if (NOT CatSongs.Song[Interaction].Main) AND(CatSongs.VisibleSongs > 0) then begin - Music.Close; - if Music.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3) then begin - Music.MoveTo(Music.Length / 4); + AudioPlayback.Close; + if AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3) then begin + AudioPlayback.MoveTo(AudioPlayback.Length / 4); //If Song Fading is activated then don't Play directly, and Set Volume to Null, else Play normal if (Ini.PreviewFading = 0) then - Music.Play + AudioPlayback.Play else - Music.SetMusicVolume(0); + AudioPlayback.SetMusicVolume(0); end; end else - Music.Stop; + AudioPlayback.Stop; end; end; @@ -1715,7 +1716,7 @@ var lTmp : double; begin -if (not Music.Finished) AND (Theme.Song.Equalizer.Length > 0) then +if (not AudioPlayback.Finished) AND (Theme.Song.Equalizer.Length > 0) then begin @@ -1724,7 +1725,7 @@ begin if (A <> EqualizerTime) then begin EqualizerTime := A; - Data := Music.GetFFTData; + Data := AudioPlayback.GetFFTData; B:=0; Pos := 0; @@ -1890,7 +1891,7 @@ begin end; end; - Music.PlayChange; + AudioPlayback.PlayChange; ChangeMusic; SetScroll; UpdateLCD; @@ -2003,7 +2004,7 @@ end; procedure TScreenSong.StartSong; begin CatSongs.Selected := Interaction; - Music.Stop; + AudioPlayback.Stop; //Party Mode if (Mode = 1) then begin @@ -2018,7 +2019,7 @@ end; procedure TScreenSong.SelectPlayers; begin CatSongs.Selected := Interaction; - Music.Stop; + AudioPlayback.Stop; ScreenName.Goto_SingScreen := True; FadeTo(@ScreenName); @@ -2026,9 +2027,10 @@ end; procedure TScreenSong.OpenEditor; begin - if (Length(Songs.Song) > 0) and (not CatSongs.Song[Interaction].Main) AND (Mode = 0) then begin - Music.Stop; - Music.PlayStart; + if (Length(Songs.Song) > 0) and (not CatSongs.Song[Interaction].Main) AND (Mode = 0) then + begin + AudioPlayback.Stop; + AudioPlayback.PlayStart; ScreenEditSub.Path := CatSongs.Song[Interaction].Path; ScreenEditSub.FileName := CatSongs.Song[Interaction].FileName; FadeTo(@ScreenEditSub); diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas index 48d23468..de78665e 100644 --- a/Game/Code/Screens/UScreenSongJumpto.pas +++ b/Game/Code/Screens/UScreenSongJumpto.pas @@ -65,7 +65,7 @@ begin SDLK_ESCAPE:
begin
Visible := False;
- Music.PlayBack;
+ AudioPlayback.PlayBack;
if (VisSongs = 0) AND (Length(Button[0].Text[0].Text) > 0) then
begin
ScreenSong.UnLoadDetailedCover;
diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas index ce331e2f..c6e16f60 100644 --- a/Game/Code/Screens/UScreenSongMenu.pas +++ b/Game/Code/Screens/UScreenSongMenu.pas @@ -94,7 +94,7 @@ begin SDLK_ESCAPE, SDLK_BACKSPACE : begin - Music.PlayBack; + AudioPlayback.PlayBack; Visible := False; end; diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas index 9dc6c525..1310b127 100644 --- a/Game/Code/Screens/UScreenStatDetail.pas +++ b/Game/Code/Screens/UScreenStatDetail.pas @@ -51,7 +51,7 @@ begin SDLK_ESCAPE,
SDLK_BACKSPACE :
begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenStatMain);
end;
SDLK_RETURN:
@@ -74,7 +74,7 @@ begin end;
if Interaction = 3 then begin
- Music.PlayBack;
+ AudioPlayback.PlayBack;
FadeTo(@ScreenStatMain);
end;
end;
diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas index 223ad2b2..4f46bec2 100644 --- a/Game/Code/Screens/UScreenStatMain.pas +++ b/Game/Code/Screens/UScreenStatMain.pas @@ -60,19 +60,20 @@ begin SDLK_BACKSPACE : begin Ini.Save; - Music.PlayBack; + AudioPlayback.PlayBack; FadeTo(@ScreenMain); end; SDLK_RETURN: begin //Exit Button Pressed - if Interaction = 4 then begin - Music.PlayBack; + if Interaction = 4 then + begin + AudioPlayback.PlayBack; FadeTo(@ScreenMain); end else //One of the Stats Buttons Pressed begin - Music.PlayBack; + AudioPlayback.PlayBack; ScreenStatDetail.Typ := Interaction; FadeTo(@ScreenStatDetail); end; |