diff --git a/src/commander.mfm b/src/commander.mfm index b16a067..f157d94 100644 --- a/src/commander.mfm +++ b/src/commander.mfm @@ -1751,8 +1751,8 @@ object commanderfo: tcommanderfo face.template = mainfo.tfaceorange taborder = 20 visible = False - bounds_x = 34 - bounds_y = 48 + bounds_x = 33 + bounds_y = 49 bounds_cx = 221 bounds_cy = 36 font.name = 'stf_default' @@ -3062,8 +3062,8 @@ object commanderfo: tcommanderfo height = 32 options = [bmo_masked, bmo_graymask] count = 2 - left = 322 - top = 31 + left = 320 + top = 10 image = { 00000000120000004000000040000000B4180000000000000000000000000000 000000000000000000000000000000000000000000000045DFCEC301D1B4A301 diff --git a/src/commander_mfm.pas b/src/commander_mfm.pas index 28857c0..2fc5679 100644 --- a/src/commander_mfm.pas +++ b/src/commander_mfm.pas @@ -2293,7 +2293,7 @@ implementation 102,97,99,101,46,116,101,109,112,108,97,116,101,7,18,109,97,105,110,102, 111,46,116,102,97,99,101,111,114,97,110,103,101,8,116,97,98,111,114,100, 101,114,2,20,7,118,105,115,105,98,108,101,8,8,98,111,117,110,100,115, - 95,120,2,34,8,98,111,117,110,100,115,95,121,2,48,9,98,111,117,110, + 95,120,2,33,8,98,111,117,110,100,115,95,121,2,49,9,98,111,117,110, 100,115,95,99,120,3,221,0,9,98,111,117,110,100,115,95,99,121,2,36, 9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97, 117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11, @@ -4088,7 +4088,7 @@ implementation 116,104,2,32,6,104,101,105,103,104,116,2,32,7,111,112,116,105,111,110, 115,11,10,98,109,111,95,109,97,115,107,101,100,12,98,109,111,95,103,114, 97,121,109,97,115,107,0,5,99,111,117,110,116,2,2,4,108,101,102,116, - 3,66,1,3,116,111,112,2,31,5,105,109,97,103,101,10,236,40,0,0, + 3,64,1,3,116,111,112,2,10,5,105,109,97,103,101,10,236,40,0,0, 0,0,0,0,18,0,0,0,64,0,0,0,64,0,0,0,180,24,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,223,206,195,1, diff --git a/src/main.pas b/src/main.pas index f9efb27..5215571 100644 --- a/src/main.pas +++ b/src/main.pas @@ -2163,11 +2163,11 @@ waveforec.trackbar1.face.template := recorderfo.tfacerecorder; songplayerfo.llength.font.color := thecolor1; songplayer2fo.llength.font.color := thecolor2; - songplayerfo.cbloop.frame.font.color := thecolor1; - songplayer2fo.cbloop.frame.font.color := thecolor2; + // songplayerfo.cbloop.frame.font.color := thecolor1; + // songplayer2fo.cbloop.frame.font.color := thecolor2; - songplayerfo.cbtempo.frame.font.color := thecolor1; - songplayer2fo.cbtempo.frame.font.color := thecolor2; + // songplayerfo.cbtempo.frame.font.color := thecolor1; + // songplayer2fo.cbtempo.frame.font.color := thecolor2; songplayerfo.waveformcheck.frame.font.color := thecolor1; songplayer2fo.waveformcheck.frame.font.color := thecolor2; @@ -2175,8 +2175,8 @@ waveforec.trackbar1.face.template := recorderfo.tfacerecorder; songplayerfo.playreverse.frame.font.color := thecolor1; songplayer2fo.playreverse.frame.font.color := thecolor2; - songplayerfo.setmono.frame.font.color := thecolor1; - songplayer2fo.setmono.frame.font.color := thecolor2; + // songplayerfo.setmono.frame.font.color := thecolor1; + // songplayer2fo.setmono.frame.font.color := thecolor2; songplayerfo.tstringdisp2.font.color := thecolor1; songplayer2fo.tstringdisp2.font.color := thecolor2; @@ -2190,13 +2190,14 @@ waveforec.trackbar1.face.template := recorderfo.tfacerecorder; songplayerfo.tstringdisp1.color := cl_black; songplayer2fo.tstringdisp1.color := cl_black; +{ songplayerfo.cbloop.colorglyph := thecolor1; songplayer2fo.cbloop.colorglyph := thecolor2; songplayerfo.cbtempo.colorglyph := thecolor1; songplayer2fo.cbtempo.colorglyph := thecolor2; songplayerfo.waveformcheck.colorglyph := thecolor1; songplayer2fo.waveformcheck.colorglyph := thecolor2; - +} songplayerfo.playreverse.frame.font.color := thecolor1; songplayer2fo.playreverse.frame.font.color := thecolor2; @@ -2445,6 +2446,7 @@ EQEN.face.template := recorderfo.tfacerecorder; commanderfo.nameinput.font.color := ltblack; commanderfo.genleftvolvalue.font.color := ltblack; commanderfo.genrightvolvalue.font.color := ltblack; + { commanderfo.vuin.colorglyph := ltblack; commanderfo.vuin.frame.font.color := ltblack; commanderfo.directmix.colorglyph := ltblack; @@ -2452,7 +2454,8 @@ EQEN.face.template := recorderfo.tfacerecorder; commanderfo.speccalc.colorglyph := ltblack; commanderfo.speccalc.frame.font.color := ltblack; - + } + commanderfo.volumeleft1val.font.color := ltblack; commanderfo.volumeleft2val.font.color := ltblack; @@ -2465,7 +2468,7 @@ EQEN.face.template := recorderfo.tfacerecorder; commanderfo.butinput.colorglyph := ltblack; commanderfo.butinput.frame.font.color := ltblack; - +{ commanderfo.automix.colorglyph := ltblack; commanderfo.automix.frame.font.color := ltblack; @@ -2480,7 +2483,7 @@ EQEN.face.template := recorderfo.tfacerecorder; commanderfo.linkvolgen.colorglyph := ltblack; commanderfo.linkvolgen.frame.font.color := ltblack; - +} commanderfo.timemix.font.color := ltblack; commanderfo.timemix.frame.colorglyph := ltblack; @@ -2776,20 +2779,20 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.llength.font.color := cl_default; songplayer2fo.llength.font.color := cl_default; - songplayerfo.cbloop.frame.font.color := ltblack; - songplayer2fo.cbloop.frame.font.color := ltblack; + // songplayerfo.cbloop.frame.font.color := ltblack; + // songplayer2fo.cbloop.frame.font.color := ltblack; - songplayerfo.cbtempo.frame.font.color := ltblack; - songplayer2fo.cbtempo.frame.font.color := ltblack; + // songplayerfo.cbtempo.frame.font.color := ltblack; + // songplayer2fo.cbtempo.frame.font.color := ltblack; - songplayerfo.waveformcheck.frame.font.color := ltblack; - songplayer2fo.waveformcheck.frame.font.color := ltblack; + //songplayerfo.waveformcheck.frame.font.color := ltblack; + // songplayer2fo.waveformcheck.frame.font.color := ltblack; - songplayerfo.playreverse.frame.font.color := ltblack; - songplayer2fo.playreverse.frame.font.color := ltblack; + // songplayerfo.playreverse.frame.font.color := ltblack; + // songplayer2fo.playreverse.frame.font.color := ltblack; - songplayerfo.setmono.frame.font.color := ltblack; - songplayer2fo.setmono.frame.font.color := ltblack; + // songplayerfo.setmono.frame.font.color := ltblack; + // songplayer2fo.setmono.frame.font.color := ltblack; songplayerfo.tstringdisp2.font.color := ltblack; songplayer2fo.tstringdisp2.font.color := ltblack; @@ -2799,7 +2802,9 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.button2.font.color := ltblack; songplayer2fo.button2.font.color := ltblack; - + + +{ songplayerfo.cbloop.colorglyph := ltblack; songplayer2fo.cbloop.colorglyph := ltblack; songplayerfo.cbtempo.colorglyph := ltblack; @@ -2822,6 +2827,7 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.edvolleft.frame.colorglyph := ltblack; songplayer2fo.edvolleft.frame.colorglyph := ltblack; + } recorderfo.edvol.frame.colorglyph := ltblack; recorderfo.edvolr.frame.colorglyph := ltblack; recorderfo.edtempo.frame.colorglyph := ltblack; @@ -3055,7 +3061,7 @@ // spect1.face.template := recorderfo.tfacerecorder; commanderfo.genvolright.scrollbar.face.template := commanderfo.tfaceslider; commanderfo.genvolright.scrollbar.face1.template := commanderfo.tfaceslider; - +{ commanderfo.vuin.colorglyph := ltblack; commanderfo.vuin.frame.font.color := ltblack; @@ -3064,10 +3070,10 @@ // spect1.face.template := recorderfo.tfacerecorder; commanderfo.speccalc.colorglyph := ltblack; commanderfo.speccalc.frame.font.color := ltblack; - +} commanderfo.butinput.colorglyph := ltblack; commanderfo.butinput.frame.font.color := ltblack; - +{ commanderfo.automix.colorglyph := ltblack; commanderfo.automix.frame.font.color := ltblack; @@ -3082,7 +3088,7 @@ // spect1.face.template := recorderfo.tfacerecorder; commanderfo.linkvolgen.colorglyph := ltblack; commanderfo.linkvolgen.frame.font.color := ltblack; - +} commanderfo.volumeleft1.scrollbar.face.template := commanderfo.tfaceslider; commanderfo.volumeleft1.scrollbar.face1.template := commanderfo.tfaceslider; commanderfo.volumeleft2.scrollbar.face.template := commanderfo.tfaceslider; @@ -3475,6 +3481,7 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.llength.font.color := ltblank; songplayer2fo.llength.font.color := ltblank; +{ songplayerfo.cbloop.colorglyph := ltblank; songplayer2fo.cbloop.colorglyph := ltblank; songplayerfo.cbtempo.colorglyph := ltblank; @@ -3496,7 +3503,7 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.edvolleft.frame.colorglyph := ltblank; songplayer2fo.edvolleft.frame.colorglyph := ltblank; - +} recorderfo.edvol.frame.colorglyph := ltblank; recorderfo.edvolr.frame.colorglyph := ltblank; @@ -3533,7 +3540,7 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.historyfn.dropdown.colorclient := ltblack; songplayer2fo.historyfn.dropdown.colorclient := ltblack; - +{ songplayerfo.cbloop.frame.font.color := ltblank; songplayer2fo.cbloop.frame.font.color := ltblank; @@ -3548,7 +3555,7 @@ // spect1.face.template := recorderfo.tfacerecorder; songplayerfo.setmono.frame.font.color := ltblank; songplayer2fo.setmono.frame.font.color := ltblank; - +} songplayerfo.tstringdisp2.font.color := ltblank; songplayer2fo.tstringdisp2.font.color := ltblank; @@ -3748,7 +3755,7 @@ // spect1.face.template := recorderfo.tfacerecorder; commanderfo.tslider3val.font.color := ltblank; commanderfo.timemix.font.color := ltblank; - +{ commanderfo.vuin.colorglyph := ltblank; commanderfo.vuin.frame.font.color := ltblank; @@ -3757,13 +3764,14 @@ // spect1.face.template := recorderfo.tfacerecorder; commanderfo.speccalc.colorglyph := ltblank; commanderfo.speccalc.frame.font.color := ltblank; - +} commanderfo.butinput.colorglyph := ltblank; commanderfo.butinput.frame.font.color := ltblank; commanderfo.automix.colorglyph := ltblank; commanderfo.automix.frame.font.color := ltblank; +{ commanderfo.guimix.colorglyph := ltblank; commanderfo.guimix.frame.font.color := ltblank; @@ -3775,7 +3783,7 @@ // spect1.face.template := recorderfo.tfacerecorder; commanderfo.linkvolgen.colorglyph := ltblank; commanderfo.linkvolgen.frame.font.color := ltblank; - +} commanderfo.timemix.frame.colorglyph := ltblank; commanderfo.tfacegriptab.template.fade_color.items[0] := $EDEDED; diff --git a/src/songplayer.pas b/src/songplayer.pas index 25dfbae..7e61ce3 100644 --- a/src/songplayer.pas +++ b/src/songplayer.pas @@ -897,7 +897,7 @@ procedure tsongplayerfo.doplayerstart(const Sender: TObject); // If PlayerIndex exists already, it will be overwriten... Inputindex1 := uos_AddFromFile(theplayer, PChar(ansistring(historyfn.Value)), -1, - samformat, -1); + samformat, 1024 * 8); // add input from audio file with custom parameters // FileName : filename of audio file @@ -917,7 +917,7 @@ procedure tsongplayerfo.doplayerstart(const Sender: TObject); Outputindex1 := uos_AddIntoDevOut(theplayer, configfo.devoutcfg.Value, configfo.latplay.Value, uos_InputGetSampleRate(theplayer, Inputindex1), // uos_InputGetChannels(theplayer, Inputindex1), samformat,-1, -1); - uos_InputGetChannels(theplayer, Inputindex1), samformat, 1024 * 16, -1); + uos_InputGetChannels(theplayer, Inputindex1), samformat, 1024 * 8, -1); // Add a Output into Device Output @@ -1192,7 +1192,8 @@ procedure tsongplayerfo.doplayerstart(const Sender: TObject); // PlayerIndex : from 0 to what your computer can do ! // If PlayerIndex exists already, it will be overwriten... - Inputindex2 := uos_AddFromFile(theplayer2, PChar(ansistring(historyfn.Value)), -1, samformat, -1); + Inputindex2 := uos_AddFromFile(theplayer2, PChar(ansistring(historyfn.Value)), + -1, samformat, 1024 * 8); // add input from audio file with custom parameters // FileName : filename of audio file @@ -1213,10 +1214,9 @@ procedure tsongplayerfo.doplayerstart(const Sender: TObject); configfo.latplay.Value := -1; Outputindex2 := uos_AddIntoDevOut(theplayer2, configfo.devoutcfg.Value, configfo.latplay.Value, uos_InputGetSampleRate(theplayer2, Inputindex2), - uos_InputGetChannels(theplayer2, Inputindex2), samformat, 1024 * 16, -1); + uos_InputGetChannels(theplayer2, Inputindex2), samformat, 1024 * 8, -1); //uos_InputGetChannels(theplayer2, Inputindex2), samformat, -1, -1); - // Add a Output into Device Output // Device ( -1 is default device ) // Latency ( -1 is latency suggested ) diff --git a/src/strumpract.prj b/src/strumpract.prj index 5c64e79..f34d73e 100644 --- a/src/strumpract.prj +++ b/src/strumpract.prj @@ -186,8 +186,8 @@ finddialog=8 value=0 [finddialogfo] stackedunder= - x=767 - y=542 + x=505 + y=265 cx=300 cy=269 replacedialog=33 @@ -489,8 +489,8 @@ imagelisteditor=87 [imagelisteditorfo.stretch] value=0 [imagelisteditorfo] - x=376 - y=291 + x=372 + y=188 cx=508 cy=355 wsize=0 @@ -842,18 +842,9 @@ settingsstorage=0 settingsprojecttree=0 settingsautoload=0 settingsautosave=0 -modulenames=3 - COMMANDERFO - MAINFO - SONGPLAYERFO -moduletypes=3 - TCOMMANDERFO - TMAINFO - TSONGPLAYERFO -modulefiles=3 - /home/fred/strumpract/src/commander.mfm - /home/fred/strumpract/src/main.mfm - /home/fred/strumpract/src/songplayer.mfm +modulenames=0 +moduletypes=0 +modulefiles=0 befcommandon=0 makeoptionson=12 4095 @@ -1224,7 +1215,7 @@ line=33 1538 209 1136 - 3565 + 3572 431 5 747 @@ -1616,8 +1607,15 @@ envvarons=0 [edit] hintwidth=314 hintheight=200 -finddtext=onexecbutlght +finddtext=addfromf findhistory=20 + addfromf + linkvol2 + speccalc + speccalcb + vuin + guimix + cbloop onexecbutlght nameplayers initcheck @@ -1625,162 +1623,47 @@ findhistory=20 AddIntoDevOut reverse tfacegreen - vuin timemix.Value timermix tbutton2 commander.tbutton2 initvolleft2 maxvolleft1 - tfaceplayerlight - lposition - llength - tfaceorange - tfaceor - tfacered findoptions=1 -editpos=18 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,-1073741823 - 0,2827 +editpos=1 0,0 - 0,-1073741823 - 0,-1073741823 - 0,6 - 0,-1073741823 - 0,8 - 0,-1073741823 - 0,-1073741823 - 0,7 bookmarks0=0 -bookmarks1=0 -bookmarks2=0 -bookmarks3=0 -bookmarks4=0 -bookmarks5=0 -bookmarks6=0 -bookmarks7=0 -bookmarks8=0 -bookmarks9=0 -bookmarks10=0 -bookmarks11=0 -bookmarks12=0 -bookmarks13=0 -bookmarks14=0 -bookmarks15=0 -bookmarks16=0 -bookmarks17=0 -sourcefiles=18 +sourcefiles=1 ${PROJECTDIR}/strumpract.pas - ${PROJECTDIR}/commander.pas - ${PROJECTDIR}/main.pas - ${PROJECTDIR}/config.pas - ${PROJECTDIR}/songplayer.pas - ${PROJECTDIR}/uos.pas - ${PROJECTDIR}/filelistform.pas - ${PROJECTDIR}/randomnote.pas - ${PROJECTDIR}/songplayer.pas - ${PROJECTDIR}/waveform.pas - ${PROJECTDIR}/main.pas - ${PROJECTDIR}/commander.pas - ${PROJECTDIR}/commander.pas - ${PROJECTDIR}/main.pas - ${PROJECTDIR}/config.pas - ${PROJECTDIR}/waveform.mfm - ${PROJECTDIR}/config.pas - ${PROJECTDIR}/main.pas -relpaths=18 +relpaths=1 strumpract.pas - commander.pas - main.pas - config.pas - songplayer.pas - uos.pas - filelistform.pas - randomnote.pas - songplayer.pas - waveform.pas - main.pas - commander.pas - commander.pas - main.pas - config.pas - waveform.mfm - config.pas - main.pas -ismoduletexts=18 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 +ismoduletexts=1 0 - 0 - 0 - -1 - 0 - 0 -modules=5 +modules=4 /home/fred/strumpract/src/main.mfm /home/fred/strumpract/src/commander.mfm /home/fred/strumpract/src/drums.mfm /home/fred/strumpract/src/recorder.mfm - /home/fred/strumpract/src/songplayer.mfm -moduleoptions=5 +moduleoptions=4 0 0 0 0 +visiblemodules=4 0 -visiblemodules=5 - -1 - -1 0 - 0 - -1 -nomenumodules=5 0 0 +nomenumodules=4 + -1 + -1 -1 -1 - 0 [sourcefo.files_tab] -order=18 - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 14 - 15 - 16 - 17 - 13 -firsttab=8 -index=16 +firsttab=0 +index=0 [layout] -windowlayout=679 +windowlayout=641 [mainfo.basedock] splitdir=2 useroptions=268450944 @@ -1794,8 +1677,8 @@ windowlayout=679 ny=0 ncx=0 ncy=0 - x=96 - y=144 + x=29 + y=90 cx=1224 cy=621 rcx=0 @@ -1925,7 +1808,7 @@ windowlayout=679 sortdescend1=0 sorted=0 col=0 - row=1 + row=15 rowheight=16 [stackfo] splitdir=0 @@ -2261,11 +2144,12 @@ windowlayout=679 [debuggerfo.edit_compiler] value=Pascal [debuggerfo.file_history] - value=/home/fred/strumpract/src/main.pas + value=/home/fred/strumpract/src/strumpract.pas history=20 + /home/fred/strumpract/src/strumpract.pas + /home/fred/strumpract/src/main.pas /home/fred/strumpract/src/commander.pas /home/fred/strumpract/src/songplayer.pas - /home/fred/strumpract/src/main.pas /home/fred/strumpract/src/waveform.mfm /home/fred/strumpract/src/waveform.pas /home/fred/strumpract/src/filelistform.pas @@ -2282,7 +2166,6 @@ windowlayout=679 /home/fred/uos/examples/uos.pas /home/fred/strumpract/src/define.inc /home/fred/uos_blaazwave/src/uos.pas - /home/fred/strumpract/src/dockpanel1.pas [debuggerfo.project_options] value=1 [debuggerfo.hints] @@ -2304,27 +2187,8 @@ windowlayout=679 rcx=0 rcy=0 [sourcefo.files_tab] - order=18 - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 14 - 15 - 16 - 17 - 13 - firsttab=8 - index=16 + firsttab=0 + index=0 [confideufo.fontname] value=stf_default [confideufo.usedefaulteditoroptions] @@ -2333,7 +2197,7 @@ windowlayout=679 irqoff=0 splitdir=0 useroptions=268451947 - stackedunder=_mse_drumsfo_mse_ + stackedunder=_mse_mainfo_mse_ parent= mdistate=0 nx=0 @@ -2368,7 +2232,7 @@ windowlayout=679 [_mse_mainfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_commanderfo_mse_ + stackedunder=_mse_drumsfo_mse_ parent= mdistate=3 nx=0 @@ -2383,11 +2247,11 @@ windowlayout=679 rcy=0 wsize=0 active=0 - visible=1 + visible=0 [_mse_commanderfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_songplayerfo_mse_ + stackedunder=confdebuggerfo parent= mdistate=3 nx=0 @@ -2402,11 +2266,11 @@ windowlayout=679 rcy=0 wsize=0 active=0 - visible=1 + visible=0 [_mse_recorderfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=confdebuggerfo + stackedunder=_mse_commanderfo_mse_ parent= mdistate=3 nx=0 @@ -2441,25 +2305,6 @@ windowlayout=679 wsize=0 active=0 visible=0 - [_mse_songplayerfo_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=targetconsolefo - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=447 - y=62 - cx=452 - cy=128 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 [targetconsole] finddtext= findhistory=0