Volumes are floating point values (single) now. The range changed from [0 .. 100] to [0.0 .. 1.0]

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

1 files changed, 8 insertions, 15 deletions

diff --git a/Game/Code/Classes/UAudioInput_Portaudio.pas b/Game/Code/Classes/UAudioInput_Portaudio.pas
index 183c482d..50543e17 100644
--- a/Game/Code/Classes/UAudioInput_Portaudio.pas
+++ b/Game/Code/Classes/UAudioInput_Portaudio.pas
@@ -51,8 +51,8 @@ type
       function Start(): boolean; override;
       function Stop(): boolean;  override;
 
-      function GetVolume(): integer;        override;
-      procedure SetVolume(Volume: integer); override;
+      function GetVolume(): single;        override;
+      procedure SetVolume(Volume: single); override;
   end;
 
 function MicrophoneCallback(input: Pointer; output: Pointer; frameCount: Longword;
@@ -214,33 +214,26 @@ begin
   RecordStream := nil;
 end;
 
-function TPortaudioInputDevice.GetVolume(): integer;
+function TPortaudioInputDevice.GetVolume(): single;
 begin
   Result := 0;
   {$IFDEF UsePortmixer}
     if (Mixer <> nil) then
-    begin
-      Result := Round(Px_GetInputVolume(Mixer) * 100);
-      // clip to valid range
-      if (Result > 100) then
-        Result := 100
-      else if (Result < 0) then
-        Result := 0;
-    end;
+      Result := Px_GetInputVolume(Mixer);
   {$ENDIF}
 end;
 
-procedure TPortaudioInputDevice.SetVolume(Volume: integer);
+procedure TPortaudioInputDevice.SetVolume(Volume: single);
 begin
   {$IFDEF UsePortmixer}
     if (Mixer <> nil) then
     begin
       // clip to valid range
-      if (Volume > 100) then
-        Volume := 100
+      if (Volume > 1.0) then
+        Volume := 1.0
       else if (Volume < 0) then
         Volume := 0;
-      Px_SetInputVolume(Mixer, Volume / 100);
+      Px_SetInputVolume(Mixer, Volume);
     end;
   {$ENDIF}
 end;