Skip to content

Commit

Permalink
Replace the original TVolumeSlider component (not ported) by a standa…
Browse files Browse the repository at this point in the history
…rd Lazarus TTrackBar control
  • Loading branch information
f6fvy committed Nov 1, 2018
1 parent db0ca30 commit 7095a0e
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 62 deletions.
4 changes: 2 additions & 2 deletions Contest.pas
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ function TContest.GetAudio: TSingleArray;
begin
Blk := Me.GetBlock;
//self-mon. gain
Temp := MainForm.VolumeSlider1.Value;
Smg := Power(10, (MainForm.VolumeSlider1.Value - 0.75) * 4);
Temp := (MainForm.TrackBar1.Position + 60)/80; // Scale 0 to 1
Smg := Power(10, (Temp - 0.75) * 4);
Rfg := 1;
for i:=0 to High(Blk) do
if Ini.Qsk
Expand Down
7 changes: 5 additions & 2 deletions Ini.pas
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ procedure FromIni;
Tst.Filt2.SamplesInInput := BufSize;

V := ReadInteger(SEC_STN, 'SelfMonVolume', 0);
MainForm.VolumeSlider1.Value := V / 80 + 0.75;
// MainForm.VolumeSlider1.Value := V / 80 + 0.75;
MainForm.TrackBar1.Position := V;

V := ReadInteger(SEC_SYS, 'SoundDevice', -1);
MainForm.AlSoundOut1.DeviceID := V;
Expand Down Expand Up @@ -146,7 +147,9 @@ procedure ToIni;
WriteInteger(SEC_TST, 'HiScore', HiScore);
WriteInteger(SEC_TST, 'CompetitionDuration', CompDuration);

V := Round(80 * (MainForm.VolumeSlider1.Value - 0.75));
// V := Round(80 * (MainForm.VolumeSlider1.Value - 0.75));

V := MainForm.TrackBar1.Position;
WriteInteger(SEC_STN, 'SelfMonVolume', V);

WriteBool(SEC_STN, 'SaveWav', SaveWav);
Expand Down
49 changes: 20 additions & 29 deletions Main.lfm
Original file line number Diff line number Diff line change
Expand Up @@ -673,21 +673,28 @@ object MainForm: TMainForm
TabOrder = 4
TabStop = False
end
object VolumeSlider1: TVolumeSlider
Left = 89
Height = 20
Hint = '-15,0 dB'
object TrackBar1: TTrackBar
Left = 78
Height = 28
Hint = '-15.0 dB'
Top = 110
Width = 60
Width = 78
Max = 20
Min = -60
OnChange = TrackBar1Change
Position = 0
TickStyle = tsNone
ParentShowHint = False
ShowHint = True
Margin = 5
Value = 0.75
Overloaded = False
OnChange = VolumeSlider1Change
OnDblClick = VolumeSliderDblClick
DbMax = 0
DbScale = 60
Db = -15
TabOrder = 5
end
object Label18: TLabel
Left = 10
Height = 13
Top = 115
Width = 53
Caption = 'Mon. Level'
ParentColor = False
end
end
object Panel10: TPanel
Expand Down Expand Up @@ -758,22 +765,6 @@ object MainForm: TMainForm
end
end
end
object Label17: TLabel
Left = 104
Height = 13
Top = 106
Width = 245
Caption = 'Copyright © 2004-2016 Alex Shovkoplyas, VE3NEA'
ParentColor = False
end
object Label18: TLabel
Left = 10
Height = 13
Top = 10
Width = 38
Caption = 'Label18'
ParentColor = False
end
object AlSoundOut1: TAlSoundOut
SamplesPerSec = 11025
BufCount = 8
Expand Down
47 changes: 19 additions & 28 deletions Main.pas
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,16 @@ interface

