wirtz
/
dexed
mirror of https://github.com/dcoredump/dexed.git
1
0
Fork 0
Code Issues Releases Wiki Activity

0.8.0b1

Browse Source
pull/1/head
asb2m10 10 years ago
parent cdd007dffb
commit cd668063df
4 changed files with 27 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate
  2. 16
      Source/GlobalEditor.cpp
  3. 2
      Source/GlobalEditor.h
  4. 36
      Source/ParamDialog.cpp

BIN
Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

16
Source/GlobalEditor.cpp
Unescape View File

@ -37,25 +37,25 @@ public:
MidiMonitor(SysexComm *sysexComm) { MidiMonitor(SysexComm *sysexComm) {
midi = sysexComm; midi = sysexComm;
} }
void paint(Graphics &g) { void paint(Graphics &g) {
if ( ! (midi->isInputActive() || midi->isOutputActive() ) ) if ( ! (midi->isInputActive() || midi->isOutputActive() ) )
return; return;
/*g.setColour(DXLookNFeel::lightBackground); /*g.setColour(DXLookNFeel::lightBackground);
g.fillRoundedRectangle(0, 0, getWidth(), getHeight(), 3); g.fillRoundedRectangle(0, 0, getWidth(), getHeight(), 3);
*/ */
g.setColour(Colours::white); g.setColour(Colours::white);
// g.drawSingleLineText("DX7 ACT ", 0, 13); // g.drawSingleLineText("DX7 ACT ", 0, 13);
Image myStrip = ImageCache::getFromMemory(BinaryData::Light_14x14_png, BinaryData::Light_14x14_pngSize); Image myStrip = ImageCache::getFromMemory(BinaryData::Light_14x14_png, BinaryData::Light_14x14_pngSize);
if ( midi->isInputActive() ) { if ( midi->isInputActive() ) {
g.drawSingleLineText("DX7 IN", 17,14); g.drawSingleLineText("DX7 IN", 17,14);
g.drawImage(myStrip, 0, 3, 14, 14, 0, midi->inActivity ? 14 : 0, 14, 14); g.drawImage(myStrip, 0, 3, 14, 14, 0, midi->inActivity ? 14 : 0, 14, 14);
midi->inActivity = false; midi->inActivity = false;
} }
if ( midi->isOutputActive() ) { if ( midi->isOutputActive() ) {
g.drawSingleLineText("DX7 OUT", 17, 28); g.drawSingleLineText("DX7 OUT", 17, 28);
g.drawImage(myStrip, 0, 17, 14, 14, 0, midi->outActivity ? 14 : 0, 14, 14); g.drawImage(myStrip, 0, 17, 14, 14, 0, midi->outActivity ? 14 : 0, 14, 14);
@ -258,7 +258,7 @@ GlobalEditor::GlobalEditor ()
lfoType->setImage(ImageCache::getFromMemory(BinaryData::LFO_36_26_png, BinaryData::LFO_36_26_pngSize)); lfoType->setImage(ImageCache::getFromMemory(BinaryData::LFO_36_26_png, BinaryData::LFO_36_26_pngSize));
programs = programSelector; programs = programSelector;
//[/Constructor] //[/Constructor]
} }
@ -583,11 +583,11 @@ void GlobalEditor::bind(DexedAudioProcessor *parent) {
algoDisplay->algo = &(parent->data[134]); algoDisplay->algo = &(parent->data[134]);
pitchEnvDisplay->pvalues = &(parent->data[126]); pitchEnvDisplay->pvalues = &(parent->data[126]);
processor = parent; processor = parent;
midiMonitor = new MidiMonitor(&(processor->sysexComm)); midiMonitor = new MidiMonitor(&(processor->sysexComm));
addAndMakeVisible(midiMonitor); addAndMakeVisible(midiMonitor);
midiMonitor->setBounds(155, 21, 80, 80); midiMonitor->setBounds(155, 21, 80, 80);
repaint(); repaint();
} }

2
Source/GlobalEditor.h
Unescape View File

@ -63,7 +63,7 @@ public:
void setMonoState(bool state); void setMonoState(bool state);
ProgramSelector *programs; ProgramSelector *programs;
ScopedPointer<Component> midiMonitor; ScopedPointer<Component> midiMonitor;
//[/UserMethods] //[/UserMethods]

36
Source/ParamDialog.cpp
Unescape View File

@ -127,49 +127,49 @@ void ParamDialog::paint (Graphics& g)
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("Pitch Bend Range"), g.drawText (TRANS("Pitch Bend Range"),
20, 18, 276, 23, 20, 16, 276, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("Pitch Bend Step"), g.drawText (TRANS("Pitch Bend Step"),
20, 58, 276, 23, 20, 56, 276, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("DX7 In"), g.drawText (TRANS("DX7 In"),
27, 221, 131, 23, 20, 224, 131, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("DX7 Out"), g.drawText (TRANS("DX7 Out"),
27, 261, 131, 23, 20, 264, 131, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("DX7 Channel"), g.drawText (TRANS("DX7 Channel"),
27, 306, 245, 23, 20, 304, 245, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("Engine Resolution"), g.drawText (TRANS("Engine Resolution"),
22, 154, 276, 23, 20, 156, 276, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
g.setColour (Colours::black); g.setColour (Colours::black);
g.fillRect (22, 138, 306, 1); g.fillRect (22, 138, 306, 1);
g.setColour (Colours::black); g.setColour (Colours::black);
g.fillRect (22, 194, 306, 1); g.fillRect (22, 195, 306, 1);
g.setColour (Colours::white); g.setColour (Colours::white);
g.setFont (Font (15.00f, Font::plain)); g.setFont (Font (15.00f, Font::plain));
g.drawText (TRANS("Show Keyboard"), g.drawText (TRANS("Show Keyboard"),
19, 101, 276, 23, 20, 96, 276, 23,
Justification::centredLeft, true); Justification::centredLeft, true);
//[UserPaint] Add your own custom painting code here.. //[UserPaint] Add your own custom painting code here..
@ -183,7 +183,7 @@ void ParamDialog::resized()
sysexIn->setBounds (104, 224, 224, 24); sysexIn->setBounds (104, 224, 224, 24);
sysexOut->setBounds (104, 264, 224, 24); sysexOut->setBounds (104, 264, 224, 24);
sysexChl->setBounds (264, 304, 72, 24); sysexChl->setBounds (264, 304, 72, 24);
engineReso->setBounds (160, 152, 168, 24); engineReso->setBounds (160, 156, 168, 24);
showKeyboard->setBounds (264, 96, 56, 24); showKeyboard->setBounds (264, 96, 56, 24);
//[UserResized] Add your own custom resize handling here.. //[UserResized] Add your own custom resize handling here..
//[/UserResized] //[/UserResized]
@ -294,21 +294,21 @@ BEGIN_JUCER_METADATA
snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330" snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
fixedSize="1" initialWidth="350" initialHeight="350"> fixedSize="1" initialWidth="350" initialHeight="350">
<BACKGROUND backgroundColour="ff3c322f"> <BACKGROUND backgroundColour="ff3c322f">
<TEXT pos="20 18 276 23" fill="solid: ffffffff" hasStroke="0" text="Pitch Bend Range" <TEXT pos="20 16 276 23" fill="solid: ffffffff" hasStroke="0" text="Pitch Bend Range"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
<TEXT pos="20 58 276 23" fill="solid: ffffffff" hasStroke="0" text="Pitch Bend Step" <TEXT pos="20 56 276 23" fill="solid: ffffffff" hasStroke="0" text="Pitch Bend Step"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
<TEXT pos="27 221 131 23" fill="solid: ffffffff" hasStroke="0" text="DX7 In" <TEXT pos="20 224 131 23" fill="solid: ffffffff" hasStroke="0" text="DX7 In"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
<TEXT pos="27 261 131 23" fill="solid: ffffffff" hasStroke="0" text="DX7 Out" <TEXT pos="20 264 131 23" fill="solid: ffffffff" hasStroke="0" text="DX7 Out"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
<TEXT pos="27 306 245 23" fill="solid: ffffffff" hasStroke="0" text="DX7 Channel" <TEXT pos="20 304 245 23" fill="solid: ffffffff" hasStroke="0" text="DX7 Channel"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
<TEXT pos="22 154 276 23" fill="solid: ffffffff" hasStroke="0" text="Engine Resolution" <TEXT pos="20 156 276 23" fill="solid: ffffffff" hasStroke="0" text="Engine Resolution"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
<RECT pos="22 138 306 1" fill="solid: ff000000" hasStroke="0"/> <RECT pos="22 138 306 1" fill="solid: ff000000" hasStroke="0"/>
<RECT pos="22 194 306 1" fill="solid: ff000000" hasStroke="0"/> <RECT pos="22 195 306 1" fill="solid: ff000000" hasStroke="0"/>
<TEXT pos="19 101 276 23" fill="solid: ffffffff" hasStroke="0" text="Show Keyboard" <TEXT pos="20 96 276 23" fill="solid: ffffffff" hasStroke="0" text="Show Keyboard"
fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/> fontname="Default font" fontsize="15" bold="0" italic="0" justification="33"/>
</BACKGROUND> </BACKGROUND>
<SLIDER name="pitchRange" id="7409be5a8dfaa91" memberName="pitchRange" <SLIDER name="pitchRange" id="7409be5a8dfaa91" memberName="pitchRange"
@ -330,7 +330,7 @@ BEGIN_JUCER_METADATA
style="RotaryVerticalDrag" textBoxPos="TextBoxLeft" textBoxEditable="1" style="RotaryVerticalDrag" textBoxPos="TextBoxLeft" textBoxEditable="1"
textBoxWidth="80" textBoxHeight="20" skewFactor="1"/> textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<COMBOBOX name="new combo box" id="4087ff978c3d9e8d" memberName="engineReso" <COMBOBOX name="new combo box" id="4087ff978c3d9e8d" memberName="engineReso"
virtualName="" explicitFocusOrder="0" pos="160 152 168 24" editable="0" virtualName="" explicitFocusOrder="0" pos="160 156 168 24" editable="0"
layout="33" items="Modern (Direct)&#10;Mark I&#10;OPL Series" layout="33" items="Modern (Direct)&#10;Mark I&#10;OPL Series"
textWhenNonSelected="" textWhenNoItems="(no choices)"/> textWhenNonSelected="" textWhenNoItems="(no choices)"/>
<TOGGLEBUTTON name="showKeyboard" id="c963d2cb8e49ffd7" memberName="showKeyboard" <TOGGLEBUTTON name="showKeyboard" id="c963d2cb8e49ffd7" memberName="showKeyboard"

Write Preview
Loading…
Cancel
Save