Skip to content

Commit

Permalink
Release 1.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
fredvs committed Oct 2, 2017
1 parent 97d919f commit 175faf5
Show file tree
Hide file tree
Showing 15 changed files with 2,027 additions and 1,989 deletions.
18 changes: 11 additions & 7 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
StrumPract.

Various tools for musicians.
StrumPract is various tools for musicians.

Learn to play Drums in 4 lessons.
Practice your instrument with a editable drums machine.
Tune your guitar and bass.
Play audio files and loop it.
Like:

- Learn to play drums set in 4 lessons and develop your art.
- Practice your other instruments with a editable drums machine.
- Tune your guitar and bass.
- Play audio files and loop it.
- DJ console for mixing, with 2 players and direct-output of mic.
- Record your ideas-jam.

There are compiled executable for Linux 32/64, Windows 32/64 and FreeBSD 64.

There are compiled executable for Linux 32/64, Windows 32/64, FreeBSD 64 and arm RPi.
=> https://github.com/fredvs/strumpract/releases/

Fred van Stappen
Expand Down
3 changes: 1 addition & 2 deletions src/main.pas
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ tmainfo = class(tmainform)
end;

const
versiontext = '1.5';
versiontext = '1.4';
emptyheight = 40;
drumsfoheight = 236;
filelistfoheight = 128;
Expand Down Expand Up @@ -1261,7 +1261,6 @@ procedure tmainfo.onchangevalcolor(const sender: TObject);
filelistfo.historyfn.frame.button.colorglyph := ltblank;
filelistfo.songdir.frame.button.colorglyph := ltblank;


end;

songplayerfo.DrawWaveForm();
Expand Down
1 change: 0 additions & 1 deletion src/msefiledialog.mfm
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,6 @@ object filedialogfo: Tfiledialogfo
moduleclassname = 'tmseform'
object listview: tfilelistview
optionswidget = [ow_mousefocus, ow_arrowfocus, ow_focusbackonesc, ow_mousewheel, ow_destroywidgets]
color = -1610612729
frame.localprops = []
frame.localprops1 = []
face.fade_pos.count = 2
Expand Down
3 changes: 3 additions & 0 deletions src/msefiledialog.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,9 @@ procedure tfiledialogfo.showhiddenonsetvalue(const sender: TObject;
procedure tfiledialogfo.formoncreate(const sender: TObject);
begin
fcourseid:= -1;

font.color := cl_black;

with stockobjects do begin
// dir.frame.caption:= captions[sc_dirhk];
home.caption:= captions[sc_homehk];
Expand Down
995 changes: 497 additions & 498 deletions src/msefiledialog_mfm.pas

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/recorder.mfm
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@ object recorderfo: trecorderfo
bounds_y = 100
bounds_cx = 336
bounds_cy = 22
onchange = onsliderchange
enabled = False
value = 0
scrollbar.buttonlength = 18
Expand All @@ -491,7 +490,7 @@ object recorderfo: trecorderfo
scrollbar.framebutton.localprops1 = []
scrollbar.framebutton.template = commanderfo.tframecomp2
scrollbar.color = -2147483645
onsetvalue = changepos
scrollbar.onafterevent = afterev
end
object btnStop: tbutton
color = -2147483645
Expand Down
19 changes: 10 additions & 9 deletions src/recorder.pas
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ trecorderfo = class(tdockform)
procedure onfinfos(const Sender: TObject);
procedure onreset(const Sender: TObject);

procedure changepos(const Sender: TObject; var avalue: realty; var accept: boolean);
procedure changevolume(const Sender: TObject);

procedure doentertrackbar(const Sender: TObject);
Expand All @@ -75,6 +74,8 @@ trecorderfo = class(tdockform)
var aresult: modalresultty);
procedure onlistenin(const Sender: TObject);
procedure ondest(const Sender: TObject);
procedure afterev(const sender: tcustomscrollbar; const akind: scrolleventty;
const avalue: Real);
end;

var
Expand Down Expand Up @@ -403,14 +404,6 @@ procedure trecorderfo.doplayerstop(const Sender: TObject);
uos_Stop(therecplayer);
end;

procedure trecorderfo.changepos(const Sender: TObject; var avalue: realty; var accept: boolean);
begin
if TrackBar1.Tag = 0 then
uos_InputSeek(therecplayer, InputIndex3, trunc(avalue * inputlength));
// TrackBar1.Tag := 0;

end;