TMainForm = class(TForm)
AlSoundOut1: TAlSoundOut;
Label18: TLabel;
Label19: TLabel;
MainMenu1: TMainMenu;
File1: TMenuItem;
N40dB1: TMenuItem;
N50dB1: TMenuItem;
Send1: TMenuItem;
CQ1: TMenuItem;
Number1: TMenuItem;
TrackBar1: TTrackBar;
TU1: TMenuItem;
MyCall1: TMenuItem;
HisCall1: TMenuItem;
Expand Down Expand Up @@ -200,7 +203,6 @@ TMainForm = class(TForm)
Panel11: TPanel;
ListView1: TListView;
Operator1: TMenuItem;
VolumeSlider1: TVolumeSlider;
UdpThread : TUdpThread;
procedure FormCreate(Sender: TObject);
procedure AlSoundOut1BufAvailable(Sender: TObject);
Expand Down Expand Up @@ -232,6 +234,7 @@ TMainForm = class(TForm)
procedure RunMNUClick(Sender: TObject);
procedure RunBtnClick(Sender: TObject);
procedure SpinEdit4Change(Sender: TObject);
procedure TrackBar1Change(Sender: TObject);
procedure ViewScoreBoardMNUClick(Sender: TObject);
procedure ViewScoreTable1Click(Sender: TObject);
procedure FormKeyUp(Sender: TObject; var Key: Word;
Expand All @@ -241,8 +244,6 @@ TMainForm = class(TForm)
procedure Shape2MouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure Edit2Enter(Sender: TObject);
procedure VolumeSliderDblClick(Sender: TObject);
procedure VolumeSlider1Change(Sender: TObject);
procedure WebPage1Click(Sender: TObject);
procedure Call1Click(Sender: TObject);
procedure QSK1Click(Sender: TObject);
Expand Down Expand Up @@ -888,6 +889,19 @@ procedure TMainForm.SpinEdit4Change(Sender: TObject);
//Db := 80 * (SpinEdit4.Value - 0.75);
end;

procedure TMainForm.TrackBar1Change(Sender: TObject);
begin
begin
with TrackBar1 do
begin
//-60..+20 dB
if Position > 0
then Hint := Format('+%.0d dB', [Position])
else Hint := Format( '%.0d dB', [Position]);
end;
end;
end;

procedure TMainForm.WmTbDown(var Msg: TMessage);
begin
TToolbutton(Msg.LParam).Down := Boolean(Msg.WParam);
Expand Down Expand Up @@ -1032,29 +1046,6 @@ procedure TMainForm.Advance;
end;



procedure TMainForm.VolumeSliderDblClick(Sender: TObject);
begin
with Sender as TVolumeSlider do
begin
Value := 0.75;
OnChange(Sender);
end;
end;

procedure TMainForm.VolumeSlider1Change(Sender: TObject);
begin
with VolumeSlider1 do
begin
//-60..+20 dB
Db := 80 * (Value - 0.75);
if dB > 0
then Hint := Format('+%.0f dB', [dB])
else Hint := Format( '%.0f dB', [dB]);
end;
end;


procedure TMainForm.WebPage1Click(Sender: TObject);
begin
OpenWebPage('http://www.dxatlas.com/MorseRunner');
Expand Down Expand Up @@ -1136,8 +1127,8 @@ procedure TMainForm.AudioRecordingEnabled1Click(Sender: TObject);

procedure TMainForm.SelfMonClick(Sender: TObject);
begin
VolumeSlider1.Value := (Sender as TMenuItem).Tag / 80 + 0.75;
VolumeSlider1.OnChange(Sender);
TrackBar1.Position := (Sender as TMenuItem).Tag;
TrackBar1.OnChange(Sender);
end;

procedure TMainForm.Settings1Click(Sender: TObject);
Expand Down
2 changes: 1 addition & 1 deletion MorseRunner.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pitch=10
BandWidth=4
Wpm=38
Qsk=0
SelfMonVolume=-33
SelfMonVolume=-40
SaveWav=0
Radio=1
NoRepeats=1
Expand Down

0 comments on commit 7095a0e

Please sign in to comment.