From 60e6d3f9904a8114e985fccd14454b9b604ea275 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 28 Apr 2010 19:54:31 +0000
Subject: - new SDL.dll (with a quick and dirty workaround for the
 hanging-mouse problem) - changing of sorting and folder-option (on/off) does
 not need any restart now - a lot of code clean up - some bugfixes... i
 hope... dont't know which...

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

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

diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index fae0ffd2..1e608c68 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -232,8 +232,8 @@ uses UGraphic, URecord, UFiles, UIni, UMain, UThemes, UTime;
 //from http://www.un4seen.com/forum/?topic=5943.0;hl=sbvocalcut16
 procedure SBVocalCut16(handle: DWORD; channel: DWORD; buffer: Pointer; length: DWORD; user: DWORD); stdcall;
 var
-  i, k: DWORD;
-  dmch: Smallint;
+  i:        DWORD;
+  dmch:     Smallint;
   lch, rch: PSmallint;
 
 begin
@@ -305,15 +305,12 @@ begin
 end;
 
 procedure TMusic.InitializePlayback;
-var
-  Pet:  integer;
-  S:    integer;
 begin
   Log.BenchmarkStart(4);
   Log.LogStatus('Initializing Playback Subsystem', 'Music Initialize');
   Loaded := false;
   Loop := false;
-  fHWND := AllocateHWND( nil);
+  fHWND := Classes.AllocateHWND( nil);
 
   if BASS_Init(1, 44100, 0, fHWND, nil) = false then 
   begin
@@ -367,14 +364,7 @@ end;
 procedure TMusic.InitializeRecord;
 var
   S:        integer;
-  device:   integer;
-  descr:    string;
-  input:    integer;
-  input2:   integer;
-  flags:    integer;
-  mic:      array[0..15] of integer;
-  SC:       integer; // soundcard
-  SCI:      integer; // soundcard input
+
 begin
   if RecordSystem = 1 then begin
     SetLength(Sound, 6 {max players});//Ini.Players+1);
@@ -566,7 +556,7 @@ function TMusic.Length: real;
 var
   bytes:    integer;
 begin
-  Result := 60;
+  //Result := 60;
 
   bytes  := BASS_ChannelGetLength( Bass );
   Result := BASS_ChannelBytes2Seconds(Bass, bytes);
@@ -582,7 +572,7 @@ function TMusic.Position: real;
 var
   bytes:    integer;
 begin
-  Result := 0;//MediaPlayer.Position / 1000;
+  //Result := 0;//MediaPlayer.Position / 1000;
   bytes := BASS_ChannelGetPosition(BASS);
   Result := BASS_ChannelBytes2Seconds(BASS, bytes);
 end;
@@ -902,8 +892,8 @@ end;
 
 //Equalizer
 function TMusic.GetFFTData: TFFTData;
-var
-Data: TFFTData;
+{var
+Data: TFFTData;}
 begin
   //Get Channel Data Mono and 256 Values
   BASS_ChannelGetData(Bass, @Result, BASS_DATA_FFT512);
@@ -1013,4 +1003,4 @@ begin
   end;
   SetLength(BassVoices, 0);
 end;
-end.
+end.
\ No newline at end of file
-- 
cgit v1.2.3