Skip to content

Commit

Permalink
Release 1.7.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredvs
fredvs committed Jun 24, 2018
1 parent 8994225 commit c567591
Show file tree
Hide file tree
Showing 9 changed files with 276 additions and 166 deletions.
6 changes: 4 additions & 2 deletions src/commander.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,10 @@ procedure tcommanderfo.ontextedit(const Sender: tcustomedit; var atext: msestrin
else
hintpanel.Width := hintlabel2.Width + 10;
hintpanel.Visible := True;
timersent.Enabled := True;
atext := '300';
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
atext := '300';
end;
end;

Expand Down
5 changes: 3 additions & 2 deletions src/dockpanel1.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,9 @@ procedure tdockpanel1fo.updatelayout();
//}
if norefresh = false then begin

Timerwaitdp.Enabled := False; // to reset
Timerwaitdp.Enabled := True;
if Timerwaitdp.Enabled then
Timerwaitdp.restart // to reset
else Timerwaitdp.Enabled := True;
end;
end;

Expand Down
37 changes: 24 additions & 13 deletions src/drums.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ implementation

procedure tdrumsfo.ontimersent(const Sender: TObject);
begin
// timersent.Enabled := False;
edittempo.face.template := tfacecomp3;
volumedrums.face.template := tfacecomp3;
ltempo.face.template := tfacecomp3;
Expand All @@ -210,7 +209,6 @@ procedure tdrumsfo.ontimerpause(const Sender: TObject);
var
i: integer;
begin
// Timerpause.Enabled := False;
if wascreated then
begin

Expand Down Expand Up @@ -601,7 +599,9 @@ procedure tdrumsfo.dostop(const Sender: TObject);
commanderfo.loop_resume.Enabled := True;
commanderfo.loop_stop.Enabled := False;
stopit := True;
Timerpause.Enabled := True;
if timerpause.Enabled then
timerpause.restart // to reset
else timerpause.Enabled := True;
end;

procedure tdrumsfo.doresume(const Sender: TObject);
Expand Down Expand Up @@ -636,8 +636,9 @@ procedure tdrumsfo.onchangetempo(const Sender: TObject);

edittempo.face.template := mainfo.tfaceorange;
ltempo.face.template := mainfo.tfaceorange;
timersent.Enabled := False;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
end;
end;

Expand Down Expand Up @@ -1376,8 +1377,9 @@ procedure tdrumsfo.onchangevol(const Sender: TObject);
if hasinit = 1 then
begin
volumedrums.face.template := mainfo.tfaceorange;
timersent.Enabled := False;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
end;
end;

Expand All @@ -1399,7 +1401,9 @@ procedure tdrumsfo.onsetvalvol(const Sender: TObject; var avalue: realty; var ac
else
hintpanel.Width := hintlabel2.Width + 10;
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
avalue := 200;
end;

Expand All @@ -1411,7 +1415,9 @@ procedure tdrumsfo.onsetvalvol(const Sender: TObject; var avalue: realty; var ac
else
hintpanel.Width := hintlabel2.Width + 10;
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
avalue := 0;
end;
end;
Expand All @@ -1427,7 +1433,9 @@ procedure tdrumsfo.onsetvalvol(const Sender: TObject; var avalue: realty; var ac
hintpanel.Width := hintlabel2.Width + 10;
hintpanel.Visible := True;
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
avalue := 500;
end;

Expand All @@ -1440,7 +1448,9 @@ procedure tdrumsfo.onsetvalvol(const Sender: TObject; var avalue: realty; var ac
hintpanel.Width := hintlabel2.Width + 10;
hintpanel.Visible := True;
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
avalue := 1;
end;
end;
Expand All @@ -1457,8 +1467,9 @@ procedure tdrumsfo.ontextedit(const Sender: tcustomedit; var atext: msestring);
else
hintpanel.Width := hintlabel2.Width + 10;
hintpanel.Visible := True;
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
atext := '100';
end;
end;
Expand Down
38 changes: 24 additions & 14 deletions src/filelistform.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ procedure tfilelistfo.formcreated(const Sender: TObject);

procedure tfilelistfo.ontimersent(const Sender: TObject);
begin
// timersent.Enabled := False;
hintpanel.Visible := False;
hintpanel.Visible := False;
end;

procedure tfilelistfo.onsent(const Sender: TObject);
Expand All @@ -84,10 +83,12 @@ procedure tfilelistfo.onsent(const Sender: TObject);
begin
if filelistfo.list_files.rowcount < 1 then
begin
timersent.Enabled := False;

hintlabel.Caption := 'No song in file list. Please select a audio directory with songs...';
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
end
else
begin
Expand Down Expand Up @@ -153,15 +154,21 @@ procedure tfilelistfo.onsent(const Sender: TObject);
if (commanderfo.Visible = True) and (commanderfo.window.windowpos <> wp_minimized) and
(mainfo.basedock.dragdock.currentsplitdir <> sd_tabed) then
commanderfo.tbutton2.SetFocus;
songplayerfo.timersent.Enabled := False;
songplayerfo.timersent.Enabled := True;

if songplayerfo.timersent.Enabled then
songplayerfo.timersent.restart // to reset
else songplayerfo.timersent.Enabled := True;

end
else
begin
timersent.Enabled := False;

hintlabel.Caption := tosysfilepath(list_files[4][thefocusedcell.row]) + ' does not exist or not mounted...';
hintpanel.Visible := True;
timersent.Enabled := True;

if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
end;

end;
Expand All @@ -177,15 +184,17 @@ procedure tfilelistfo.onsent(const Sender: TObject);
if (commanderfo.Visible = True) and (commanderfo.window.windowpos <> wp_minimized) and
(mainfo.basedock.dragdock.currentsplitdir <> sd_tabed) then
commanderfo.tbutton3.SetFocus;
songplayer2fo.timersent.Enabled := False;
songplayer2fo.timersent.Enabled := True;
if songplayer2fo.timersent.Enabled then
songplayer2fo.timersent.restart // to reset
else songplayer2fo.timersent.Enabled := True;
end
else
begin
timersent.Enabled := False;
hintlabel.Caption := tosysfilepath(list_files[4][thefocusedcell.row]) + ' does not exist or not mounted...';
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
end;
end;

Expand All @@ -195,10 +204,11 @@ procedure tfilelistfo.onsent(const Sender: TObject);
end
else
begin
timersent.Enabled := False;
hintlabel.Caption := 'Directory ' + historyfn.Value + ' does not exist or not mounted...';
hintpanel.Visible := True;
timersent.Enabled := True;
if timersent.Enabled then
timersent.restart // to reset
else timersent.Enabled := True;
end;
end;

Expand Down
Loading

0 comments on commit c567591

Please sign in to comment.