From 31f81450a303d52bf37ec8bcbb12e0f3b3b8b833 Mon Sep 17 00:00:00 2001 From: Einar Pehrson Date: Tue, 13 May 2003 23:31:50 +0000 Subject: [PATCH] no message --- MooToolbar.java | 1 + MooTrackTitle.java | 15 +++++---------- midi/test2.mid | Bin 0 -> 1558 bytes midi/test3.mid | Bin 0 -> 3541 bytes 4 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 midi/test2.mid create mode 100644 midi/test3.mid diff --git a/MooToolbar.java b/MooToolbar.java index e5e46da..9852c6a 100644 --- a/MooToolbar.java +++ b/MooToolbar.java @@ -74,6 +74,7 @@ public class MooToolbar extends JToolBar { * @param tickPosition the tick position to visualize */ public void updateProgInd(long tickPosition) { + ticksPerBeat = Moosique.getSequence().getResolution(); if (tickPosition == 0) { resetProgInd(); } else { diff --git a/MooTrackTitle.java b/MooTrackTitle.java index a97844b..412fb24 100644 --- a/MooTrackTitle.java +++ b/MooTrackTitle.java @@ -61,15 +61,11 @@ public class MooTrackTitle extends JPanel { setBorder(BorderFactory.createLineBorder(Color.black)); setPreferredSize(new Dimension(MooTrackView.VIEW_WIDTH,70)); - title = new JTextField(trackName); // JTextField(String text, int columns) + title = new JTextField(trackName); title.setFont(Moosique.getGUI().FONT); title.addFocusListener(new TitleFocusListener()); add(title); - - JPanel checkboxes = new JPanel(); - checkboxes.setLayout(new GridLayout(1,3)); - channelBox = new JComboBox(); channelBox.setFont(Moosique.getGUI().FONT); for (int i = 1; i <= 16; i++) @@ -78,8 +74,7 @@ public class MooTrackTitle extends JPanel { channelBox.setSelectedIndex(channel); instruments = new MooInstrumentList(channelBox.getSelectedIndex()); - - instruments = new MooInstrumentList(channelBox.getSelectedIndex()); + add(instruments); channelBox.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ @@ -94,11 +89,11 @@ public class MooTrackTitle extends JPanel { mn.setChannel(chan); } }}}); - channelBox.setSelectedIndex(channel); - - add(instruments); add(channelBox); + JPanel checkboxes = new JPanel(); + checkboxes.setLayout(new GridLayout(1,3)); + mute = new JCheckBox("Mute"); mute.setSelected(Moosique.getSequencer().getTrackMute(trackNum)); mute.setFont(Moosique.getGUI().FONT); diff --git a/midi/test2.mid b/midi/test2.mid new file mode 100644 index 0000000000000000000000000000000000000000..dfe6b7e5eb22bd2489edbbf1d3109522642ce0fd GIT binary patch literal 1558 zcmc(eO=}ZT6oyaILB=d3LN^u{UAk$LLU9rU;l?!0he?LX#F$8gyAZMJLP~@z1m{kt zhHhjg&PLq&1Ja@kcPhH@Z}>;zdo%f%rc$IJE`~Yx+;iXaoOkZjnvWk6(Itw|<%m^l z?mxw9jmB+7iE@?3uU3e1G&WYQ)UVSxK|w|I7mZN&B|@XvCXG8$EL^6kZt=G2R%>xr zZ>z5PNc1g6WEJsLQPAS5r6V?pSuGN6x3HfK6I3O#!_EdIgdS=n0c z`hdI(VrAYgpuc!4CnZgA%bF6j1F>EfDY*!oDhhUyX7)P1#;JLpLlasdc-S5Ww^x_^ zS<=vr!>NY8FkngJ0zSvx;D%su+>k$cEWJ4E^ZB@kJvr{q%)0qar%!Z@%l$P%$FX{F z)88`BDB0@*Ej&HP1rWUI9WKz;tK8(GBG)}fCT#NB4KCWqw029PMSagqC54G~Bb^it zdb94CF9kzJFwcB8iO4hd5g0P1KS89+sNUnEj&u5hpkw_7cItAcBC97&?+uuwSil$Q z1n}P?bQ0SO;6Ko?*yJ{T$zfra+Xdpoe6?ifsXxpllXeFAY&vOY@n*RJvsqZ~h(1H^ zCsOi{e^2i+I|p=>p#wy>=Fz{-E#`}?(MJG%?*u?2^0Qs?w_D^V?vt-|ow$QRoNYV_ zMvg{FKaI_e2KifeQP_UncQ&xOC5xEqq>1^NnL=l(0836OXy++tQ27503y0_`E-=xL MYk@{tU1VIZ{4et8rc$Lo(oHx04~QS)eD^Vf?V?a4RZ16E=iGD7_npVRbM0hmGebo0 zkcWmnm1Jsf8#_O>?|MB0>@u~>gG5u*o*%rr`^@5IuP_Hmh7L~AGXQ?OM(uk8UaI=+ ziDalUL1afCglz2&*|7rI;k36BHEJJMG@?ojE6fAn&={OKvM27;j7k&^9ss9c(C)&C zfQh8l?TD_EJqdIqO?J>hP68Fd3WA#Fj3Rdg)IoM+h@70>35c$NVOKFMs@z=+kHLWa zkw;+2p25IV@b}@NCyy5#m^So*p9BoIxLa+DWL{4o@Au&oZ5E1aU z^o{9-zr0Z2ytUPS`<^UeILkPQJdpg9_(=IVNB2O-&sWV@MVW>j+c3p&?a6H@DxPEi ziMbFv<0l95s_)I@=Uvsd^C4aOg?`3|^cV3DiRdY{^gOlv%rxpcQQc42%wglFLu$oy z(BfnoE&WMPkiMh>9h5#RC~Ag-Vl97y2|~T_FTqt`EB+0W8Q+wf_2iBhMV;s+C5m8* z28J17=xoIgw4P_Y-Iksd6$;(IjQtM6F#}Ua&EZlLTlaXN18JJ@H~Y1?Qnl128%{31YZNFPY#SQz|^Opr!qWgO>n{C;2q zWmXRW8^E0TX$t)dWlJfE(;X=&eVx@uoVZ0yY)9FFaq&fETU9cRxJOE#KaCsP2QTnr z$Uk;n@(O)H*^~^FfzK-Ze^Mv-mj%DLcY(LQ-v7^BN7P(#XIkBJ#o6obUEp^LcLDcc zAD^<=0O&|u3ZcvQms&TAEKw!2yU4} zW{^US;F@Vb`QFzEE{3FK*Ky^A>yR3OlKJ^D8AHbu$NGql=|jjcWC(H;>pJxJA+JHc z3wa5WLS}%58d?Fm0Zt9+v@AF^o=)2fNlVUg6@=?MxK^YqfF~3b)ELb`8HLhE*%md% z@j{y8#2Vuzh8~#E^%BavSSu!;4%H6GOR{c|!k9&Ed|dcPB&VtE!6I7Z1~i_-Ubd&Vuom&o?&s?0_&Jwp~X zjToJf!7PKQIsJ)gSkq8u@N;R+aLa;Yx$jt39m{6bCt?yi%t{bz&hC3pXy)<>-NKs3 zTEg1KD*uqOW{Dxq->fo$GROq6S%fxcr5!}Jrz@aMJ~!|7>U;TE|1 QvkZ6ro9h#Nv6LOC*SZhF*Z=?k literal 0 HcmV?d00001 -- 2.39.2