lenght -> length

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@964 b956fd51-792f-4845-bead-9b4dfca2ff2c

6 files changed, 575 insertions, 575 deletions

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index 7523c10f..7e8e9849 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -305,7 +305,7 @@ begin
 
          // srodkowa czesc  -  middle part
         Rec.Left := Rec.Right;
-        Rec.Right := (Start+Lenght-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX;    // Dlugosc == lenght
+        Rec.Right := (Start+Length-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX;    // Dlugosc == length
 
         glBindTexture(GL_TEXTURE_2D, Tex_plain_Mid[PlayerNumber].TexNum);
         glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
@@ -407,10 +407,10 @@ var
 
                // Middle part of the note
                Rec.Left := Rec.Right;
-               Rec.Right := X + (Start+Lenght-Lines[0].Line[Lines[0].Current].StartNote) * TempR - NotesW - 0.5  + 10*ScreenX;
+               Rec.Right := X + (Start+Length-Lines[0].Line[Lines[0].Current].StartNote) * TempR - NotesW - 0.5  + 10*ScreenX;
 
                // (nowe) - dunno
-               if (Start+Lenght-1 = LineState.CurrentBeatD) then
+               if (Start+Length-1 = LineState.CurrentBeatD) then
                  Rec.Right := Rec.Right - (1-Frac(LineState.MidBeatD)) * TempR;
                // the left note is more right than the right note itself, sounds weird - so we fix that xD
                if Rec.Right <= Rec.Left then Rec.Right := Rec.Left;
@@ -442,8 +442,8 @@ var
             // Perfect note is stored
             if Perfect and (Ini.EffectSing=1) then
               begin
-                A := 1 - 2*(LineState.CurrentTime - GetTimeFromBeat(Start+Lenght));
-                  if not (Start+Lenght-1 = LineState.CurrentBeatD) then
+                A := 1 - 2*(LineState.CurrentTime - GetTimeFromBeat(Start+Length));
+                  if not (Start+Length-1 = LineState.CurrentBeatD) then
 
                   //Star animation counter
                   //inc(Starfr);
@@ -513,7 +513,7 @@ begin
           X2 := (Start-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left + 0.5 + 10*ScreenX + 4; // wciecie
           X1 := X2-W;
 
-          X3 := (Start+Lenght-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left - 0.5 + 10*ScreenX - 4; // wciecie
+          X3 := (Start+Length-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left - 0.5 + 10*ScreenX - 4; // wciecie
           X4 := X3+W;
 
           // left
@@ -1272,7 +1272,7 @@ begin
 
          // srodkowa czesc  -  middle part
         Rec.Left := Rec.Right;
-        Rec.Right := (Start+Lenght-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
+        Rec.Right := (Start+Length-Lines[NrCzesci].Line[Lines[NrCzesci].Current].StartNote) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
 
         glBindTexture(GL_TEXTURE_2D, Tex_Mid[Color].TexNum);
         glBegin(GL_QUADS);
diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas
index 8d3a1c42..b7c231db 100644
--- a/Game/Code/Classes/UFiles.pas
+++ b/Game/Code/Classes/UFiles.pas
@@ -120,7 +120,7 @@ begin
           1: NoteState := ': ';
           2: NoteState := '* ';
         end; // case
-        S := NoteState + IntToStr(Start-RelativeSubTime) + ' ' + IntToStr(Lenght) + ' ' + IntToStr(Tone) + ' ' + Text;
+        S := NoteState + IntToStr(Start-RelativeSubTime) + ' ' + IntToStr(Length) + ' ' + IntToStr(Tone) + ' ' + Text;
 
 
         WriteLn(SongFile, S);
diff --git a/Game/Code/Classes/ULyrics.pas b/Game/Code/Classes/ULyrics.pas
index 17c16d9e..6cec37b9 100644
--- a/Game/Code/Classes/ULyrics.pas
+++ b/Game/Code/Classes/ULyrics.pas
@@ -349,7 +349,7 @@ begin
     // copy values from SongLine to LyricLine
     CountNotes          := High(Line.Note);
     LyricLine.Start     := Line.Note[0].Start;
-    LyricLine.Length    := Line.Note[CountNotes].Start + Line.Note[CountNotes].Lenght - LyricLine.Start;
+    LyricLine.Length    := Line.Note[CountNotes].Start + Line.Note[CountNotes].Length - LyricLine.Start;
     LyricLine.CurWord   := -1;
     LyricLine.LastLine  := Line.LastLine;
     
@@ -366,7 +366,7 @@ begin
     For I := 0 to CountNotes do
     begin
       LyricLine.Words[I].Start     := Line.Note[I].Start;
-      LyricLine.Words[I].Length    := Line.Note[I].Lenght;
+      LyricLine.Words[I].Length    := Line.Note[I].Length;
       LyricLine.Words[I].Text      := Line.Note[I].Text;
       LyricLine.Words[I].Freestyle := Line.Note[I].FreeStyle;
       
diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index fd0c9eb5..3cf2f7d0 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -59,7 +59,7 @@ type
     IlNut:     integer;

     Note:     array of record

       Start:     integer;

-      Lenght:    integer;

+      Length:    integer;

       Detekt:    real;     // accurate place, detected in the note

       Tone:      real;

       Perfect:   boolean;  // true if the note matches the original one, lit the star

@@ -747,9 +747,9 @@ begin
   for N := 0 to Lines[0].Line[Lines[0].Current].HighNote do

   begin

     if (Lines[0].Line[Lines[0].Current].Note[N].Start <= LineState.MidBeat) and

-       (Lines[0].Line[Lines[0].Current].Note[N].Start + Lines[0].Line[Lines[0].Current].Note[N].Lenght >= LineState.MidBeat) then

+       (Lines[0].Line[Lines[0].Current].Note[N].Start + Lines[0].Line[Lines[0].Current].Note[N].Length >= LineState.MidBeat) then

     begin

-      Done := (LineState.MidBeat - Lines[0].Line[Lines[0].Current].Note[N].Start) / (Lines[0].Line[Lines[0].Current].Note[N].Lenght);

+      Done := (LineState.MidBeat - Lines[0].Line[Lines[0].Current].Note[N].Start) / (Lines[0].Line[Lines[0].Current].Note[N].Length);

     end;

   end;

 

@@ -758,7 +758,7 @@ begin
   // wylacza ostatnia nute po przejsciu

   {// todo: Lyrics

   if (Ini.LyricsEffect = 1) and (Done = 1) and

-    (LineState.MidBeat > Lines[0].Line[Lines[0].Current].Note[N].Start + Lines[0].Line[Lines[0].Current].Note[N].Lenght)

+    (LineState.MidBeat > Lines[0].Line[Lines[0].Current].Note[N].Start + Lines[0].Line[Lines[0].Current].Note[N].Length)

     then Sender.LyricMain.Selected := -1;

 

   if Done > 1 then Done := 1;

@@ -943,9 +943,9 @@ begin
       for Count := 0 to Lines[0].Line[S].HighNote do

       begin

         if ((Lines[0].Line[S].Note[Count].Start <= LineState.CurrentBeatD)

-          and (Lines[0].Line[S].Note[Count].Start + Lines[0].Line[S].Note[Count].Lenght - 1 >= LineState.CurrentBeatD))

+          and (Lines[0].Line[S].Note[Count].Start + Lines[0].Line[S].Note[Count].Length - 1 >= LineState.CurrentBeatD))

           and (not Lines[0].Line[S].Note[Count].FreeStyle) // but don't allow when it's FreeStyle note

-          and (Lines[0].Line[S].Note[Count].Lenght > 0) then // and make sure the note lenghts is at least 1

+          and (Lines[0].Line[S].Note[Count].Length > 0) then // and make sure the note lengths is at least 1

         begin

           SDet := S;

           Mozna := true;

@@ -967,7 +967,7 @@ begin
       begin

         if (Lines[0].Line[S].Note[Count].Start <= LineState.OldBeatD+1) and

            (Lines[0].Line[S].Note[Count].Start +

-            Lines[0].Line[S].Note[Count].Lenght > LineState.OldBeatD+1) then

+            Lines[0].Line[S].Note[Count].Length > LineState.OldBeatD+1) then

         begin

           // to robi, tylko dla pary nut (oryginalnej i gracza)

 

@@ -1027,15 +1027,15 @@ begin
       if S = SMax then

       begin

         New := true;

-        // jezeli ostatnia ma ten sam Tone

+        // if last has the same tone

         if (Player[CP].IlNut > 0 ) and

            (Player[CP].Note[Player[CP].HighNote].Tone = AudioInputProcessor.Sound[CP].Tone) and

-           (Player[CP].Note[Player[CP].HighNote].Start + Player[CP].Note[Player[CP].HighNote].Lenght = LineState.CurrentBeatD) then

+           (Player[CP].Note[Player[CP].HighNote].Start + Player[CP].Note[Player[CP].HighNote].Length = LineState.CurrentBeatD) then

         begin

           New := false;

         end;

 

-        // jezeli jest jakas nowa nuta na sprawdzanym beacie

+        // if is not as new note to control "beacie" (TODO: translate polish "beacie")

         for Count := 0 to Lines[0].Line[S].HighNote do

         begin

           if (Lines[0].Line[S].Note[Count].Start = LineState.CurrentBeatD) then

@@ -1050,7 +1050,7 @@ begin
           Player[CP].HighNote := Player[CP].HighNote + 1;

           SetLength(Player[CP].Note, Player[CP].IlNut);

           Player[CP].Note[Player[CP].HighNote].Start   := LineState.CurrentBeatD;

-          Player[CP].Note[Player[CP].HighNote].Lenght := 1;

+          Player[CP].Note[Player[CP].HighNote].Length := 1;

           Player[CP].Note[Player[CP].HighNote].Tone     := AudioInputProcessor.Sound[CP].Tone; // Ton || TonDokl

           Player[CP].Note[Player[CP].HighNote].Detekt  := LineState.MidBeat;

 

@@ -1062,14 +1062,14 @@ begin
         else

         begin

           // przedluzenie nuty

-          Player[CP].Note[Player[CP].HighNote].Lenght := Player[CP].Note[Player[CP].HighNote].Lenght + 1;

+          Player[CP].Note[Player[CP].HighNote].Length := Player[CP].Note[Player[CP].HighNote].Length + 1;

         end;

 

         // check for perfect note and then lit the star (on Draw)

         for Count := 0 to Lines[0].Line[S].HighNote do

         begin

           if (Lines[0].Line[S].Note[Count].Start = Player[CP].Note[Player[CP].HighNote].Start) and

-             (Lines[0].Line[S].Note[Count].Lenght = Player[CP].Note[Player[CP].HighNote].Lenght) and

+             (Lines[0].Line[S].Note[Count].Length = Player[CP].Note[Player[CP].HighNote].Length) and

              (Lines[0].Line[S].Note[Count].Tone = Player[CP].Note[Player[CP].HighNote].Tone) then

           begin

             Player[CP].Note[Player[CP].HighNote].Perfect := true;

@@ -1085,7 +1085,7 @@ begin
   if (sDet >= low(Lines[0].Line)) and (sDet <= high(Lines[0].Line)) then

   begin

     if assigned( Sender ) and

-       ((Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Start + Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Lenght - 1) = LineState.CurrentBeatD) then

+       ((Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Start + Lines[0].Line[SDet].Note[Lines[0].Line[SDet].HighNote].Length - 1) = LineState.CurrentBeatD) then

     begin

       Sender.onSentenceEnd(sDet);

     end;

diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index 4406ac21..c4123dd0 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -1,544 +1,544 @@
-unit UMusic;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-uses

-  Classes;

-

-type

-  TNoteType = (ntFreestyle, ntNormal, ntGolden);

-

-  //http://paste.ubuntu-nl.org/51892/

-

-  TMelody = record

-    Path:       string;

-    Start:      integer;      // start of song in ms

-    IlNut:      integer;      // (TODO: Il = tone, Nut(a) = Note)

-    NoteLenght: integer;

-  end;

-

-  PLine = ^TLine;

-  TLine = record

-    Start:      integer;

-    StartNote:  integer;

-    Lyric:      string;

-    LyricWidth: real;

-    End_:       integer;

-    BaseNote:   integer;

-    HighNote:   integer;

-    IlNut:      integer;      // (TODO: Il = tone, Nut(a) = Note)

-    TotalNotes: integer;

-    LastLine:   boolean;

-    Note:     array of record

-      Color:      integer;

-      Start:      integer;

-      Lenght:     integer;

-      Tone:       integer;    // full range tone

-      ToneGamus:  integer;    // tone unified to one octave

-      Text:       string;

-      FreeStyle:  boolean;

-      NoteType:   integer;    // normal-note: 1, golden-note: 2

-    end;

-  end;

-  ALine = array of TLine;     // (TODO: rename to TLineArray)

-

-  // (TCzesci = TSentences)  TCzesci changed to TLines because TSentences exist elseware in incompatible form

-  TLines = record

-    Current:    integer;      // for drawing of current line

-    High:       integer;

-    Number:      integer;

-    Resolution: integer;

-    NotesGAP:   integer;

-    NoteType:   integer;

-    Line:       ALine;

-  end;

-

-  // (TODO: rename TCzas to something like T(Line/Sentence)Time/TLinePosition/TLineState)

-  // (Czas = time)

-  TLineState = record        // all that concerns the current frames

-    OldBeat:      integer;    // previous discovered beat

-    CurrentBeat:  integer;

-    MidBeat:      real;       // like CurrentBeat

-

-    // now we use this for super synchronization!

-    // only used when analyzing voice

-    OldBeatD:     integer;    // previous discovered beat

-    CurrentBeatD: integer;

-    MidBeatD:     real;       // like CurrentBeatD

-    FracBeatD:    real;       // fractional part of MidBeatD

-

-    // we use this for audible clicks

-    OldBeatC:     integer;    // previous discovered beat

-    CurrentBeatC: integer;

-    MidBeatC:     real;       // like CurrentBeatC

-    FracBeatC:    real;       // fractional part of MidBeatC

-

-

-    OldLine:      integer;    // previous displayed sentence

-

-    CurrentTime:  real;

-    TotalTime:    real;

-  end;

-

-

-const

-  FFTSize = 512; // size of FFT data (output: FFTSize/2 values)

-type

-  TFFTData  = array[0..(FFTSize div 2)-1] of Single;

-

-type

-  TPCMStereoSample = array[0..1] of SmallInt;

-  TPCMData  = array[0..511] of TPCMStereoSample;

-

-type

-  TStreamStatus = (ssStopped, ssPlaying, ssPaused, ssBlocked, ssUnknown);

-const

-  StreamStatusStr:  array[TStreamStatus] of string =

-    ('Stopped', 'Playing', 'Paused', 'Blocked', 'Unknown');

-

-type

-  TAudioSampleFormat = (

-    asfU8, asfS8,         // unsigned/signed  8 bits

-    asfU16LSB, asfS16LSB, // unsigned/signed 16 bits (endianness: LSB)

-    asfU16MSB, asfS16MSB, // unsigned/signed 16 bits (endianness: MSB)

-    asfU16, asfS16,       // unsigned/signed 16 bits (endianness: System)

-    asfS24,               // signed 24 bits (endianness: System)

-    asfS32,               // signed 32 bits (endianness: System)

-    asfFloat              // float

-  );

-

-const

-  // Size of one sample (one channel only) in bytes

-  AudioSampleSize: array[TAudioSampleFormat] of integer = (

-    1, 1,     // asfU8, asfS8

-    2, 2,     // asfU16LSB, asfS16LSB

-    2, 2,     // asfU16MSB, asfS16MSB

-    2, 2,     // asfU16,    asfS16

-    3,        // asfS24

-    4,        // asfS32

-    4         // asfFloat

-  );

-

-type

-  TAudioFormatInfo = class

-    public

-      Channels    : byte;

-      SampleRate  : integer;

-      Format      : TAudioSampleFormat;

-      FrameSize   : integer; // calculated on construction

-

-      constructor Create(Channels: byte; SampleRate: integer; Format: TAudioSampleFormat);

-  end;

-

-type

-  TAudioProcessingStream = class

-    public

-      procedure Close();                    virtual; abstract;

-  end;

-

-  TAudioPlaybackStream = class(TAudioProcessingStream)

-    protected

-      function GetLoop(): boolean;          virtual; abstract;

-      procedure SetLoop(Enabled: boolean);  virtual; abstract;

-      function GetLength(): real;           virtual; abstract;

-      function GetStatus(): TStreamStatus;  virtual; abstract;

-      function GetVolume(): integer;        virtual; abstract;

-      procedure SetVolume(volume: integer); virtual; abstract;

-    public

-      procedure Play();                     virtual; abstract;

-      procedure Pause();                    virtual; abstract;

-      procedure Stop();                     virtual; abstract;

-

-      property Loop: boolean READ GetLoop WRITE SetLoop;

-      property Length: real READ GetLength;

-      property Status: TStreamStatus READ GetStatus;

-      property Volume: integer READ GetVolume WRITE SetVolume;

-  end;

-

-  (*

-  TAudioMixerStream = class(TAudioProcessingStream)

-    procedure AddStream(stream: TAudioProcessingStream);

-    procedure RemoveStream(stream: TAudioProcessingStream);

-    procedure SetMasterVolume(volume: cardinal);

-    function GetMasterVolume(): cardinal;

-    procedure SetStreamVolume(stream: TAudioProcessingStream; volume: cardinal);

-    function GetStreamVolume(stream: TAudioProcessingStream): cardinal;

-  end;

-  *)

-

-  TAudioDecodeStream = class(TAudioProcessingStream)

-    protected

-      function GetLength(): real;           virtual; abstract;

-      function GetPosition(): real;         virtual; abstract;

-      procedure SetPosition(Time: real);    virtual; abstract;

-      function IsEOF(): boolean;            virtual; abstract;

-    public

-      function ReadData(Buffer: PChar; BufSize: integer): integer; virtual; abstract;

-      function GetAudioFormatInfo(): TAudioFormatInfo; virtual; abstract;

-

-      property Length: real READ GetLength;

-      property Position: real READ GetPosition WRITE SetPosition;

-      property EOF: boolean READ IsEOF;

-  end;

-

-type

-  IGenericPlayback = Interface

-  ['{63A5EBC3-3F4D-4F23-8DFB-B5165FCE33DD}']

-      function GetName: String;

-

-      function  Open(const Filename: string): boolean; // true if succeed

-      procedure Close;

-

-      procedure Play;

-      procedure Pause;

-      procedure Stop;

-

-      procedure SetPosition(Time: real);

-      function  GetPosition: real;

-

-      property  Position : real READ GetPosition WRITE SetPosition;

-  end;

-

-  IVideoPlayback = Interface( IGenericPlayback )

-  ['{3574C40C-28AE-4201-B3D1-3D1F0759B131}']

-    procedure init();

-

-    procedure GetFrame(Time: Extended); // WANT TO RENAME THESE TO BE MORE GENERIC

-    procedure DrawGL(Screen: integer);  // WANT TO RENAME THESE TO BE MORE GENERIC

-

-  end;

-

-  IVideoVisualization = Interface( IVideoPlayback )

-  ['{5AC17D60-B34D-478D-B632-EB00D4078017}']

-  end;

-

-  IAudioPlayback = Interface( IGenericPlayback )

-  ['{E4AE0B40-3C21-4DC5-847C-20A87E0DFB96}']

-      function InitializePlayback: boolean;

-      procedure SetVolume(Volume: integer);

-      procedure SetMusicVolume(Volume: integer);

-      procedure SetLoop(Enabled: boolean);

-

-      procedure Rewind;

-      function  Finished: boolean;

-      function  Length: real;

-

-      // Sounds

-      function OpenSound(const Filename: String): TAudioPlaybackStream;

-      procedure PlaySound(stream: TAudioPlaybackStream);

-      procedure StopSound(stream: TAudioPlaybackStream);

-

-      // Equalizer

-      procedure GetFFTData(var data: TFFTData);

-

-      // Interface for Visualizer

-      function GetPCMData(var data: TPCMData): Cardinal;

-  end;

-

-  IGenericDecoder = Interface

-  ['{557B0E9A-604D-47E4-B826-13769F3E10B7}']

-      function GetName(): String;

-      function InitializeDecoder(): boolean;

-      //function IsSupported(const Filename: string): boolean;

-  end;

-

-  (*

-  IVideoDecoder = Interface( IGenericDecoder )

-  ['{2F184B2B-FE69-44D5-9031-0A2462391DCA}']

-      function Open(const Filename: string): TVideoDecodeStream;

-  end;

-  *)

-

-  IAudioDecoder = Interface( IGenericDecoder )

-  ['{AB47B1B6-2AA9-4410-BF8C-EC79561B5478}']

-      function Open(const Filename: string): TAudioDecodeStream;

-  end;

-

-  IAudioInput = Interface

-  ['{A5C8DA92-2A0C-4AB2-849B-2F7448C6003A}']

-      function GetName: String;

-      function InitializeRecord: boolean;

-

-      procedure CaptureStart;

-      procedure CaptureStop;

-  end;

-

-type

-  TSoundLibrary = class

-    public

-      Start:   TAudioPlaybackStream;

-      Back:    TAudioPlaybackStream;

-      Swoosh:  TAudioPlaybackStream;

-      Change:  TAudioPlaybackStream;

-      Option:  TAudioPlaybackStream;

-      Click:   TAudioPlaybackStream;

-      Drum:    TAudioPlaybackStream;

-      Hihat:   TAudioPlaybackStream;

-      Clap:    TAudioPlaybackStream;

-      Shuffle: TAudioPlaybackStream;

-

-      constructor Create();

-      destructor Destroy(); override;

-  end;

-

-var // TODO : JB --- THESE SHOULD NOT BE GLOBAL

-  // music

-  Melody:   TMelody;

-

-  // czesci z nutami;

-  Lines:   array of TLines;

-

-  // LineState

-  LineState:     TLineState;

-

-  SoundLib: TSoundLibrary;

-

-

-procedure InitializeSound;

-

-function  Visualization(): IVideoPlayback;

-function  VideoPlayback(): IVideoPlayback;

-function  AudioPlayback(): IAudioPlayback;

-function  AudioInput(): IAudioInput;

-function  AudioDecoder(): IAudioDecoder;

-

-function  AudioManager: TInterfaceList;

-

-

-implementation

-

-uses

-  sysutils,

-  UMain,

-  UCommandLine,

-  ULog;

-

-var

-  singleton_VideoPlayback : IVideoPlayback  = nil;

-  singleton_Visualization : IVideoPlayback  = nil;

-  singleton_AudioPlayback : IAudioPlayback  = nil;

-  singleton_AudioInput    : IAudioInput     = nil;

-  singleton_AudioDecoder  : IAudioDecoder   = nil;

-

-  singleton_AudioManager  : TInterfaceList  = nil;

-

-

-constructor TAudioFormatInfo.Create(Channels: byte; SampleRate: integer; Format: TAudioSampleFormat);

-begin

-  Self.Channels := Channels;

-  Self.SampleRate := SampleRate;

-  Self.Format := Format;

-  Self.FrameSize := AudioSampleSize[Format] * Channels;

-end;

-

-function AudioManager: TInterfaceList;

-begin

-  if singleton_AudioManager = nil then

-    singleton_AudioManager := TInterfaceList.Create();

-  

-  Result := singleton_AudioManager;

-end; //CompressionPluginManager

-

-

-function  VideoPlayback(): IVideoPlayback;

-begin

-  result := singleton_VideoPlayback;

-end;

-

-function  Visualization(): IVideoPlayback;

-begin

-  result := singleton_Visualization;

-end;

-

-function AudioPlayback(): IAudioPlayback;

-begin

-  result := singleton_AudioPlayback;

-end;

-

-function AudioInput(): IAudioInput;

-begin

-  result := singleton_AudioInput;

-end;

-

-function AudioDecoder(): IAudioDecoder;

-begin

-  result := singleton_AudioDecoder;

-end;

-

-procedure AssignSingletonObjects(); 

-var

-  lTmpInterface : IInterface;

-  iCount        : Integer;

-begin

-  lTmpInterface := nil;

-  

-

-

-  for iCount := 0 to AudioManager.Count - 1 do

-  begin

-    if assigned( AudioManager[iCount] ) then

-    begin

-      // if this interface is a Playback, then set it as the default used

-

-      if ( AudioManager[iCount].QueryInterface( IAudioPlayback, lTmpInterface ) = 0 ) AND

-         ( true ) then //not assigned( singleton_AudioPlayback ) ) then

-      begin

-        singleton_AudioPlayback := IAudioPlayback( lTmpInterface );

-      end;

-

-      // if this interface is a Input, then set it as the default used

-      if ( AudioManager[iCount].QueryInterface( IAudioInput, lTmpInterface )    = 0 ) AND

-         ( true ) then //not assigned( singleton_AudioInput ) ) then

-      begin

-        singleton_AudioInput := IAudioInput( lTmpInterface );

-      end;

-

-      // if this interface is a Decoder, then set it as the default used

-      if ( AudioManager[iCount].QueryInterface( IAudioDecoder, lTmpInterface )    = 0 ) AND

-         ( true ) then //not assigned( singleton_AudioDecoder ) ) then

-      begin

-        singleton_AudioDecoder := IAudioDecoder( lTmpInterface );

-      end;

-

-      // if this interface is a Input, then set it as the default used

-      if ( AudioManager[iCount].QueryInterface( IVideoPlayback, lTmpInterface ) = 0 ) AND

-         ( true ) then //not assigned( singleton_VideoPlayback ) ) then

-      begin

-        singleton_VideoPlayback := IVideoPlayback( lTmpInterface );

-      end;

-

-      if ( AudioManager[iCount].QueryInterface( IVideoVisualization, lTmpInterface ) = 0 ) AND

-         ( true ) then //not assigned( singleton_Visualization ) ) then

-      begin

-        singleton_Visualization := IVideoPlayback( lTmpInterface );

-      end;

-

-    end;

-  end;

-

-end;

-

-procedure InitializeSound;

-begin

-  singleton_AudioPlayback := nil;

-  singleton_AudioInput    := nil;

-  singleton_AudioDecoder  := nil;

-  singleton_VideoPlayback := nil;

-  singleton_Visualization := nil;

-

-  AssignSingletonObjects();

-

-  if VideoPlayback <> nil then

-  begin

-  end;

-

-  if AudioDecoder <> nil then

-  begin

-    while not AudioDecoder.InitializeDecoder do

-    begin

-      Log.LogError('Initialize failed, Removing - '+ AudioDecoder.GetName);

-      AudioManager.remove( AudioDecoder ); 

-      singleton_AudioDecoder  := nil;

-      AssignSingletonObjects();

-    end;

-  end;

-

-  if AudioPlayback <> nil then

-  begin

-    while not AudioPlayback.InitializePlayback do

-    begin

-      Log.LogError('Initialize failed, Removing - '+ AudioPlayback.GetName);

-      AudioManager.remove( AudioPlayback ); 

-      singleton_AudioPlayback := nil;

-      AssignSingletonObjects();

-    end;

-  end;

-

-  if AudioInput <> nil then

-  begin

-    while not AudioInput.InitializeRecord do

-    begin

-      Log.LogError('Initialize failed, Removing - '+ AudioInput.GetName);

-      AudioManager.remove( AudioInput ); 

-      singleton_AudioInput    := nil;

-      AssignSingletonObjects();

-    end;    

-  end;

-

-  // Load in-game sounds

-  SoundLib := TSoundLibrary.Create;

-

-  if FindCmdLineSwitch( cMediaInterfaces ) then

-  begin

-    writeln( '' );

-    writeln( '--------------------------------------------------------------' );

-    writeln( '  In-use Media Interfaces                                     ' );

-    writeln( '--------------------------------------------------------------' );

-    writeln( 'Registered Audio Playback Interface : ' + AudioPlayback.GetName );

-    writeln( 'Registered Audio Input    Interface : ' + AudioInput.GetName    );

-    writeln( 'Registered Video Playback Interface : ' + VideoPlayback.GetName );

-    writeln( 'Registered Visualization  Interface : ' + Visualization.GetName );

-    writeln( '--------------------------------------------------------------' );

-    writeln( '' );

-

-    halt;

-  end;

-end;

-

-constructor TSoundLibrary.Create();

-begin

-  //Log.LogStatus('Loading Sounds', 'Music Initialize');

-

-  //Log.BenchmarkStart(4);

-

-  Start   := AudioPlayback.OpenSound(SoundPath + 'Common start.mp3');

-  Back    := AudioPlayback.OpenSound(SoundPath + 'Common back.mp3');

-  Swoosh  := AudioPlayback.OpenSound(SoundPath + 'menu swoosh.mp3');

-  Change  := AudioPlayback.OpenSound(SoundPath + 'select music change music 50.mp3');

-  Option  := AudioPlayback.OpenSound(SoundPath + 'option change col.mp3');

-  Click   := AudioPlayback.OpenSound(SoundPath + 'rimshot022b.mp3');

-

-  //Drum    := AudioPlayback.OpenSound(SoundPath + 'bassdrumhard076b.mp3');

-  //Hihat   := AudioPlayback.OpenSound(SoundPath + 'hihatclosed068b.mp3');

-  //Clap    := AudioPlayback.OpenSound(SoundPath + 'claps050b.mp3');

-

-  //Shuffle := AudioPlayback.OpenSound(SoundPath + 'Shuffle.mp3');

-

-  //Log.BenchmarkEnd(4);

-  //Log.LogBenchmark('--> Loading Sounds', 4);

-end;

-

-destructor TSoundLibrary.Destroy();

-begin

-  Start.Free;

-  Back.Free;

-  Swoosh.Free;

-  Change.Free;

-  Option.Free;

-  Click.Free;

-

-  //Drum.Free;

-  //Hihat.Free;

-  //Clap.Free;

-

-  //Shuffle.Free;

-end;

-

-

-initialization

-begin

-  singleton_AudioManager := TInterfaceList.Create();

-  

-end;

-

-finalization

-  singleton_AudioManager.clear;

-  FreeAndNil( singleton_AudioManager );

-

-end.

+unit UMusic;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses
+  Classes;
+
+type
+  TNoteType = (ntFreestyle, ntNormal, ntGolden);
+
+  //http://paste.ubuntu-nl.org/51892/
+
+  TMelody = record
+    Path:       string;
+    Start:      integer;      // start of song in ms
+    IlNut:      integer;      // (TODO: Il = tone, Nut(a) = Note)
+    NoteLength: integer;
+  end;
+
+  PLine = ^TLine;
+  TLine = record
+    Start:      integer;
+    StartNote:  integer;
+    Lyric:      string;
+    LyricWidth: real;
+    End_:       integer;
+    BaseNote:   integer;
+    HighNote:   integer;
+    IlNut:      integer;      // (TODO: Il = tone, Nut(a) = Note)
+    TotalNotes: integer;
+    LastLine:   boolean;
+    Note:     array of record
+      Color:      integer;
+      Start:      integer;
+      Length:     integer;
+      Tone:       integer;    // full range tone
+      ToneGamus:  integer;    // tone unified to one octave
+      Text:       string;
+      FreeStyle:  boolean;
+      NoteType:   integer;    // normal-note: 1, golden-note: 2
+    end;
+  end;
+  ALine = array of TLine;     // (TODO: rename to TLineArray)
+
+  // (TCzesci = TSentences)  TCzesci changed to TLines because TSentences exist elseware in incompatible form
+  TLines = record
+    Current:    integer;      // for drawing of current line
+    High:       integer;
+    Number:      integer;
+    Resolution: integer;
+    NotesGAP:   integer;
+    NoteType:   integer;
+    Line:       ALine;
+  end;
+
+  // (TODO: rename TCzas to something like T(Line/Sentence)Time/TLinePosition/TLineState)
+  // (Czas = time)
+  TLineState = record        // all that concerns the current frames
+    OldBeat:      integer;    // previous discovered beat
+    CurrentBeat:  integer;
+    MidBeat:      real;       // like CurrentBeat
+
+    // now we use this for super synchronization!
+    // only used when analyzing voice
+    OldBeatD:     integer;    // previous discovered beat
+    CurrentBeatD: integer;
+    MidBeatD:     real;       // like CurrentBeatD
+    FracBeatD:    real;       // fractional part of MidBeatD
+
+    // we use this for audible clicks
+    OldBeatC:     integer;    // previous discovered beat
+    CurrentBeatC: integer;
+    MidBeatC:     real;       // like CurrentBeatC
+    FracBeatC:    real;       // fractional part of MidBeatC
+
+
+    OldLine:      integer;    // previous displayed sentence
+
+    CurrentTime:  real;
+    TotalTime:    real;
+  end;
+
+
+const
+  FFTSize = 512; // size of FFT data (output: FFTSize/2 values)
+type
+  TFFTData  = array[0..(FFTSize div 2)-1] of Single;
+
+type
+  TPCMStereoSample = array[0..1] of SmallInt;
+  TPCMData  = array[0..511] of TPCMStereoSample;
+
+type
+  TStreamStatus = (ssStopped, ssPlaying, ssPaused, ssBlocked, ssUnknown);
+const
+  StreamStatusStr:  array[TStreamStatus] of string =
+    ('Stopped', 'Playing', 'Paused', 'Blocked', 'Unknown');
+
+type
+  TAudioSampleFormat = (
+    asfU8, asfS8,         // unsigned/signed  8 bits
+    asfU16LSB, asfS16LSB, // unsigned/signed 16 bits (endianness: LSB)
+    asfU16MSB, asfS16MSB, // unsigned/signed 16 bits (endianness: MSB)
+    asfU16, asfS16,       // unsigned/signed 16 bits (endianness: System)
+    asfS24,               // signed 24 bits (endianness: System)
+    asfS32,               // signed 32 bits (endianness: System)
+    asfFloat              // float
+  );
+
+const
+  // Size of one sample (one channel only) in bytes
+  AudioSampleSize: array[TAudioSampleFormat] of integer = (
+    1, 1,     // asfU8, asfS8
+    2, 2,     // asfU16LSB, asfS16LSB
+    2, 2,     // asfU16MSB, asfS16MSB
+    2, 2,     // asfU16,    asfS16
+    3,        // asfS24
+    4,        // asfS32
+    4         // asfFloat
+  );
+
+type
+  TAudioFormatInfo = class
+    public
+      Channels    : byte;
+      SampleRate  : integer;
+      Format      : TAudioSampleFormat;
+      FrameSize   : integer; // calculated on construction
+
+      constructor Create(Channels: byte; SampleRate: integer; Format: TAudioSampleFormat);
+  end;
+
+type
+  TAudioProcessingStream = class
+    public
+      procedure Close();                    virtual; abstract;
+  end;
+
+  TAudioPlaybackStream = class(TAudioProcessingStream)
+    protected
+      function GetLoop(): boolean;          virtual; abstract;
+      procedure SetLoop(Enabled: boolean);  virtual; abstract;
+      function GetLength(): real;           virtual; abstract;
+      function GetStatus(): TStreamStatus;  virtual; abstract;
+      function GetVolume(): integer;        virtual; abstract;
+      procedure SetVolume(volume: integer); virtual; abstract;
+    public
+      procedure Play();                     virtual; abstract;
+      procedure Pause();                    virtual; abstract;
+      procedure Stop();                     virtual; abstract;
+
+      property Loop: boolean READ GetLoop WRITE SetLoop;
+      property Length: real READ GetLength;
+      property Status: TStreamStatus READ GetStatus;
+      property Volume: integer READ GetVolume WRITE SetVolume;
+  end;
+
+  (*
+  TAudioMixerStream = class(TAudioProcessingStream)
+    procedure AddStream(stream: TAudioProcessingStream);
+    procedure RemoveStream(stream: TAudioProcessingStream);
+    procedure SetMasterVolume(volume: cardinal);
+    function GetMasterVolume(): cardinal;
+    procedure SetStreamVolume(stream: TAudioProcessingStream; volume: cardinal);
+    function GetStreamVolume(stream: TAudioProcessingStream): cardinal;
+  end;
+  *)
+
+  TAudioDecodeStream = class(TAudioProcessingStream)
+    protected
+      function GetLength(): real;           virtual; abstract;
+      function GetPosition(): real;         virtual; abstract;
+      procedure SetPosition(Time: real);    virtual; abstract;
+      function IsEOF(): boolean;            virtual; abstract;
+    public
+      function ReadData(Buffer: PChar; BufSize: integer): integer; virtual; abstract;
+      function GetAudioFormatInfo(): TAudioFormatInfo; virtual; abstract;
+
+      property Length: real READ GetLength;
+      property Position: real READ GetPosition WRITE SetPosition;
+      property EOF: boolean READ IsEOF;
+  end;
+
+type
+  IGenericPlayback = Interface
+  ['{63A5EBC3-3F4D-4F23-8DFB-B5165FCE33DD}']
+      function GetName: String;
+
+      function  Open(const Filename: string): boolean; // true if succeed
+      procedure Close;
+
+      procedure Play;
+      procedure Pause;
+      procedure Stop;
+
+      procedure SetPosition(Time: real);
+      function  GetPosition: real;
+
+      property  Position : real READ GetPosition WRITE SetPosition;
+  end;
+
+  IVideoPlayback = Interface( IGenericPlayback )
+  ['{3574C40C-28AE-4201-B3D1-3D1F0759B131}']
+    procedure init();
+
+    procedure GetFrame(Time: Extended); // WANT TO RENAME THESE TO BE MORE GENERIC
+    procedure DrawGL(Screen: integer);  // WANT TO RENAME THESE TO BE MORE GENERIC
+
+  end;
+
+  IVideoVisualization = Interface( IVideoPlayback )
+  ['{5AC17D60-B34D-478D-B632-EB00D4078017}']
+  end;
+
+  IAudioPlayback = Interface( IGenericPlayback )
+  ['{E4AE0B40-3C21-4DC5-847C-20A87E0DFB96}']
+      function InitializePlayback: boolean;
+      procedure SetVolume(Volume: integer);
+      procedure SetMusicVolume(Volume: integer);
+      procedure SetLoop(Enabled: boolean);
+
+      procedure Rewind;
+      function  Finished: boolean;
+      function  Length: real;
+
+      // Sounds
+      function OpenSound(const Filename: String): TAudioPlaybackStream;
+      procedure PlaySound(stream: TAudioPlaybackStream);
+      procedure StopSound(stream: TAudioPlaybackStream);
+
+      // Equalizer
+      procedure GetFFTData(var data: TFFTData);
+
+      // Interface for Visualizer
+      function GetPCMData(var data: TPCMData): Cardinal;
+  end;
+
+  IGenericDecoder = Interface
+  ['{557B0E9A-604D-47E4-B826-13769F3E10B7}']
+      function GetName(): String;
+      function InitializeDecoder(): boolean;
+      //function IsSupported(const Filename: string): boolean;
+  end;
+
+  (*
+  IVideoDecoder = Interface( IGenericDecoder )
+  ['{2F184B2B-FE69-44D5-9031-0A2462391DCA}']
+      function Open(const Filename: string): TVideoDecodeStream;
+  end;
+  *)
+
+  IAudioDecoder = Interface( IGenericDecoder )
+  ['{AB47B1B6-2AA9-4410-BF8C-EC79561B5478}']
+      function Open(const Filename: string): TAudioDecodeStream;
+  end;
+
+  IAudioInput = Interface
+  ['{A5C8DA92-2A0C-4AB2-849B-2F7448C6003A}']
+      function GetName: String;
+      function InitializeRecord: boolean;
+
+      procedure CaptureStart;
+      procedure CaptureStop;
+  end;
+
+type
+  TSoundLibrary = class
+    public
+      Start:   TAudioPlaybackStream;
+      Back:    TAudioPlaybackStream;
+      Swoosh:  TAudioPlaybackStream;
+      Change:  TAudioPlaybackStream;
+      Option:  TAudioPlaybackStream;
+      Click:   TAudioPlaybackStream;
+      Drum:    TAudioPlaybackStream;
+      Hihat:   TAudioPlaybackStream;
+      Clap:    TAudioPlaybackStream;
+      Shuffle: TAudioPlaybackStream;
+
+      constructor Create();
+      destructor Destroy(); override;
+  end;
+
+var // TODO : JB --- THESE SHOULD NOT BE GLOBAL
+  // music
+  Melody:   TMelody;
+
+  // czesci z nutami;
+  Lines:   array of TLines;
+
+  // LineState
+  LineState:     TLineState;
+
+  SoundLib: TSoundLibrary;
+
+
+procedure InitializeSound;
+
+function  Visualization(): IVideoPlayback;
+function  VideoPlayback(): IVideoPlayback;
+function  AudioPlayback(): IAudioPlayback;
+function  AudioInput(): IAudioInput;
+function  AudioDecoder(): IAudioDecoder;
+
+function  AudioManager: TInterfaceList;
+
+
+implementation
+
+uses
+  sysutils,
+  UMain,
+  UCommandLine,
+  ULog;
+
+var
+  singleton_VideoPlayback : IVideoPlayback  = nil;
+  singleton_Visualization : IVideoPlayback  = nil;
+  singleton_AudioPlayback : IAudioPlayback  = nil;
+  singleton_AudioInput    : IAudioInput     = nil;
+  singleton_AudioDecoder  : IAudioDecoder   = nil;
+
+  singleton_AudioManager  : TInterfaceList  = nil;
+
+
+constructor TAudioFormatInfo.Create(Channels: byte; SampleRate: integer; Format: TAudioSampleFormat);
+begin
+  Self.Channels := Channels;
+  Self.SampleRate := SampleRate;
+  Self.Format := Format;
+  Self.FrameSize := AudioSampleSize[Format] * Channels;
+end;
+
+function AudioManager: TInterfaceList;
+begin
+  if singleton_AudioManager = nil then
+    singleton_AudioManager := TInterfaceList.Create();
+  
+  Result := singleton_AudioManager;
+end; //CompressionPluginManager
+
+
+function  VideoPlayback(): IVideoPlayback;
+begin
+  result := singleton_VideoPlayback;
+end;
+
+function  Visualization(): IVideoPlayback;
+begin
+  result := singleton_Visualization;
+end;
+
+function AudioPlayback(): IAudioPlayback;
+begin
+  result := singleton_AudioPlayback;
+end;
+
+function AudioInput(): IAudioInput;
+begin
+  result := singleton_AudioInput;
+end;
+
+function AudioDecoder(): IAudioDecoder;
+begin
+  result := singleton_AudioDecoder;
+end;
+
+procedure AssignSingletonObjects(); 
+var
+  lTmpInterface : IInterface;
+  iCount        : Integer;
+begin
+  lTmpInterface := nil;
+  
+
+
+  for iCount := 0 to AudioManager.Count - 1 do
+  begin
+    if assigned( AudioManager[iCount] ) then
+    begin
+      // if this interface is a Playback, then set it as the default used
+
+      if ( AudioManager[iCount].QueryInterface( IAudioPlayback, lTmpInterface ) = 0 ) AND
+         ( true ) then //not assigned( singleton_AudioPlayback ) ) then
+      begin
+        singleton_AudioPlayback := IAudioPlayback( lTmpInterface );
+      end;
+
+      // if this interface is a Input, then set it as the default used
+      if ( AudioManager[iCount].QueryInterface( IAudioInput, lTmpInterface )    = 0 ) AND
+         ( true ) then //not assigned( singleton_AudioInput ) ) then
+      begin
+        singleton_AudioInput := IAudioInput( lTmpInterface );
+      end;
+
+      // if this interface is a Decoder, then set it as the default used
+      if ( AudioManager[iCount].QueryInterface( IAudioDecoder, lTmpInterface )    = 0 ) AND
+         ( true ) then //not assigned( singleton_AudioDecoder ) ) then
+      begin
+        singleton_AudioDecoder := IAudioDecoder( lTmpInterface );
+      end;
+
+      // if this interface is a Input, then set it as the default used
+      if ( AudioManager[iCount].QueryInterface( IVideoPlayback, lTmpInterface ) = 0 ) AND
+         ( true ) then //not assigned( singleton_VideoPlayback ) ) then
+      begin
+        singleton_VideoPlayback := IVideoPlayback( lTmpInterface );
+      end;
+
+      if ( AudioManager[iCount].QueryInterface( IVideoVisualization, lTmpInterface ) = 0 ) AND
+         ( true ) then //not assigned( singleton_Visualization ) ) then
+      begin
+        singleton_Visualization := IVideoPlayback( lTmpInterface );
+      end;
+
+    end;
+  end;
+
+end;
+
+procedure InitializeSound;
+begin
+  singleton_AudioPlayback := nil;
+  singleton_AudioInput    := nil;
+  singleton_AudioDecoder  := nil;
+  singleton_VideoPlayback := nil;
+  singleton_Visualization := nil;
+
+  AssignSingletonObjects();
+
+  if VideoPlayback <> nil then
+  begin
+  end;
+
+  if AudioDecoder <> nil then
+  begin
+    while not AudioDecoder.InitializeDecoder do
+    begin
+      Log.LogError('Initialize failed, Removing - '+ AudioDecoder.GetName);
+      AudioManager.remove( AudioDecoder ); 
+      singleton_AudioDecoder  := nil;
+      AssignSingletonObjects();
+    end;
+  end;
+
+  if AudioPlayback <> nil then
+  begin
+    while not AudioPlayback.InitializePlayback do
+    begin
+      Log.LogError('Initialize failed, Removing - '+ AudioPlayback.GetName);
+      AudioManager.remove( AudioPlayback ); 
+      singleton_AudioPlayback := nil;
+      AssignSingletonObjects();
+    end;
+  end;
+
+  if AudioInput <> nil then
+  begin
+    while not AudioInput.InitializeRecord do
+    begin
+      Log.LogError('Initialize failed, Removing - '+ AudioInput.GetName);
+      AudioManager.remove( AudioInput ); 
+      singleton_AudioInput    := nil;
+      AssignSingletonObjects();
+    end;    
+  end;
+
+  // Load in-game sounds
+  SoundLib := TSoundLibrary.Create;
+
+  if FindCmdLineSwitch( cMediaInterfaces ) then
+  begin
+    writeln( '' );
+    writeln( '--------------------------------------------------------------' );
+    writeln( '  In-use Media Interfaces                                     ' );
+    writeln( '--------------------------------------------------------------' );
+    writeln( 'Registered Audio Playback Interface : ' + AudioPlayback.GetName );
+    writeln( 'Registered Audio Input    Interface : ' + AudioInput.GetName    );
+    writeln( 'Registered Video Playback Interface : ' + VideoPlayback.GetName );
+    writeln( 'Registered Visualization  Interface : ' + Visualization.GetName );
+    writeln( '--------------------------------------------------------------' );
+    writeln( '' );
+
+    halt;
+  end;
+end;
+
+constructor TSoundLibrary.Create();
+begin
+  //Log.LogStatus('Loading Sounds', 'Music Initialize');
+
+  //Log.BenchmarkStart(4);
+
+  Start   := AudioPlayback.OpenSound(SoundPath + 'Common start.mp3');
+  Back    := AudioPlayback.OpenSound(SoundPath + 'Common back.mp3');
+  Swoosh  := AudioPlayback.OpenSound(SoundPath + 'menu swoosh.mp3');
+  Change  := AudioPlayback.OpenSound(SoundPath + 'select music change music 50.mp3');
+  Option  := AudioPlayback.OpenSound(SoundPath + 'option change col.mp3');
+  Click   := AudioPlayback.OpenSound(SoundPath + 'rimshot022b.mp3');
+
+  //Drum    := AudioPlayback.OpenSound(SoundPath + 'bassdrumhard076b.mp3');
+  //Hihat   := AudioPlayback.OpenSound(SoundPath + 'hihatclosed068b.mp3');
+  //Clap    := AudioPlayback.OpenSound(SoundPath + 'claps050b.mp3');
+
+  //Shuffle := AudioPlayback.OpenSound(SoundPath + 'Shuffle.mp3');
+
+  //Log.BenchmarkEnd(4);
+  //Log.LogBenchmark('--> Loading Sounds', 4);
+end;
+
+destructor TSoundLibrary.Destroy();
+begin
+  Start.Free;
+  Back.Free;
+  Swoosh.Free;
+  Change.Free;
+  Option.Free;
+  Click.Free;
+
+  //Drum.Free;
+  //Hihat.Free;
+  //Clap.Free;
+
+  //Shuffle.Free;
+end;
+
+
+initialization
+begin
+  singleton_AudioManager := TInterfaceList.Create();
+  
+end;
+
+finalization
+  singleton_AudioManager.clear;
+  FreeAndNil( singleton_AudioManager );
+
+end.
diff --git a/Game/Code/Classes/USong.pas b/Game/Code/Classes/USong.pas
index a3a72107..5b10f8a1 100644
--- a/Game/Code/Classes/USong.pas
+++ b/Game/Code/Classes/USong.pas
@@ -300,7 +300,7 @@ begin
         Lines[CP].Line[Lines[CP].High].TotalNotes := 0;
         for I := low(Lines[CP].Line[Lines[CP].High].Note) to high(Lines[CP].Line[Lines[CP].High].Note) do
         begin
-         Lines[CP].Line[Lines[CP].High].TotalNotes := Lines[CP].Line[Lines[CP].High].TotalNotes + Lines[CP].Line[Lines[CP].High].Note[I].Lenght * Lines[CP].Line[Lines[CP].High].Note[I].NoteType;
+         Lines[CP].Line[Lines[CP].High].TotalNotes := Lines[CP].Line[Lines[CP].High].TotalNotes + Lines[CP].Line[Lines[CP].High].Note[I].Length * Lines[CP].Line[Lines[CP].High].Note[I].NoteType;
         end;
         //Total Notes Patch End
       end else begin
@@ -311,7 +311,7 @@ begin
           Lines[Count].Line[Lines[Count].High].TotalNotes := 0;
           for I := low(Lines[Count].Line[Lines[Count].High].Note) to high(Lines[Count].Line[Lines[Count].High].Note) do
           begin
-            Lines[Count].Line[Lines[Count].High].TotalNotes := Lines[Count].Line[Lines[Count].High].TotalNotes + Lines[Count].Line[Lines[Count].High].Note[I].Lenght * Lines[Count].Line[Lines[Count].High].Note[I].NoteType;
+            Lines[Count].Line[Lines[Count].High].TotalNotes := Lines[Count].Line[Lines[Count].High].TotalNotes + Lines[Count].Line[Lines[Count].High].Note[I].Length * Lines[Count].Line[Lines[Count].High].Note[I].NoteType;
           end;
           //Total Notes Patch End
         end;
@@ -600,8 +600,8 @@ begin
 //        Start := Note[HighNote].Start;
     end;
 
-    Note[HighNote].Lenght := DurationP;
-    Melody.NoteLenght := Melody.NoteLenght + Note[HighNote].Lenght;
+    Note[HighNote].Length := DurationP;
+    Melody.NoteLength := Melody.NoteLength + Note[HighNote].Length;
 
     // back to the normal system with normal, golden and now freestyle notes
     case TypeP of
@@ -610,7 +610,7 @@ begin
       '*':  Note[HighNote].NoteType := 2;
     end;
 
-    Lines[LineNumber].NoteType := Lines[LineNumber].NoteType + Note[HighNote].Lenght * Note[HighNote].NoteType;
+    Lines[LineNumber].NoteType := Lines[LineNumber].NoteType + Note[HighNote].Length * Note[HighNote].NoteType;
 
     Note[HighNote].Tone := NoteP;
     if Note[HighNote].Tone < Base[LineNumber] then Base[LineNumber] := Note[HighNote].Tone;
@@ -622,7 +622,7 @@ begin
     if TypeP = 'F' then
       Note[HighNote].FreeStyle := true;
 
-    End_ := Note[HighNote].Start + Note[HighNote].Lenght;
+    End_ := Note[HighNote].Start + Note[HighNote].Length;
   end; // with
 end;
 
@@ -639,7 +639,7 @@ begin
   Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes := 0;
   for I := low(Lines[LineNumberP].Line[Lines[LineNumberP].High].Note) to high(Lines[LineNumberP].Line[Lines[LineNumberP].High].Note) do
   begin
-    Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes := Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes + Lines[LineNumberP].Line[Lines[LineNumberP].High].Note[I].Lenght * Lines[LineNumberP].Line[Lines[LineNumberP].High].Note[I].NoteType;
+    Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes := Lines[LineNumberP].Line[Lines[LineNumberP].High].TotalNotes + Lines[LineNumberP].Line[Lines[LineNumberP].High].Note[I].Length * Lines[LineNumberP].Line[Lines[LineNumberP].High].Note[I].NoteType;
   end;
   //Total Notes Patch End