On Sun, 4 Sep 2011, frankster wrote:
sorry for the double post before.
I have put a fix to SVN. If you still have this problem, could you send
me a sysx file containing a patch that triggers it?
Thanks. Problem has gone.
I have also been doing a few improvements on the envelope graphics for
the Yamaha DX7 and DX100/TX81z family (EG and PEG). (All were missing a
Sustain segment, which I have fixed now). I will send some
patches/proposals later, after the above bug has been fixed and after I
have done some more testing with my locally modified copy.
I have attached patches for the Yamaha DX7, DX100, and TX81z Single Voice
editor. They change the Envelope Generator (level and pitch) graphics.
1. A sustain segment is now correctly Bdisplayed.
2. DX7 EG, PEG and DX21 PEG: The start level is the same as the end
level (DX7 Level/Pitch 4, DX21 PEG Level 3). (read the DX7 manual)
3. The DX21/TX81Z envelope is a hard one. I have choosen to draw a
horizontal line after the D1L point. This is only true if D2R=0. But it's
as good as I could get it.
I hope someone who knows how SVN works can merge my ideas into the trunk.
(I guess I should learn how to use it before asking to get write access
myself)
--
MT
---
jsynthlib.svn/trunk/JSynthLib/synthdrivers/YamahaDX100/YamahaDX100SingleEditor.java
2011-09-04 19:14:56.779912787 +0200
+++
jsynthlib.mt/trunk/JSynthLib/synthdrivers/YamahaDX100/YamahaDX100SingleEditor.java
2011-09-04 19:39:55.384462027 +0200
@@ -122,24 +122,27 @@
addWidget(panel,new EnvelopeWidget(" Envelope",patch,new
EnvelopeWidget.Node [] {
new EnvelopeWidget.Node(0,0,null,0,0,null,0,false,null,null,null,null),
- new EnvelopeWidget.Node(0,31,new
ParamModel(patch,-41+i*13+47),30,30,null,10,true,new VcedSender(i*13),null,"
AR",null),
- new EnvelopeWidget.Node(0,31,new ParamModel(patch,-41+i*13+48),0,15,new
ParamModel(patch,-41+i*13+51),25,true,new VcedSender(i*13+1),new
VcedSender(i*13+4),"D1R","D1L"),
- new EnvelopeWidget.Node(0,31,new
ParamModel(patch,-41+i*13+49),0,0,null,10,true,new
VcedSender(i*13+2),null,"D2R",null),
- new EnvelopeWidget.Node(0,15,new
ParamModel(patch,-41+i*13+50),0,0,null,0,true,new
VcedSender(i*13+3),null,"RR",null),
+ new EnvelopeWidget.Node(0,31,new
ParamModel(patch,-41+i*13+47),0,0,null,15,true,new VcedSender(i*13),null,"
AR",null),
+ new EnvelopeWidget.Node(0,31,new
ParamModel(patch,-41+i*13+48),0,15,new ParamModel(patch,-41+i*13+51),0,true,new
VcedSender(i*13+1),new VcedSender(i*13+4),"D1R","D1L"),
+ new EnvelopeWidget.Node(0,31,new
ParamModel(patch,-41+i*13+49),EnvelopeWidget.Node.SAME,15,null,0,true,new
VcedSender(i*13+2),null,"D2R",null),
+ new EnvelopeWidget.Node(1,15,new
ParamModel(patch,-41+i*13+50),0,0,null,0,true,new
VcedSender(i*13+3),null,"RR",null),
} ),3,0,3,7,10);
if (i==3) i=1; else if (i==1) i=2; else if (i==2) i=0;else if (i==0) i=5;
j++;
}
+
JPanel pegPane = new JPanel();
pegPane.setLayout(new GridBagLayout());
if (((YamahaDX100Device)(patch.getDevice())).getWhichSynth()==21)
oscPane.addTab("P.E.G.",pegPane);
gbc.fill=GridBagConstraints.BOTH;
addWidget(pegPane,new EnvelopeWidget("Pitch Envelope",patch,new
EnvelopeWidget.Node [] {
- new
EnvelopeWidget.Node(50,50,null,0,0,null,50,false,null,null,null,null),
- new EnvelopeWidget.Node(0,99,new ParamModel(patch,93),0,99,new
ParamModel(patch,96),0,true,new VcedSender(87),new VcedSender(90),"Rate
1","Pitch 1"),
- new EnvelopeWidget.Node(0,99,new ParamModel(patch,94),0,99,new
ParamModel(patch,97),0,true,new VcedSender(88),new VcedSender(91),"Rate
2","Pitch 2"),
- new EnvelopeWidget.Node(0,99,new ParamModel(patch,95),0,99,new
ParamModel(patch,98),0,true,new VcedSender(89),new VcedSender(92),"Rate
3","Pitch 3"),
+ new EnvelopeWidget.Node(0,0,null,0,99,new
ParamModel(patch,98),0,true,null,new VcedSender(92),null,"Pitch 3"),
+ /*new
EnvelopeWidget.Node(0,0,null,0,0,null,50,false,null,null,null,null),*/
+ new EnvelopeWidget.Node(0,99,new ParamModel(patch,93),0,99,new
ParamModel(patch,96),0,true,new VcedSender(87),new VcedSender(90),"Rate
1","Pitch 1"),
+ new EnvelopeWidget.Node(0,99,new ParamModel(patch,94),0,99,new
ParamModel(patch,97),0,true,new VcedSender(88),new VcedSender(91),"Rate
2","Pitch 2"),
+ new
EnvelopeWidget.Node(100,100,null,EnvelopeWidget.Node.SAME,99,null,0,true,null,null,null,null),
+ new EnvelopeWidget.Node(0,99,new ParamModel(patch,95),0,99,new
ParamModel(patch,98),0,true,new VcedSender(89),new VcedSender(92),"Rate
3","Pitch 3"),
} ),0,0,1,1,1);
gbc.gridy=1;
//kludge for envelopewidget size problem. Should really fix that soon.
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo01.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo02.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo03.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo04.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo05.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo06.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo07.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo08.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo09.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo10.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo11.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo12.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo13.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo14.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo15.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo16.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo17.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo18.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo19.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo20.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo21.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo22.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo23.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo24.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo25.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo26.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo27.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo28.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo29.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo30.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo31.gif
Only in jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common: algo32.gif
diff -ur
jsynthlib.orig/trunk/JSynthLib/synthdrivers/YamahaDX7/common/DX7FamilyVoiceEditor.java
jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common/DX7FamilyVoiceEditor.java
---
jsynthlib.orig/trunk/JSynthLib/synthdrivers/YamahaDX7/common/DX7FamilyVoiceEditor.java
2005-03-30 07:45:21.000000000 +0200
+++
jsynthlib/trunk/JSynthLib/synthdrivers/YamahaDX7/common/DX7FamilyVoiceEditor.java
2011-07-08 01:15:27.167723560 +0200
@@ -168,38 +168,38 @@
protected void buildEditor(Patch patch)
{
- algoIcon[ 0]=new
ImageIcon(getClass().getResource("../images/algo01.gif"));
- algoIcon[ 1]=new
ImageIcon(getClass().getResource("../images/algo02.gif"));
- algoIcon[ 2]=new
ImageIcon(getClass().getResource("../images/algo03.gif"));
- algoIcon[ 3]=new
ImageIcon(getClass().getResource("../images/algo04.gif"));
- algoIcon[ 4]=new
ImageIcon(getClass().getResource("../images/algo05.gif"));
- algoIcon[ 5]=new
ImageIcon(getClass().getResource("../images/algo06.gif"));
- algoIcon[ 6]=new
ImageIcon(getClass().getResource("../images/algo07.gif"));
- algoIcon[ 7]=new
ImageIcon(getClass().getResource("../images/algo08.gif"));
- algoIcon[ 8]=new
ImageIcon(getClass().getResource("../images/algo09.gif"));
- algoIcon[ 9]=new
ImageIcon(getClass().getResource("../images/algo10.gif"));
- algoIcon[10]=new
ImageIcon(getClass().getResource("../images/algo11.gif"));
- algoIcon[11]=new
ImageIcon(getClass().getResource("../images/algo12.gif"));
- algoIcon[12]=new
ImageIcon(getClass().getResource("../images/algo13.gif"));
- algoIcon[13]=new
ImageIcon(getClass().getResource("../images/algo14.gif"));
- algoIcon[14]=new
ImageIcon(getClass().getResource("../images/algo15.gif"));
- algoIcon[15]=new
ImageIcon(getClass().getResource("../images/algo16.gif"));
- algoIcon[16]=new
ImageIcon(getClass().getResource("../images/algo17.gif"));
- algoIcon[17]=new
ImageIcon(getClass().getResource("../images/algo18.gif"));
- algoIcon[18]=new
ImageIcon(getClass().getResource("../images/algo19.gif"));
- algoIcon[19]=new
ImageIcon(getClass().getResource("../images/algo20.gif"));
- algoIcon[20]=new
ImageIcon(getClass().getResource("../images/algo21.gif"));
- algoIcon[21]=new
ImageIcon(getClass().getResource("../images/algo22.gif"));
- algoIcon[22]=new
ImageIcon(getClass().getResource("../images/algo23.gif"));
- algoIcon[23]=new
ImageIcon(getClass().getResource("../images/algo24.gif"));
- algoIcon[24]=new
ImageIcon(getClass().getResource("../images/algo25.gif"));
- algoIcon[25]=new
ImageIcon(getClass().getResource("../images/algo26.gif"));
- algoIcon[26]=new
ImageIcon(getClass().getResource("../images/algo27.gif"));
- algoIcon[27]=new
ImageIcon(getClass().getResource("../images/algo28.gif"));
- algoIcon[28]=new
ImageIcon(getClass().getResource("../images/algo29.gif"));
- algoIcon[29]=new
ImageIcon(getClass().getResource("../images/algo30.gif"));
- algoIcon[30]=new
ImageIcon(getClass().getResource("../images/algo31.gif"));
- algoIcon[31]=new
ImageIcon(getClass().getResource("../images/algo32.gif"));
+ algoIcon[ 0]=new
ImageIcon(getClass().getResource("algo01.gif"));
+ algoIcon[ 1]=new
ImageIcon(getClass().getResource("algo02.gif"));
+ algoIcon[ 2]=new
ImageIcon(getClass().getResource("algo03.gif"));
+ algoIcon[ 3]=new
ImageIcon(getClass().getResource("algo04.gif"));
+ algoIcon[ 4]=new
ImageIcon(getClass().getResource("algo05.gif"));
+ algoIcon[ 5]=new
ImageIcon(getClass().getResource("algo06.gif"));
+ algoIcon[ 6]=new
ImageIcon(getClass().getResource("algo07.gif"));
+ algoIcon[ 7]=new
ImageIcon(getClass().getResource("algo08.gif"));
+ algoIcon[ 8]=new
ImageIcon(getClass().getResource("algo09.gif"));
+ algoIcon[ 9]=new
ImageIcon(getClass().getResource("algo10.gif"));
+ algoIcon[10]=new
ImageIcon(getClass().getResource("algo11.gif"));
+ algoIcon[11]=new
ImageIcon(getClass().getResource("algo12.gif"));
+ algoIcon[12]=new
ImageIcon(getClass().getResource("algo13.gif"));
+ algoIcon[13]=new
ImageIcon(getClass().getResource("algo14.gif"));
+ algoIcon[14]=new
ImageIcon(getClass().getResource("algo15.gif"));
+ algoIcon[15]=new
ImageIcon(getClass().getResource("algo16.gif"));
+ algoIcon[16]=new
ImageIcon(getClass().getResource("algo17.gif"));
+ algoIcon[17]=new
ImageIcon(getClass().getResource("algo18.gif"));
+ algoIcon[18]=new
ImageIcon(getClass().getResource("algo19.gif"));
+ algoIcon[19]=new
ImageIcon(getClass().getResource("algo20.gif"));
+ algoIcon[20]=new
ImageIcon(getClass().getResource("algo21.gif"));
+ algoIcon[21]=new
ImageIcon(getClass().getResource("algo22.gif"));
+ algoIcon[22]=new
ImageIcon(getClass().getResource("algo23.gif"));
+ algoIcon[23]=new
ImageIcon(getClass().getResource("algo24.gif"));
+ algoIcon[24]=new
ImageIcon(getClass().getResource("algo25.gif"));
+ algoIcon[25]=new
ImageIcon(getClass().getResource("algo26.gif"));
+ algoIcon[26]=new
ImageIcon(getClass().getResource("algo27.gif"));
+ algoIcon[27]=new
ImageIcon(getClass().getResource("algo28.gif"));
+ algoIcon[28]=new
ImageIcon(getClass().getResource("algo29.gif"));
+ algoIcon[29]=new
ImageIcon(getClass().getResource("algo30.gif"));
+ algoIcon[30]=new
ImageIcon(getClass().getResource("algo31.gif"));
+ algoIcon[31]=new
ImageIcon(getClass().getResource("algo32.gif"));
final JLabel l=new JLabel(algoIcon[patch.sysex[6+134]]);
Only in jsynthlib.orig/trunk/JSynthLib/synthdrivers/YamahaDX7: images
---
jsynthlib.svn/trunk/JSynthLib/synthdrivers/YamahaTX81z/YamahaTX81zSingleEditor.java
2011-09-04 19:14:57.263011210 +0200
+++
jsynthlib.mt/trunk/JSynthLib/synthdrivers/YamahaTX81z/YamahaTX81zSingleEditor.java
2011-09-04 19:10:39.643228500 +0200
@@ -146,15 +146,14 @@
addWidget(panel,new ComboBoxWidget("EG Shift",patch,new
ParamModel(patch,20+(i*5)),new AcedSender(i*5+4),new String []
{"96db","48db","24db","12db"}),0,4,1,1,5);
- addWidget(panel,new EnvelopeWidget(" Envelope",patch,new
EnvelopeWidget.Node [] {
- new EnvelopeWidget.Node(0,0,null,0,0,null,0,false,null,null,null,null),
- new EnvelopeWidget.Node(0,31,new
ParamModel(patch,i*13+47),30,30,null,10,true,new VcedSender(i*13),null,"
AR",null),
- new EnvelopeWidget.Node(0,31,new ParamModel(patch,i*13+48),0,15,new
ParamModel(patch,i*13+51),25,true,new VcedSender(i*13+1),new
VcedSender(i*13+4),"D1R","D1L"),
- new EnvelopeWidget.Node(0,31,new
ParamModel(patch,i*13+49),0,0,null,10,true,new
VcedSender(i*13+2),null,"D2R",null),
- new EnvelopeWidget.Node(1,15,new
ParamModel(patch,i*13+50),0,0,null,0,true,new
VcedSender(i*13+3),null,"RR",null),
- } ),3,0,3,5,10);
-
+ addWidget(panel,new EnvelopeWidget(" Envelope",patch,new
EnvelopeWidget.Node [] {
+ new EnvelopeWidget.Node(0,0,null,0,0,null,0,false,null,null,null,null),
+ new EnvelopeWidget.Node(0,31,new
ParamModel(patch,i*13+47),0,0,null,15,true,new VcedSender(i*13),null,"
AR",null),
+ new EnvelopeWidget.Node(0,31,new ParamModel(patch,i*13+48),0,15,new
ParamModel(patch,i*13+51),0,true,new VcedSender(i*13+1),new
VcedSender(i*13+4),"D1R","D1L"),
+ new EnvelopeWidget.Node(0,31,new
ParamModel(patch,i*13+49),EnvelopeWidget.Node.SAME,15,null,0,true,new
VcedSender(i*13+2),null,"D2R",null),
+ new EnvelopeWidget.Node(1,15,new
ParamModel(patch,i*13+50),0,0,null,0,true,new
VcedSender(i*13+3),null,"RR",null),
+ } ),3,0,3,5,10);
if (i==3) i=1; else if (i==1) i=2; else if (i==2) i=0;else if (i==0) i=5;
j++;
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Jsynthlib-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jsynthlib-devel
