diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-03-09 20:01:12 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-03-09 20:01:12 +0000 |
| commit | 26be8a72bc6c86dbb02c9ee142292eff7ca51216 (patch) | |
| tree | ae9eebf6d9b709b042c0d8b034648728869f3a1e /Game | |
| parent | 7251c4d179719e0a1fa3cd11e11bdec39d681e16 (diff) | |
| download | usdx-26be8a72bc6c86dbb02c9ee142292eff7ca51216.tar.gz usdx-26be8a72bc6c86dbb02c9ee142292eff7ca51216.tar.xz usdx-26be8a72bc6c86dbb02c9ee142292eff7ca51216.zip | |
bugfix: 100% volume in medley mode
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2186 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
| -rw-r--r-- | Game/Code/Classes/UMusic.pas | 7 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas index fbd7fb29..fae0ffd2 100644 --- a/Game/Code/Classes/UMusic.pas +++ b/Game/Code/Classes/UMusic.pas @@ -455,8 +455,11 @@ begin if Volume > 100 then
Volume := 100;
- //Set Volume
+ //Set MP3 Volume
BASS_ChannelSetAttributes (Bass, -1, Volume, -101);
+
+ //Set Applause Volume
+ BASS_ChannelSetAttributes (BassApplause, -1, Volume, -101);
end;
procedure TMusic.Fade(InitVolume, TargetVolume: Integer; FadeTime: real);
@@ -499,7 +502,7 @@ begin Loaded := true;
DSP_VocalRemover:=0;
//Set Max Volume
- SetMusicVolume (100);
+ //SetMusicVolume (100);
end;
Result := Loaded;
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index eeb7edbb..43ad1dde 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -1397,7 +1397,7 @@ begin begin
PlaylistMedley.ApplausePlayed:=true;
Music.PlayApplause;
- Music.Fade(100, 10, AktSong.Medley.FadeOut_time);
+ Music.Fade(MP3Volume, 10, AktSong.Medley.FadeOut_time);
end;
end;
|