1 files changed, 32 insertions, 25 deletions

diff --git a/cmake/src/screens/UScreenOptionsRecord.pas b/cmake/src/screens/UScreenOptionsRecord.pas
index cf799204..0f9cd49a 100644
--- a/cmake/src/screens/UScreenOptionsRecord.pas
+++ b/cmake/src/screens/UScreenOptionsRecord.pas
@@ -61,8 +61,8 @@ type
       PreviewDeviceIndex: integer;
 
       // string arrays for select-slide options
-      InputSourceNames: array of string;
-      InputDeviceNames: array of string;
+      InputSourceNames: array of UTF8String;
+      InputDeviceNames: array of UTF8String;
 
       // dynamic generated themes for channel select-sliders
       SelectSlideChannelTheme: array of TThemeSelectSlide;
@@ -95,9 +95,9 @@ type
     public
       constructor Create; override;
       function    Draw: boolean; override;
-      function    ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
-      procedure   onShow; override;
-      procedure   onHide; override;
+      function    ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure   OnShow; override;
+      procedure   OnHide; override;
   end;
 
 const
@@ -126,33 +126,34 @@ uses
   UFiles,
   UDisplay,
   UIni,
+  UUnicodeUtils,
   ULog;
 
-function TScreenOptionsRecord.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
+function TScreenOptionsRecord.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
     // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
-      'Q':
+    case UCS4UpperCase(CharCode) of
+      Ord('Q'):
         begin
           Result := false;
           Exit;
         end;
-      '+':
+      Ord('+'):
         begin
           // FIXME: add a nice volume-slider instead
           // or at least provide visualization and acceleration if the user holds the key pressed.
           ChangeVolume(0.02);
         end;
-      '-':
+      Ord('-'):
         begin
           // FIXME: add a nice volume-slider instead
           // or at least provide visualization and acceleration if the user holds the key pressed.
           ChangeVolume(-0.02);
         end;
-      'T':
+      Ord('T'):
         begin
           if ((SDL_GetModState() and KMOD_SHIFT) <> 0) then
             Ini.ThresholdIndex := (Ini.ThresholdIndex + Length(IThresholdVals) - 1) mod Length(IThresholdVals)
@@ -167,17 +168,23 @@ begin
       SDLK_BACKSPACE:
         begin
           // TODO: Show Save/Abort screen
-          Ini.Save;          
-          AudioPlayback.PlaySound(SoundLib.Back);
-          FadeTo(@ScreenOptions);
+          if (AudioInputProcessor.ValidateSettings()) then
+          begin
+            Ini.Save;
+            AudioPlayback.PlaySound(SoundLib.Back);
+            FadeTo(@ScreenOptions);
+          end;
         end;
       SDLK_RETURN:
         begin
           if (SelInteraction = ExitButtonIID) then
           begin
-            Ini.Save;
-            AudioPlayback.PlaySound(SoundLib.Back);
-            FadeTo(@ScreenOptions);
+            if (AudioInputProcessor.ValidateSettings()) then
+            begin
+              Ini.Save;
+              AudioPlayback.PlaySound(SoundLib.Back);
+              FadeTo(@ScreenOptions);
+            end;
           end;
         end;
       SDLK_DOWN:
@@ -299,7 +306,7 @@ begin
 
         // add slider
         SelectSlideChannelID[ChannelIndex] := AddSelectSlide(ChannelTheme^,
-          InputDeviceCfg.ChannelToPlayerMap[ChannelIndex], IChannelPlayer);
+          InputDeviceCfg.ChannelToPlayerMap[ChannelIndex], IChannelPlayerTranslated);
       end
       else
       begin
@@ -307,7 +314,7 @@ begin
 
         // add slider but hide it and assign a dummy variable to it
         SelectSlideChannelID[ChannelIndex] := AddSelectSlide(ChannelTheme^,
-          ChannelToPlayerMapDummy, IChannelPlayer);
+          ChannelToPlayerMapDummy, IChannelPlayerTranslated);
         SelectsS[SelectSlideChannelID[ChannelIndex]].Visible := false;
       end;
     end;
@@ -322,7 +329,7 @@ begin
   // <mog> I uncommented the stuff above, because it's not skinable :X 
   AddButton(Theme.OptionsRecord.ButtonExit);
   if (Length(Button[0].Text) = 0) then
-    AddButtonText(14, 20, Theme.Options.Description[7]);
+    AddButtonText(20, 5, Theme.Options.Description[7]);
   // store InteractionID
   if (Length(AudioInputProcessor.DeviceList) > 0) then
     ExitButtonIID := MaxChannelCount + 2
@@ -373,7 +380,7 @@ begin
 
         // show slider
         UpdateSelectSlideOptions(SelectSlideChannelTheme[ChannelIndex],
-          SelectSlideChannelID[ChannelIndex], IChannelPlayer,
+          SelectSlideChannelID[ChannelIndex], IChannelPlayerTranslated,
           InputDeviceCfg.ChannelToPlayerMap[ChannelIndex]);
         SelectsS[SelectSlideChannelID[ChannelIndex]].Visible := true;
       end
@@ -383,7 +390,7 @@ begin
 
         // hide slider and assign a dummy variable to it
         UpdateSelectSlideOptions(SelectSlideChannelTheme[ChannelIndex],
-          SelectSlideChannelID[ChannelIndex], IChannelPlayer,
+          SelectSlideChannelID[ChannelIndex], IChannelPlayerTranslated,
           ChannelToPlayerMapDummy);
         SelectsS[SelectSlideChannelID[ChannelIndex]].Visible := false;
       end;
@@ -418,7 +425,7 @@ begin
   NextVolumePollTime := 0;
 end;
 
-procedure TScreenOptionsRecord.onShow;
+procedure TScreenOptionsRecord.OnShow;
 var
   ChannelIndex: integer;
 begin
@@ -433,10 +440,10 @@ begin
 
   SetLength(ChannelPeak, MaxChannelCount);
 
-  StartPreview();
+  UpdateInputDevice();
 end;
 
-procedure TScreenOptionsRecord.onHide;
+procedure TScreenOptionsRecord.OnHide;
 var
   ChannelIndex: integer;
 begin