/[svn]/gigedit/trunk/src/gigedit/dimregionedit.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/dimregionedit.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3202 by persson, Mon May 22 18:58:46 2017 UTC revision 3329 by schoenebeck, Sun Jul 23 18:31:53 2017 UTC
# Line 147  void CrossfadeCurve::draw_one_curve(cons Line 147  void CrossfadeCurve::draw_one_curve(cons
147  }  }
148    
149    
150    EGStateOptions::EGStateOptions() : HBox(),
151        label(_("May be cancelled: ")),
152        checkBoxAttack(_("Attack")),
153        checkBoxAttackHold(_("Attack Hold")),
154        checkBoxDecay1(_("Decay 1")),
155        checkBoxDecay2(_("Decay 2")),
156        checkBoxRelease(_("Release"))
157    {
158        set_spacing(6);
159    
160        pack_start(label);
161        pack_start(checkBoxAttack, Gtk::PACK_SHRINK);
162        pack_start(checkBoxAttackHold, Gtk::PACK_SHRINK);
163        pack_start(checkBoxDecay1, Gtk::PACK_SHRINK);
164        pack_start(checkBoxDecay2, Gtk::PACK_SHRINK);
165        pack_start(checkBoxRelease, Gtk::PACK_SHRINK);
166    
167        checkBoxAttack.set_tooltip_text(_(
168            "If checked: a note-off aborts the 'attack' stage."
169        ));
170        checkBoxAttackHold.set_tooltip_text(_(
171            "If checked: a note-off aborts the 'attack hold' stage."
172        ));
173        checkBoxDecay1.set_tooltip_text(_(
174            "If checked: a note-off aborts the 'decay 1' stage."
175        ));
176        checkBoxDecay2.set_tooltip_text(_(
177            "If checked: a note-off aborts the 'decay 2' stage."
178        ));
179        checkBoxRelease.set_tooltip_text(_(
180            "If checked: a note-on reverts back from the 'release' stage."
181        ));
182    }
183    
184    
185  DimRegionEdit::DimRegionEdit() :  DimRegionEdit::DimRegionEdit() :
186      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),
187      release_curve(&gig::DimensionRegion::GetVelocityRelease),      release_curve(&gig::DimensionRegion::GetVelocityRelease),
# Line 266  DimRegionEdit::DimRegionEdit() : Line 301  DimRegionEdit::DimRegionEdit() :
301              &gig::DimensionRegion::EG1ControllerDecayInfluence);              &gig::DimensionRegion::EG1ControllerDecayInfluence);
302      connect(eEG1ControllerReleaseInfluence,      connect(eEG1ControllerReleaseInfluence,
303              &gig::DimensionRegion::EG1ControllerReleaseInfluence);              &gig::DimensionRegion::EG1ControllerReleaseInfluence);
304        {
305            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.AttackCancel));
306            connect(eEG1StateOptions.checkBoxAttack, mp.pmember);
307        }
308        {
309            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.AttackHoldCancel));
310            connect(eEG1StateOptions.checkBoxAttackHold, mp.pmember);
311        }
312        {
313            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.Decay1Cancel));
314            connect(eEG1StateOptions.checkBoxDecay1, mp.pmember);
315        }
316        {
317            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.Decay2Cancel));
318            connect(eEG1StateOptions.checkBoxDecay2, mp.pmember);
319        }
320        {
321            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.ReleaseCancel));
322            connect(eEG1StateOptions.checkBoxRelease, mp.pmember);
323        }
324      connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency);      connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency);
325      connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth);      connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth);
326      connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth);      connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth);
# Line 287  DimRegionEdit::DimRegionEdit() : Line 342  DimRegionEdit::DimRegionEdit() :
342              &gig::DimensionRegion::EG2ControllerDecayInfluence);              &gig::DimensionRegion::EG2ControllerDecayInfluence);
343      connect(eEG2ControllerReleaseInfluence,      connect(eEG2ControllerReleaseInfluence,
344              &gig::DimensionRegion::EG2ControllerReleaseInfluence);              &gig::DimensionRegion::EG2ControllerReleaseInfluence);
345        {
346            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.AttackCancel));
347            connect(eEG2StateOptions.checkBoxAttack, mp.pmember);
348        }
349        {
350            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.AttackHoldCancel));
351            connect(eEG2StateOptions.checkBoxAttackHold, mp.pmember);
352        }
353        {
354            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.Decay1Cancel));
355            connect(eEG2StateOptions.checkBoxDecay1, mp.pmember);
356        }
357        {
358            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.Decay2Cancel));
359            connect(eEG2StateOptions.checkBoxDecay2, mp.pmember);
360        }
361        {
362            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.ReleaseCancel));
363            connect(eEG2StateOptions.checkBoxRelease, mp.pmember);
364        }
365      connect(eLFO2Frequency, &gig::DimensionRegion::LFO2Frequency);      connect(eLFO2Frequency, &gig::DimensionRegion::LFO2Frequency);
366      connect(eLFO2InternalDepth, &gig::DimensionRegion::LFO2InternalDepth);      connect(eLFO2InternalDepth, &gig::DimensionRegion::LFO2InternalDepth);
367      connect(eLFO2ControlDepth, &gig::DimensionRegion::LFO2ControlDepth);      connect(eLFO2ControlDepth, &gig::DimensionRegion::LFO2ControlDepth);
# Line 514  DimRegionEdit::DimRegionEdit() : Line 589  DimRegionEdit::DimRegionEdit() :
589      addProp(eEG1ControllerAttackInfluence);      addProp(eEG1ControllerAttackInfluence);
590      addProp(eEG1ControllerDecayInfluence);      addProp(eEG1ControllerDecayInfluence);
591      addProp(eEG1ControllerReleaseInfluence);      addProp(eEG1ControllerReleaseInfluence);
592        addLine(eEG1StateOptions);
593    
594      nextPage();      nextPage();
595    
# Line 659  DimRegionEdit::DimRegionEdit() : Line 735  DimRegionEdit::DimRegionEdit() :
735      addProp(eEG2ControllerAttackInfluence);      addProp(eEG2ControllerAttackInfluence);
736      addProp(eEG2ControllerDecayInfluence);      addProp(eEG2ControllerDecayInfluence);
737      addProp(eEG2ControllerReleaseInfluence);      addProp(eEG2ControllerReleaseInfluence);
738        addLine(eEG2StateOptions);
739      lLFO2 = addHeader(_("Filter Cutoff Oscillator (LFO2)"));      lLFO2 = addHeader(_("Filter Cutoff Oscillator (LFO2)"));
740      addProp(eLFO2Frequency);      addProp(eLFO2Frequency);
741      addProp(eLFO2InternalDepth);      addProp(eLFO2InternalDepth);
# Line 927  void DimRegionEdit::addProp(LabelWidget& Line 1004  void DimRegionEdit::addProp(LabelWidget&
1004      rowno++;      rowno++;
1005  }  }
1006    
1007    void DimRegionEdit::addLine(Gtk::HBox& line)
1008    {
1009        table[pageno]->attach(line, 1, 3, rowno, rowno + 1,
1010                              Gtk::FILL, Gtk::SHRINK);
1011        rowno++;
1012    }
1013    
1014  void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)  void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)
1015  {  {
1016      table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,      table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,
# Line 959  void DimRegionEdit::set_dim_region(gig:: Line 1043  void DimRegionEdit::set_dim_region(gig::
1043      eEG1ControllerAttackInfluence.set_value(d->EG1ControllerAttackInfluence);      eEG1ControllerAttackInfluence.set_value(d->EG1ControllerAttackInfluence);
1044      eEG1ControllerDecayInfluence.set_value(d->EG1ControllerDecayInfluence);      eEG1ControllerDecayInfluence.set_value(d->EG1ControllerDecayInfluence);
1045      eEG1ControllerReleaseInfluence.set_value(d->EG1ControllerReleaseInfluence);      eEG1ControllerReleaseInfluence.set_value(d->EG1ControllerReleaseInfluence);
1046        eEG1StateOptions.checkBoxAttack.set_value(d->EG1Options.AttackCancel);
1047        eEG1StateOptions.checkBoxAttackHold.set_value(d->EG1Options.AttackHoldCancel);
1048        eEG1StateOptions.checkBoxDecay1.set_value(d->EG1Options.Decay1Cancel);
1049        eEG1StateOptions.checkBoxDecay2.set_value(d->EG1Options.Decay2Cancel);
1050        eEG1StateOptions.checkBoxRelease.set_value(d->EG1Options.ReleaseCancel);
1051      eLFO1Frequency.set_value(d->LFO1Frequency);      eLFO1Frequency.set_value(d->LFO1Frequency);
1052      eLFO1InternalDepth.set_value(d->LFO1InternalDepth);      eLFO1InternalDepth.set_value(d->LFO1InternalDepth);
1053      eLFO1ControlDepth.set_value(d->LFO1ControlDepth);      eLFO1ControlDepth.set_value(d->LFO1ControlDepth);
# Line 977  void DimRegionEdit::set_dim_region(gig:: Line 1066  void DimRegionEdit::set_dim_region(gig::
1066      eEG2ControllerAttackInfluence.set_value(d->EG2ControllerAttackInfluence);      eEG2ControllerAttackInfluence.set_value(d->EG2ControllerAttackInfluence);
1067      eEG2ControllerDecayInfluence.set_value(d->EG2ControllerDecayInfluence);      eEG2ControllerDecayInfluence.set_value(d->EG2ControllerDecayInfluence);
1068      eEG2ControllerReleaseInfluence.set_value(d->EG2ControllerReleaseInfluence);      eEG2ControllerReleaseInfluence.set_value(d->EG2ControllerReleaseInfluence);
1069        eEG2StateOptions.checkBoxAttack.set_value(d->EG2Options.AttackCancel);
1070        eEG2StateOptions.checkBoxAttackHold.set_value(d->EG2Options.AttackHoldCancel);
1071        eEG2StateOptions.checkBoxDecay1.set_value(d->EG2Options.Decay1Cancel);
1072        eEG2StateOptions.checkBoxDecay2.set_value(d->EG2Options.Decay2Cancel);
1073        eEG2StateOptions.checkBoxRelease.set_value(d->EG2Options.ReleaseCancel);
1074      eLFO2Frequency.set_value(d->LFO2Frequency);      eLFO2Frequency.set_value(d->LFO2Frequency);
1075      eLFO2InternalDepth.set_value(d->LFO2InternalDepth);      eLFO2InternalDepth.set_value(d->LFO2InternalDepth);
1076      eLFO2ControlDepth.set_value(d->LFO2ControlDepth);      eLFO2ControlDepth.set_value(d->LFO2ControlDepth);
# Line 1122  void DimRegionEdit::VCFEnabled_toggled() Line 1216  void DimRegionEdit::VCFEnabled_toggled()
1216      eEG2ControllerAttackInfluence.set_sensitive(sensitive);      eEG2ControllerAttackInfluence.set_sensitive(sensitive);
1217      eEG2ControllerDecayInfluence.set_sensitive(sensitive);      eEG2ControllerDecayInfluence.set_sensitive(sensitive);
1218      eEG2ControllerReleaseInfluence.set_sensitive(sensitive);      eEG2ControllerReleaseInfluence.set_sensitive(sensitive);
1219        eEG2StateOptions.set_sensitive(sensitive);
1220      lLFO2->set_sensitive(sensitive);      lLFO2->set_sensitive(sensitive);
1221      eLFO2Frequency.set_sensitive(sensitive);      eLFO2Frequency.set_sensitive(sensitive);
1222      eLFO2InternalDepth.set_sensitive(sensitive);      eLFO2InternalDepth.set_sensitive(sensitive);
Legend:
Removed from v.3202  
changed lines
  Added in v.3329
  ViewVC Help
Powered by ViewVC