procedure trecorderfo.changevolume(const Sender: TObject);
begin
uos_InputSetDSPVolume(therecplayer, InputIndex3,
Expand Down Expand Up @@ -662,5 +655,13 @@ procedure trecorderfo.ondest(const Sender: TObject);
Timerwait.Free;
end;

procedure trecorderfo.afterev(const sender: tcustomscrollbar;
const akind: scrolleventty; const avalue: Real);
begin
if akind = sbe_thumbposition then
uos_InputSeek(therecplayer, InputIndex3, trunc(avalue * inputlength))
else onsliderchange(Sender);
end;


end.
735 changes: 367 additions & 368 deletions src/recorder_mfm.pas

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/songplayer.mfm
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ object songplayerfo: tsongplayerfo
bounds_y = 82
bounds_cx = 350
bounds_cy = 45
onchange = onsliderchange
enabled = False
value = 0
scrollbar.options = [sbo_thumbtrack, sbo_clicktovalue, sbo_moveauto, sbo_showauto, sbo_valuekeys]
Expand All @@ -344,7 +343,7 @@ object songplayerfo: tsongplayerfo
scrollbar.framebutton.localprops = [frl_colorframe, frl_hiddenedges, frl_optionsskin]
scrollbar.framebutton.localprops1 = []
scrollbar.color = -2147483645
onsetvalue = changepos
scrollbar.onafterevent = onafterev
end
object historyfn: thistoryedit
frame.captionpos = cp_lefttop
Expand Down
18 changes: 4 additions & 14 deletions src/songplayer.pas
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ tsongplayerfo = class(tdockform)
procedure oninfowav(const Sender: TObject);
procedure onreset(const Sender: TObject);

procedure changepos(const Sender: TObject; var avalue: realty; var accept: boolean);
procedure changevolume(const Sender: TObject);

procedure doentertrackbar(const Sender: TObject);
Expand Down Expand Up @@ -616,13 +615,6 @@ procedure tsongplayerfo.doplayerstop(const Sender: TObject);

end;

procedure tsongplayerfo.changepos(const Sender: TObject; var avalue: realty; var accept: boolean);
begin
if not accept then
uos_InputSeek(theplayer, Inputindex1, trunc(avalue * Inputlength1));
// TrackBar1.Tag := 0;
end;

procedure tsongplayerfo.changevolume(const Sender: TObject);
begin
if hasinit = 1 then
Expand Down Expand Up @@ -977,17 +969,15 @@ procedure tsongplayerfo.faceafterpaintbut(const sender: tcustomface;
point2.y := arect.cy;

canvas.drawline(point1,point2,cl_red);




end;

procedure tsongplayerfo.onafterev(const sender: tcustomscrollbar;
const akind: scrolleventty; const avalue: Real);
begin

if TrackBar1.clicked then
uos_InputSeek(theplayer, Inputindex1, trunc(avalue * Inputlength1));
if akind = sbe_thumbposition then
uos_InputSeek(theplayer, Inputindex1, trunc(avalue * Inputlength1))
else onsliderchange(Sender);
end;

procedure tsongplayerfo.changeloop(const sender: TObject);
Expand Down
3 changes: 1 addition & 2 deletions src/songplayer2.mfm
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ object songplayer2fo: tsongplayer2fo
bounds_y = 82
bounds_cx = 350
bounds_cy = 45
onchange = onsliderchange
enabled = False
value = 0
scrollbar.options = [sbo_thumbtrack, sbo_clicktovalue, sbo_moveauto, sbo_showauto, sbo_valuekeys]
Expand All @@ -344,7 +343,7 @@ object songplayer2fo: tsongplayer2fo
scrollbar.framebutton.localprops = [frl_colorframe, frl_hiddenedges, frl_optionsskin]
scrollbar.framebutton.localprops1 = []
scrollbar.color = -2147483645
onsetvalue = changepos
scrollbar.onafterevent = onafterev
end
object historyfn: thistoryedit
frame.captionpos = cp_lefttop
Expand Down
15 changes: 3 additions & 12 deletions src/songplayer2.pas
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ tsongplayer2fo = class(tdockform)
procedure oninfowav(const Sender: TObject);
procedure onreset(const Sender: TObject);

procedure changepos(const Sender: TObject; var avalue: realty; var accept: boolean);
procedure changevolume(const Sender: TObject);

procedure doentertrackbar(const Sender: TObject);
Expand Down Expand Up @@ -614,15 +613,6 @@ procedure tsongplayer2fo.doplayerpause(const Sender: TObject);
procedure tsongplayer2fo.doplayerstop(const Sender: TObject);
begin
uos_Stop(theplayer2);

end;

procedure tsongplayer2fo.changepos(const Sender: TObject; var avalue: realty; var accept: boolean);
begin
if accept then
uos_InputSeek(theplayer2, Inputindex2, trunc(avalue * Inputlength2));
// TrackBar1.Tag := 0;

end;

procedure tsongplayer2fo.changevolume(const Sender: TObject);
Expand Down Expand Up @@ -982,8 +972,9 @@ procedure tsongplayer2fo.faceafterpaintbut(const sender: tcustomface;
procedure tsongplayer2fo.onafterev(const sender: tcustomscrollbar;
const akind: scrolleventty; const avalue: Real);
begin
if TrackBar1.clicked then
uos_InputSeek(theplayerinfo2, Inputindex2, trunc(avalue * Inputlength2));
if akind = sbe_thumbposition then
uos_InputSeek(theplayer2, Inputindex2, trunc(avalue * Inputlength2))
else onsliderchange(Sender);
end;

procedure tsongplayer2fo.changeloop(const sender: TObject);
Expand Down
Loading

0 comments on commit 175faf5

Please sign in to comment.