From 0d382c7708e1b087f35b6d4ea5fc795df52c2a22 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 15 Aug 2010 10:17:04 +0000
Subject: - added support for 4 (and even 6) players on one screen. its
 hard-coded and not finished yet. the score screen needs adjustment. - update
 of acinerella, changed pixel format to BGR (seems to be better than RGB) -
 update of the language files. big thanks to thursday for the english
 translation! - added languages.xls for managing the language files - added
 support for vbr-files (prescan). - reduced the volume in applause.mp3 - added
 description of plugins in challenge mode

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2609 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UMusic.pas | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Game/Code/Classes/UMusic.pas')

diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index 6af444c8..13d7fcb6 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -539,12 +539,11 @@ begin
 {    MediaPlayer.FileName := Name;
     MediaPlayer.Open;}
 
-    Bass := Bass_StreamCreateFile(false, PChar(Name), 0, 0, 0);
+    Bass := Bass_StreamCreateFile(false, PChar(Name), 0, 0, BASS_STREAM_PRESCAN);
     if (Bass>0) then
       Loaded := true
     else
     begin
-      Loaded := false;
       errorCode := BASS_ErrorGetCode();
       Log.LogError('Error (' + IntToStr(errorCode) + ') on open File: ' + Name);
     end;
@@ -580,7 +579,8 @@ end;
 
 procedure TMusic.Play;
 begin
-  if Loaded then begin
+  if Loaded then
+  begin
 //    MediaPlayer.Play;
     if Loop then BASS_ChannelPlay(Bass, True); // start from beginning... actually bass itself does not loop, nor does this TMusic Class
     BASS_ChannelPlay(Bass, False); // for setting position before playing
@@ -589,7 +589,8 @@ end;
 
 procedure TMusic.Pause; //Pause Mod
 begin
-  if Loaded then begin
+  if Loaded then
+  begin
     BASS_ChannelPause(Bass); // Pauses Song
   end;
 end;
@@ -607,6 +608,7 @@ procedure TMusic.Close;
 begin
   Bass_StreamFree(Bass);
   DSP_VocalRemover:=0;
+  Loaded := false;
 //  Player.Free;
 //  MediaPlayer.Close;
 end;
@@ -645,7 +647,8 @@ function TMusic.Finished: boolean;
 begin
   Result := false;
 //  if ModeStr[MediaPlayer.Mode] = 'Stopped' then Result := true;
-  if BASS_ChannelIsActive(BASS) = BASS_ACTIVE_STOPPED then begin
+  if BASS_ChannelIsActive(BASS) = BASS_ACTIVE_STOPPED then
+  begin
 //    beep;
     Result := true;
   end;
-- 
cgit v1.2.3