execution fixes

This commit is contained in:
April Ayres-Griffiths 2019-04-09 22:15:31 +10:00
parent c5cf6a021f
commit 52dc73f0e6
8 changed files with 115 additions and 39 deletions

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm
Left = 2369
Left = 2072
Height = 574
Top = 205
Top = 321
Width = 945
AlphaBlendValue = 128
Caption = 'microM8 GUI'
@ -167,11 +167,12 @@ object GUIForm: TGUIForm
Caption = 'ToolButton15'
Enabled = False
end
object ToolButton1: TToolButton
object tbVolDown: TToolButton
Left = 213
Top = 2
Caption = 'ToolButton1'
Caption = 'tbVolDown'
ImageIndex = 23
OnClick = tbVolDownClick
end
object tbMasterVolume: TTrackBar
Left = 249
@ -185,11 +186,12 @@ object GUIForm: TGUIForm
OnKeyUp = FormKeyUp
TabOrder = 0
end
object ToolButton2: TToolButton
object tbVolUp: TToolButton
Left = 313
Top = 2
Caption = 'ToolButton2'
Caption = 'tbVolUp'
ImageIndex = 24
OnClick = tbVolUpClick
end
object ToolButton3: TToolButton
Left = 349
@ -197,11 +199,12 @@ object GUIForm: TGUIForm
Caption = 'ToolButton3'
Enabled = False
end
object ToolButton16: TToolButton
object tbSpeedDown: TToolButton
Left = 381
Top = 2
Caption = 'ToolButton16'
Caption = 'tbSpeedDown'
ImageIndex = 25
OnClick = tbSpeedDownClick
end
object TrackBar2: TTrackBar
Left = 417
@ -215,11 +218,12 @@ object GUIForm: TGUIForm
OnKeyUp = FormKeyUp
TabOrder = 1
end
object ToolButton17: TToolButton
object tbSpeedUp: TToolButton
Left = 481
Top = 2
Caption = 'ToolButton17'
Caption = 'tbSpeedUp'
ImageIndex = 26
OnClick = tbSpeedUpClick
end
object ToolButton18: TToolButton
Left = 517

View File

@ -161,17 +161,17 @@ type
miTintAmber: TMenuItem;
sidecarPanel: TPanel;
FSTimer: TTimer;
ToolButton1: TToolButton;
tbVolDown: TToolButton;
ToolButton10: TToolButton;
tbJoystickAxisSwitch: TToolButton;
tbCapsMode: TToolButton;
tbScanlines: TToolButton;
tbWebDebugger: TToolButton;
ToolButton15: TToolButton;
ToolButton16: TToolButton;
ToolButton17: TToolButton;
tbSpeedDown: TToolButton;
tbSpeedUp: TToolButton;
ToolButton18: TToolButton;
ToolButton2: TToolButton;
tbVolUp: TToolButton;
ToolButton3: TToolButton;
ToolButton4: TToolButton;
ToolButton5: TToolButton;
@ -410,7 +410,11 @@ type
procedure tbRMClick(Sender: TObject);
procedure tbRMColorClick(Sender: TObject);
procedure tbScanlinesClick(Sender: TObject);
procedure tbSpeedDownClick(Sender: TObject);
procedure tbSpeedUpClick(Sender: TObject);
procedure tbTintModeClick(Sender: TObject);
procedure tbVolDownClick(Sender: TObject);
procedure tbVolUpClick(Sender: TObject);
procedure ToolTimerTimer(Sender: TObject);
procedure tbMasterVolumeChange(Sender: TObject);
procedure TrackBar2Change(Sender: TObject);
@ -1613,6 +1617,18 @@ begin
UpdateScanlines;
end;
procedure TGUIForm.tbSpeedDownClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/cpu/warp/down' );
UpdateWarpSlider;
end;
procedure TGUIForm.tbSpeedUpClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/cpu/warp/up' );
UpdateWarpSlider;
end;
procedure TGUIForm.UpdateScanlines;
begin
case GetConfig( 'video/init.video.scanlinedisable' ) of
@ -1644,6 +1660,18 @@ begin
end;
procedure TGUIForm.tbVolDownClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/audio/master/down' );
UpdateVolSlider;
end;
procedure TGUIForm.tbVolUpClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/audio/master/up' );
UpdateVolSlider;
end;
procedure TGUIForm.ToolTimerTimer(Sender: TObject);
begin
UpdateRenderMode;
@ -1858,7 +1886,7 @@ end;
function TGUIForm.SimpleGet(url:string): string;
begin
result := '';
result := '0';
try
result := self.httpc.Get(url)
except

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm
Left = 2369
Left = 2072
Height = 574
Top = 205
Top = 321
Width = 945
AlphaBlendValue = 128
Caption = 'microM8 GUI'
@ -126,6 +126,7 @@ object GUIForm: TGUIForm
Top = 2
Caption = 'ToolButton9'
ImageIndex = 16
OnClick = ToolButton9Click
end
object ToolButton10: TToolButton
Left = 693
@ -167,11 +168,12 @@ object GUIForm: TGUIForm
Caption = 'ToolButton15'
Enabled = False
end
object ToolButton1: TToolButton
object tbVolDown: TToolButton
Left = 213
Top = 2
Caption = 'ToolButton1'
Caption = 'tbVolDown'
ImageIndex = 23
OnClick = tbVolDownClick
end
object tbMasterVolume: TTrackBar
Left = 249
@ -185,11 +187,12 @@ object GUIForm: TGUIForm
OnKeyUp = FormKeyUp
TabOrder = 0
end
object ToolButton2: TToolButton
object tbVolUp: TToolButton
Left = 313
Top = 2
Caption = 'ToolButton2'
Caption = 'tbVolUp'
ImageIndex = 24
OnClick = tbVolUpClick
end
object ToolButton3: TToolButton
Left = 349
@ -197,11 +200,12 @@ object GUIForm: TGUIForm
Caption = 'ToolButton3'
Enabled = False
end
object ToolButton16: TToolButton
object tbSpeedDown: TToolButton
Left = 381
Top = 2
Caption = 'ToolButton16'
Caption = 'tbSpeedDown'
ImageIndex = 25
OnClick = tbSpeedDownClick
end
object TrackBar2: TTrackBar
Left = 417
@ -215,11 +219,12 @@ object GUIForm: TGUIForm
OnKeyUp = FormKeyUp
TabOrder = 1
end
object ToolButton17: TToolButton
object tbSpeedUp: TToolButton
Left = 481
Top = 2
Caption = 'ToolButton17'
Caption = 'tbSpeedUp'
ImageIndex = 26
OnClick = tbSpeedUpClick
end
object ToolButton18: TToolButton
Left = 517

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm
Left = 2369
Left = 2072
Height = 574
Top = 205
Top = 321
Width = 945
AlphaBlendValue = 128
Caption = 'microM8 GUI'
@ -126,6 +126,7 @@ object GUIForm: TGUIForm
Top = 2
Caption = 'ToolButton9'
ImageIndex = 16
OnClick = ToolButton9Click
end
object ToolButton10: TToolButton
Left = 693
@ -167,11 +168,12 @@ object GUIForm: TGUIForm
Caption = 'ToolButton15'
Enabled = False
end
object ToolButton1: TToolButton
object tbVolDown: TToolButton
Left = 213
Top = 2
Caption = 'ToolButton1'
Caption = 'tbVolDown'
ImageIndex = 23
OnClick = tbVolDownClick
end
object tbMasterVolume: TTrackBar
Left = 249
@ -185,11 +187,12 @@ object GUIForm: TGUIForm
OnKeyUp = FormKeyUp
TabOrder = 0
end
object ToolButton2: TToolButton
object tbVolUp: TToolButton
Left = 313
Top = 2
Caption = 'ToolButton2'
Caption = 'tbVolUp'
ImageIndex = 24
OnClick = tbVolUpClick
end
object ToolButton3: TToolButton
Left = 349
@ -197,11 +200,12 @@ object GUIForm: TGUIForm
Caption = 'ToolButton3'
Enabled = False
end
object ToolButton16: TToolButton
object tbSpeedDown: TToolButton
Left = 381
Top = 2
Caption = 'ToolButton16'
Caption = 'tbSpeedDown'
ImageIndex = 25
OnClick = tbSpeedDownClick
end
object TrackBar2: TTrackBar
Left = 417
@ -215,11 +219,12 @@ object GUIForm: TGUIForm
OnKeyUp = FormKeyUp
TabOrder = 1
end
object ToolButton17: TToolButton
object tbSpeedUp: TToolButton
Left = 481
Top = 2
Caption = 'ToolButton17'
Caption = 'tbSpeedUp'
ImageIndex = 26
OnClick = tbSpeedUpClick
end
object ToolButton18: TToolButton
Left = 517

