bunch of smaller changes...

some changes to song loading... 
Record global changed to singleton object
started implementing mic volume display in Settings-Record

hope this dosnt break anything.. :P

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

1 files changed, 13 insertions, 15 deletions

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index c399057b..662050dc 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -161,7 +161,7 @@ end;
 
 procedure SingDrawOscilloscope(X, Y, W, H: real; NrSound: integer);
 var
-  Pet:    integer;
+  Pet        : integer;
 begin;
 //  Log.LogStatus('Oscilloscope', 'SingDraw');
   glColor3f(Skin_OscR, Skin_OscG, Skin_OscB);
@@ -169,14 +169,19 @@ begin;
     glColor3f(1, 1, 1);  }
 
   glBegin(GL_LINE_STRIP);
-    glVertex2f(X, -Recording.Sound[NrSound].BufferArray[1] / $10000 * H + Y + H/2);
-    for Pet := 2 to Recording.Sound[NrSound].n div 1 do begin
-      glVertex2f(X + (Pet-1) * W / (Recording.Sound[NrSound].n - 1),
-      -Recording.Sound[NrSound].BufferArray[Pet] / $10000 * H + Y + H/2);
+
+    glVertex2f(X, -AudioInputProcessor.Sound[NrSound].BufferArray[1] / $10000 * H + Y + H/2);
+
+    for Pet := 2 to AudioInputProcessor.Sound[NrSound].n div 1 do
+    begin
+      glVertex2f( X + (Pet-1) * W / (AudioInputProcessor.Sound[NrSound].n - 1),
+                  -AudioInputProcessor.Sound[NrSound].BufferArray[Pet] / $10000 * H + Y + H/2 );
     end;
   glEnd;
 end;
 
+
+
 procedure SingDrawNoteLines(Left, Top, Right: real; Space: integer);
 var
   Pet:    integer;
@@ -366,7 +371,7 @@ var
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-  if Player[NrGracza].IlNut > 0 then
+////  if Player[NrGracza].IlNut > 0 then
     begin
       TempR := W / (Czesci[0].Czesc[Czesci[0].Akt].Koniec - Czesci[0].Czesc[Czesci[0].Akt].StartNote);
         for N := 0 to Player[NrGracza].HighNut do
@@ -480,14 +485,7 @@ begin
 
   lTmpA := (Right-Left);
   lTmpB := (Czesci[NrCzesci].Czesc[Czesci[NrCzesci].Akt].Koniec - Czesci[NrCzesci].Czesc[Czesci[NrCzesci].Akt].StartNote);
-  
-  {$IFDEF LAZARUS}
-{*
-  writeln( 'UDRAW (Right-Left)    : ' + floattostr( lTmpA ) );
-  writeln( 'UDRAW                 : ' + floattostr( lTmpB ) );
-  writeln( '' );
-*}
-  {$ENDIF}
+
 
   if ( lTmpA > 0 ) AND
      ( lTmpB > 0 ) THEN
@@ -555,7 +553,7 @@ begin
         end; // if not FreeStyle
       end; // with
     end; // for
-  end; // with
+  end; // with                      1
 
   glDisable(GL_BLEND);
   glDisable(GL_TEXTURE_2D);