View File

@ -161,17 +161,17 @@ type
miTintAmber: TMenuItem;
sidecarPanel: TPanel;
FSTimer: TTimer;
ToolButton1: TToolButton;
tbVolDown: TToolButton;
ToolButton10: TToolButton;
tbJoystickAxisSwitch: TToolButton;
tbCapsMode: TToolButton;
tbScanlines: TToolButton;
tbWebDebugger: TToolButton;
ToolButton15: TToolButton;
ToolButton16: TToolButton;
ToolButton17: TToolButton;
tbSpeedDown: TToolButton;
tbSpeedUp: TToolButton;
ToolButton18: TToolButton;
ToolButton2: TToolButton;
tbVolUp: TToolButton;
ToolButton3: TToolButton;
ToolButton4: TToolButton;
ToolButton5: TToolButton;
@ -410,7 +410,12 @@ type
procedure tbRMClick(Sender: TObject);
procedure tbRMColorClick(Sender: TObject);
procedure tbScanlinesClick(Sender: TObject);
procedure tbSpeedDownClick(Sender: TObject);
procedure tbSpeedUpClick(Sender: TObject);
procedure tbTintModeClick(Sender: TObject);
procedure tbVolDownClick(Sender: TObject);
procedure tbVolUpClick(Sender: TObject);
procedure ToolButton9Click(Sender: TObject);
procedure ToolTimerTimer(Sender: TObject);
procedure tbMasterVolumeChange(Sender: TObject);
procedure TrackBar2Change(Sender: TObject);
@ -1613,6 +1618,18 @@ begin
UpdateScanlines;
end;
procedure TGUIForm.tbSpeedDownClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/cpu/warp/down' );
UpdateWarpSlider;
end;
procedure TGUIForm.tbSpeedUpClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/cpu/warp/up' );
UpdateWarpSlider;
end;
procedure TGUIForm.UpdateScanlines;
begin
case GetConfig( 'video/init.video.scanlinedisable' ) of
@ -1644,6 +1661,23 @@ begin
end;
procedure TGUIForm.tbVolDownClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/audio/master/down' );
UpdateVolSlider;
end;
procedure TGUIForm.tbVolUpClick(Sender: TObject);
begin
SimpleGet( baseUrl+'/api/control/audio/master/up' );
UpdateVolSlider;
end;
procedure TGUIForm.ToolButton9Click(Sender: TObject);
begin
SimpleGet(baseUrl+'/api/control/pause');
end;
procedure TGUIForm.ToolTimerTimer(Sender: TObject);
begin
UpdateRenderMode;