/[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 2430 by persson, Sun Mar 3 17:26:11 2013 UTC revision 3449 by schoenebeck, Sun Dec 23 23:06:56 2018 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2013 Andreas Persson   * Copyright (C) 2006-2017 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 17  Line 17 
17   * 02110-1301 USA.   * 02110-1301 USA.
18   */   */
19    
20    #include "global.h"
21  #include "dimregionedit.h"  #include "dimregionedit.h"
22    
 #include "global.h"  
23  #include "compat.h"  #include "compat.h"
24    
25    #if USE_GTKMM_GRID
26    # include <gtkmm/grid.h>
27    #else
28    # include <gtkmm/table.h>
29    #endif
30    
31    #include "Settings.h"
32    
33  VelocityCurve::VelocityCurve(double (gig::DimensionRegion::*getter)(uint8_t)) :  VelocityCurve::VelocityCurve(double (gig::DimensionRegion::*getter)(uint8_t)) :
34      getter(getter), dimreg(0) {      getter(getter), dimreg(0) {
35      set_size_request(80, 80);      set_size_request(80, 80);
# Line 94  bool CrossfadeCurve::on_draw(const Cairo Line 102  bool CrossfadeCurve::on_draw(const Cairo
102              }              }
103          }          }
104          int bitcount = 0;          int bitcount = 0;
         int layer_bit = 0;  
105          for (int dim = 0 ; dim < region->Dimensions ; dim++) {          for (int dim = 0 ; dim < region->Dimensions ; dim++) {
106              if (region->pDimensionDefinitions[dim].dimension ==              if (region->pDimensionDefinitions[dim].dimension ==
107                  gig::dimension_layer) {                  gig::dimension_layer) {
                 layer_bit = 1 << bitcount;  
   
108                  int mask =                  int mask =
109                      ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<                      ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<
110                        bitcount);                        bitcount);
# Line 150  void CrossfadeCurve::draw_one_curve(cons Line 155  void CrossfadeCurve::draw_one_curve(cons
155  }  }
156    
157    
158    EGStateOptions::EGStateOptions() : HBox(),
159        label(_("May be cancelled: ")),
160        checkBoxAttack(_("Attack")),
161        checkBoxAttackHold(_("Attack Hold")),
162        checkBoxDecay1(_("Decay 1")),
163        checkBoxDecay2(_("Decay 2")),
164        checkBoxRelease(_("Release"))
165    {
166        set_spacing(6);
167    
168        pack_start(label);
169        pack_start(checkBoxAttack, Gtk::PACK_SHRINK);
170        pack_start(checkBoxAttackHold, Gtk::PACK_SHRINK);
171        pack_start(checkBoxDecay1, Gtk::PACK_SHRINK);
172        pack_start(checkBoxDecay2, Gtk::PACK_SHRINK);
173        pack_start(checkBoxRelease, Gtk::PACK_SHRINK);
174    
175        checkBoxAttack.set_tooltip_text(_(
176            "If checked: a note-off aborts the 'attack' stage."
177        ));
178        checkBoxAttackHold.set_tooltip_text(_(
179            "If checked: a note-off aborts the 'attack hold' stage."
180        ));
181        checkBoxDecay1.set_tooltip_text(_(
182            "If checked: a note-off aborts the 'decay 1' stage."
183        ));
184        checkBoxDecay2.set_tooltip_text(_(
185            "If checked: a note-off aborts the 'decay 2' stage."
186        ));
187        checkBoxRelease.set_tooltip_text(_(
188            "If checked: a note-on reverts back from the 'release' stage."
189        ));
190    }
191    
192    void EGStateOptions::on_show_tooltips_changed() {
193        const bool b = Settings::singleton()->showTooltips;
194    
195        checkBoxAttack.set_has_tooltip(b);
196        checkBoxAttackHold.set_has_tooltip(b);
197        checkBoxDecay1.set_has_tooltip(b);
198        checkBoxDecay2.set_has_tooltip(b);
199        checkBoxRelease.set_has_tooltip(b);
200    }
201    
202    
203  DimRegionEdit::DimRegionEdit() :  DimRegionEdit::DimRegionEdit() :
204      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),
205      release_curve(&gig::DimensionRegion::GetVelocityRelease),      release_curve(&gig::DimensionRegion::GetVelocityRelease),
206      cutoff_curve(&gig::DimensionRegion::GetVelocityCutoff),      cutoff_curve(&gig::DimensionRegion::GetVelocityCutoff),
207      eEG1PreAttack(_("Pre-attack"), 0, 100, 2),      eEG1PreAttack(_("Pre-attack Level (%)"), 0, 100, 2),
208      eEG1Attack(_("Attack"), 0, 60, 3),      eEG1Attack(_("Attack Time (seconds)"), 0, 60, 3),
209      eEG1Decay1(_("Decay 1"), 0.005, 60, 3),      eEG1Decay1(_("Decay 1 Time (seconds)"), 0.005, 60, 3),
210      eEG1Decay2(_("Decay 2"), 0, 60, 3),      eEG1Decay2(_("Decay 2 Time (seconds)"), 0, 60, 3),
211      eEG1InfiniteSustain(_("Infinite sustain")),      eEG1InfiniteSustain(_("Infinite sustain")),
212      eEG1Sustain(_("Sustain"), 0, 100, 2),      eEG1Sustain(_("Sustain Level (%)"), 0, 100, 2),
213      eEG1Release(_("Release"), 0, 60, 3),      eEG1Release(_("Release Time (seconds)"), 0, 60, 3),
214      eEG1Hold(_("Hold")),      eEG1Hold(_("Hold Attack Stage until Loop End")),
215      eEG1Controller(_("Controller")),      eEG1Controller(_("Controller")),
216      eEG1ControllerInvert(_("Controller invert")),      eEG1ControllerInvert(_("Controller invert")),
217      eEG1ControllerAttackInfluence(_("Controller attack influence"), 0, 3),      eEG1ControllerAttackInfluence(_("Controller attack influence"), 0, 3),
# Line 173  DimRegionEdit::DimRegionEdit() : Line 223  DimRegionEdit::DimRegionEdit() :
223      eLFO1Controller(_("Controller")),      eLFO1Controller(_("Controller")),
224      eLFO1FlipPhase(_("Flip phase")),      eLFO1FlipPhase(_("Flip phase")),
225      eLFO1Sync(_("Sync")),      eLFO1Sync(_("Sync")),
226      eEG2PreAttack(_("Pre-attack"), 0, 100, 2),      eEG2PreAttack(_("Pre-attack Level (%)"), 0, 100, 2),
227      eEG2Attack(_("Attack"), 0, 60, 3),      eEG2Attack(_("Attack Time (seconds)"), 0, 60, 3),
228      eEG2Decay1(_("Decay 1"), 0.005, 60, 3),      eEG2Decay1(_("Decay 1 Time (seconds)"), 0.005, 60, 3),
229      eEG2Decay2(_("Decay 2"), 0, 60, 3),      eEG2Decay2(_("Decay 2 Time (seconds)"), 0, 60, 3),
230      eEG2InfiniteSustain(_("Infinite sustain")),      eEG2InfiniteSustain(_("Infinite sustain")),
231      eEG2Sustain(_("Sustain"), 0, 100, 2),      eEG2Sustain(_("Sustain Level (%)"), 0, 100, 2),
232      eEG2Release(_("Release"), 0, 60, 3),      eEG2Release(_("Release Time (seconds)"), 0, 60, 3),
233      eEG2Controller(_("Controller")),      eEG2Controller(_("Controller")),
234      eEG2ControllerInvert(_("Controller invert")),      eEG2ControllerInvert(_("Controller invert")),
235      eEG2ControllerAttackInfluence(_("Controller attack influence"), 0, 3),      eEG2ControllerAttackInfluence(_("Controller attack influence"), 0, 3),
# Line 222  DimRegionEdit::DimRegionEdit() : Line 272  DimRegionEdit::DimRegionEdit() :
272      eCrossfade_out_start(_("Crossfade-out start")),      eCrossfade_out_start(_("Crossfade-out start")),
273      eCrossfade_out_end(_("Crossfade-out end")),      eCrossfade_out_end(_("Crossfade-out end")),
274      ePitchTrack(_("Pitch track")),      ePitchTrack(_("Pitch track")),
275        eSustainReleaseTrigger(_("Sustain Release Trigger")),
276        eNoNoteOffReleaseTrigger(_("No note-off release trigger")),
277      eDimensionBypass(_("Dimension bypass")),      eDimensionBypass(_("Dimension bypass")),
278      ePan(_("Pan"), -64, 63),      ePan(_("Pan"), -64, 63),
279      eSelfMask(_("Self mask")),      eSelfMask(_("Kill lower velocity voices (a.k.a \"Self mask\")")),
280      eAttenuationController(_("Attenuation controller")),      eAttenuationController(_("Attenuation controller")),
281      eInvertAttenuationController(_("Invert attenuation controller")),      eInvertAttenuationController(_("Invert attenuation controller")),
282      eAttenuationControllerThreshold(_("Attenuation controller threshold")),      eAttenuationControllerThreshold(_("Attenuation controller threshold")),
283      eChannelOffset(_("Channel offset"), 0, 9),      eChannelOffset(_("Channel offset"), 0, 9),
284      eSustainDefeat(_("Sustain defeat")),      eSustainDefeat(_("Ignore Hold Pedal (a.k.a. \"Sustain defeat\")")),
285      eMSDecode(_("MS decode")),      eMSDecode(_("Decode Mid/Side Recordings")),
286      eSampleStartOffset(_("Sample start offset"), 0, 2000),      eSampleStartOffset(_("Sample start offset"), 0, 2000),
287      eUnityNote(_("Unity note")),      eUnityNote(_("Unity note")),
288        eSampleGroup(_("Sample Group")),
289        eSampleFormatInfo(_("Sample Format")),
290        eSampleID("Sample ID"),
291        eChecksum("Wave Data CRC-32"),
292      eFineTune(_("Fine tune"), -49, 50),      eFineTune(_("Fine tune"), -49, 50),
293      eGain(_("Gain"), -96, 0, 2, -655360),      eGain(_("Gain"), -96, 0, 2, -655360),
294      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),
295      eSampleLoopEnabled(_("Enabled")),      eSampleLoopEnabled(_("Enabled")),
296      eSampleLoopStart(_("Loop start positon")),      eSampleLoopStart(_("Loop start position")),
297      eSampleLoopLength(_("Loop size")),      eSampleLoopLength(_("Loop size")),
298      eSampleLoopType(_("Loop type")),      eSampleLoopType(_("Loop type")),
299      eSampleLoopInfinite(_("Infinite loop")),      eSampleLoopInfinite(_("Infinite loop")),
300      eSampleLoopPlayCount(_("Playback count"), 1),      eSampleLoopPlayCount(_("Playback count"), 1),
301        buttonSelectSample(UNICODE_LEFT_ARROW + "  " + _("Select Sample")),
302      update_model(0)      update_model(0)
303  {  {
304        // make synthesis parameter page tabs scrollable
305        // (workaround for GTK3: default theme uses huge tabs which breaks layout)
306        set_scrollable();
307    
308      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);
309      connect(eEG1Attack, &gig::DimensionRegion::EG1Attack);      connect(eEG1Attack, &gig::DimensionRegion::EG1Attack);
310      connect(eEG1Decay1, &gig::DimensionRegion::EG1Decay1);      connect(eEG1Decay1, &gig::DimensionRegion::EG1Decay1);
# Line 260  DimRegionEdit::DimRegionEdit() : Line 321  DimRegionEdit::DimRegionEdit() :
321              &gig::DimensionRegion::EG1ControllerDecayInfluence);              &gig::DimensionRegion::EG1ControllerDecayInfluence);
322      connect(eEG1ControllerReleaseInfluence,      connect(eEG1ControllerReleaseInfluence,
323              &gig::DimensionRegion::EG1ControllerReleaseInfluence);              &gig::DimensionRegion::EG1ControllerReleaseInfluence);
324        {
325            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.AttackCancel));
326            connect(eEG1StateOptions.checkBoxAttack, mp.pmember);
327        }
328        {
329            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.AttackHoldCancel));
330            connect(eEG1StateOptions.checkBoxAttackHold, mp.pmember);
331        }
332        {
333            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.Decay1Cancel));
334            connect(eEG1StateOptions.checkBoxDecay1, mp.pmember);
335        }
336        {
337            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.Decay2Cancel));
338            connect(eEG1StateOptions.checkBoxDecay2, mp.pmember);
339        }
340        {
341            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.ReleaseCancel));
342            connect(eEG1StateOptions.checkBoxRelease, mp.pmember);
343        }
344      connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency);      connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency);
345      connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth);      connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth);
346      connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth);      connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth);
# Line 281  DimRegionEdit::DimRegionEdit() : Line 362  DimRegionEdit::DimRegionEdit() :
362              &gig::DimensionRegion::EG2ControllerDecayInfluence);              &gig::DimensionRegion::EG2ControllerDecayInfluence);
363      connect(eEG2ControllerReleaseInfluence,      connect(eEG2ControllerReleaseInfluence,
364              &gig::DimensionRegion::EG2ControllerReleaseInfluence);              &gig::DimensionRegion::EG2ControllerReleaseInfluence);
365        {
366            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.AttackCancel));
367            connect(eEG2StateOptions.checkBoxAttack, mp.pmember);
368        }
369        {
370            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.AttackHoldCancel));
371            connect(eEG2StateOptions.checkBoxAttackHold, mp.pmember);
372        }
373        {
374            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.Decay1Cancel));
375            connect(eEG2StateOptions.checkBoxDecay1, mp.pmember);
376        }
377        {
378            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.Decay2Cancel));
379            connect(eEG2StateOptions.checkBoxDecay2, mp.pmember);
380        }
381        {
382            ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.ReleaseCancel));
383            connect(eEG2StateOptions.checkBoxRelease, mp.pmember);
384        }
385      connect(eLFO2Frequency, &gig::DimensionRegion::LFO2Frequency);      connect(eLFO2Frequency, &gig::DimensionRegion::LFO2Frequency);
386      connect(eLFO2InternalDepth, &gig::DimensionRegion::LFO2InternalDepth);      connect(eLFO2InternalDepth, &gig::DimensionRegion::LFO2InternalDepth);
387      connect(eLFO2ControlDepth, &gig::DimensionRegion::LFO2ControlDepth);      connect(eLFO2ControlDepth, &gig::DimensionRegion::LFO2ControlDepth);
# Line 328  DimRegionEdit::DimRegionEdit() : Line 429  DimRegionEdit::DimRegionEdit() :
429      connect(eCrossfade_out_start, &DimRegionEdit::set_Crossfade_out_start);      connect(eCrossfade_out_start, &DimRegionEdit::set_Crossfade_out_start);
430      connect(eCrossfade_out_end, &DimRegionEdit::set_Crossfade_out_end);      connect(eCrossfade_out_end, &DimRegionEdit::set_Crossfade_out_end);
431      connect(ePitchTrack, &gig::DimensionRegion::PitchTrack);      connect(ePitchTrack, &gig::DimensionRegion::PitchTrack);
432        connect(eSustainReleaseTrigger, &gig::DimensionRegion::SustainReleaseTrigger);
433        connect(eNoNoteOffReleaseTrigger, &gig::DimensionRegion::NoNoteOffReleaseTrigger);
434      connect(eDimensionBypass, &gig::DimensionRegion::DimensionBypass);      connect(eDimensionBypass, &gig::DimensionRegion::DimensionBypass);
435      connect(ePan, &gig::DimensionRegion::Pan);      connect(ePan, &gig::DimensionRegion::Pan);
436      connect(eSelfMask, &gig::DimensionRegion::SelfMask);      connect(eSelfMask, &gig::DimensionRegion::SelfMask);
# Line 351  DimRegionEdit::DimRegionEdit() : Line 454  DimRegionEdit::DimRegionEdit() :
454      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);
455      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);
456      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);
457        buttonSelectSample.signal_clicked().connect(
458            sigc::mem_fun(*this, &DimRegionEdit::onButtonSelectSamplePressed)
459        );
460    
461      for (int i = 0 ; i < 7 ; i++) {      for (int i = 0 ; i < 7 ; i++) {
462    #if USE_GTKMM_GRID
463            table[i] = new Gtk::Grid;
464            table[i]->set_column_spacing(7);
465    #else
466          table[i] = new Gtk::Table(3, 1);          table[i] = new Gtk::Table(3, 1);
467          table[i]->set_col_spacings(7);          table[i]->set_col_spacings(7);
468    #endif
469    
470    // on Gtk 3 there is absolutely no margin by default
471    #if GTKMM_MAJOR_VERSION >= 3
472    # if GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 12
473            table[i]->set_margin_left(12);
474            table[i]->set_margin_right(12);
475    # else
476            table[i]->set_margin_start(12);
477            table[i]->set_margin_end(12);
478    # endif
479    #endif
480      }      }
481    
482      // set tooltips      // set tooltips
483      eUnityNote.set_tip(      eUnityNote.set_tip(
484          _("Note this sample is associated with (a.k.a. 'root note')")          _("Note this sample is associated with (a.k.a. 'root note')")
485      );      );
486        buttonSelectSample.set_tooltip_text(
487            _("Selects the sample of this dimension region on the left hand side's sample tree view.")
488        );
489      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));
490      ePan.set_tip(_("Stereo balance (left/right)"));      ePan.set_tip(_("Stereo balance (left/right)"));
491      eChannelOffset.set_tip(      eChannelOffset.set_tip(
# Line 391  DimRegionEdit::DimRegionEdit() : Line 516  DimRegionEdit::DimRegionEdit() :
516            "Caution: this setting is stored on Sample side, thus is shared "            "Caution: this setting is stored on Sample side, thus is shared "
517            "among all dimension regions that use this sample!")            "among all dimension regions that use this sample!")
518      );      );
519        
520        eEG1PreAttack.set_tip(
521            "Very first level this EG starts with. It rises then in Attack Time "
522            "seconds from this initial level to 100%."
523        );
524        eEG1Attack.set_tip(
525            "Duration of the EG's Attack stage, which raises its level from "
526            "Pre-Attack Level to 100%."
527        );
528        eEG1Hold.set_tip(
529           "On looped sounds, enabling this will cause the Decay 1 stage not to "
530           "enter before the loop has been passed one time."
531        );
532        eAttenuationController.set_tip(_(
533            "If you are not using the 'Layer' dimension, then this controller "
534            "simply alters the volume. If you are using the 'Layer' dimension, "
535            "then this controller is controlling the crossfade between Layers in "
536            "real-time."
537        ));
538    
539        eLFO1Sync.set_tip(
540            "If not checked, every voice will use its own LFO instance, which "
541            "causes voices triggered at different points in time to have different "
542            "LFO levels. By enabling 'Sync' here the voices will instead use and "
543            "share one single LFO, causing all voices to have the same LFO level, "
544            "no matter when the individual notes have been triggered."
545        );
546        eLFO2Sync.set_tip(
547            "If not checked, every voice will use its own LFO instance, which "
548            "causes voices triggered at different points in time to have different "
549            "LFO levels. By enabling 'Sync' here the voices will instead use and "
550            "share one single LFO, causing all voices to have the same LFO level, "
551            "no matter when the individual notes have been triggered."
552        );
553        eLFO3Sync.set_tip(
554            "If not checked, every voice will use its own LFO instance, which "
555            "causes voices triggered at different points in time to have different "
556            "LFO levels. By enabling 'Sync' here the voices will instead use and "
557            "share one single LFO, causing all voices to have the same LFO level, "
558            "no matter when the individual notes have been triggered."
559        );
560        eLFO1FlipPhase.set_tip(
561           "Inverts the LFO's generated wave vertically."
562        );
563        eLFO2FlipPhase.set_tip(
564           "Inverts the LFO's generated wave vertically."
565        );
566    
567      pageno = 0;      pageno = 0;
568      rowno = 0;      rowno = 0;
569      firstRowInBlock = 0;      firstRowInBlock = 0;
570    
571      addHeader(_("Mandatory Settings"));      addHeader(_("Mandatory Settings"));
572      addString(_("Sample"), lSample, wSample);      addString(_("Sample"), lSample, wSample, buttonNullSampleReference);
573        buttonNullSampleReference->set_label("X");
574        buttonNullSampleReference->set_tooltip_text(_("Remove current sample reference (NULL reference). This can be used to define a \"silent\" case where no sample shall be played."));
575        buttonNullSampleReference->signal_clicked().connect(
576            sigc::mem_fun(*this, &DimRegionEdit::nullOutSampleReference)
577        );
578      //TODO: the following would break drag&drop:   wSample->property_editable().set_value(false);  or this:    wSample->set_editable(false);      //TODO: the following would break drag&drop:   wSample->property_editable().set_value(false);  or this:    wSample->set_editable(false);
579  #ifdef OLD_TOOLTIPS  #ifdef OLD_TOOLTIPS
580      tooltips.set_tip(*wSample, _("Drop a sample here"));      tooltips.set_tip(*wSample, _("Drag & drop a sample here"));
581  #else  #else
582      wSample->set_tooltip_text(_("Drop a sample here"));      wSample->set_tooltip_text(_("Drag & drop a sample here"));
583  #endif  #endif
584      addProp(eUnityNote);      addProp(eUnityNote);
585        addProp(eSampleGroup);
586        addProp(eSampleFormatInfo);
587        addProp(eSampleID);
588        addProp(eChecksum);
589        addRightHandSide(buttonSelectSample);
590      addHeader(_("Optional Settings"));      addHeader(_("Optional Settings"));
591      addProp(eSampleStartOffset);      addProp(eSampleStartOffset);
592      addProp(eChannelOffset);      addProp(eChannelOffset);
# Line 434  DimRegionEdit::DimRegionEdit() : Line 616  DimRegionEdit::DimRegionEdit() :
616      addHeader(_("Amplitude Envelope (EG1)"));      addHeader(_("Amplitude Envelope (EG1)"));
617      addProp(eEG1PreAttack);      addProp(eEG1PreAttack);
618      addProp(eEG1Attack);      addProp(eEG1Attack);
619        addProp(eEG1Hold);
620      addProp(eEG1Decay1);      addProp(eEG1Decay1);
621      addProp(eEG1Decay2);      addProp(eEG1Decay2);
622      addProp(eEG1InfiniteSustain);      addProp(eEG1InfiniteSustain);
623      addProp(eEG1Sustain);      addProp(eEG1Sustain);
624      addProp(eEG1Release);      addProp(eEG1Release);
     addProp(eEG1Hold);  
625      addProp(eEG1Controller);      addProp(eEG1Controller);
626      addProp(eEG1ControllerInvert);      addProp(eEG1ControllerInvert);
627      addProp(eEG1ControllerAttackInfluence);      addProp(eEG1ControllerAttackInfluence);
628      addProp(eEG1ControllerDecayInfluence);      addProp(eEG1ControllerDecayInfluence);
629      addProp(eEG1ControllerReleaseInfluence);      addProp(eEG1ControllerReleaseInfluence);
630        addLine(eEG1StateOptions);
631    
632      nextPage();      nextPage();
633    
# Line 478  DimRegionEdit::DimRegionEdit() : Line 661  DimRegionEdit::DimRegionEdit() :
661    
662      Gtk::Frame* frame = new Gtk::Frame;      Gtk::Frame* frame = new Gtk::Frame;
663      frame->add(crossfade_curve);      frame->add(crossfade_curve);
664        // on Gtk 3 there is no margin at all by default
665    #if GTKMM_MAJOR_VERSION >= 3
666        frame->set_margin_top(12);
667        frame->set_margin_bottom(12);
668    #endif
669    #if USE_GTKMM_GRID
670        table[pageno]->attach(*frame, 1, rowno, 2);
671    #else
672      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
673                            Gtk::SHRINK, Gtk::SHRINK);                            Gtk::SHRINK, Gtk::SHRINK);
674    #endif
675      rowno++;      rowno++;
676    
677      eCrossfade_in_start.signal_value_changed().connect(      eCrossfade_in_start.signal_value_changed().connect(
# Line 553  DimRegionEdit::DimRegionEdit() : Line 745  DimRegionEdit::DimRegionEdit() :
745    
746      frame = new Gtk::Frame;      frame = new Gtk::Frame;
747      frame->add(cutoff_curve);      frame->add(cutoff_curve);
748        // on Gtk 3 there is no margin at all by default
749    #if GTKMM_MAJOR_VERSION >= 3
750        frame->set_margin_top(12);
751        frame->set_margin_bottom(12);
752    #endif
753    #if USE_GTKMM_GRID
754        table[pageno]->attach(*frame, 1, rowno, 2);
755    #else
756      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
757                            Gtk::SHRINK, Gtk::SHRINK);                            Gtk::SHRINK, Gtk::SHRINK);
758    #endif
759      rowno++;      rowno++;
760    
761      addProp(eVCFResonance);      addProp(eVCFResonance);
# Line 590  DimRegionEdit::DimRegionEdit() : Line 791  DimRegionEdit::DimRegionEdit() :
791      addProp(eEG2ControllerAttackInfluence);      addProp(eEG2ControllerAttackInfluence);
792      addProp(eEG2ControllerDecayInfluence);      addProp(eEG2ControllerDecayInfluence);
793      addProp(eEG2ControllerReleaseInfluence);      addProp(eEG2ControllerReleaseInfluence);
794        addLine(eEG2StateOptions);
795      lLFO2 = addHeader(_("Filter Cutoff Oscillator (LFO2)"));      lLFO2 = addHeader(_("Filter Cutoff Oscillator (LFO2)"));
796      addProp(eLFO2Frequency);      addProp(eLFO2Frequency);
797      addProp(eLFO2InternalDepth);      addProp(eLFO2InternalDepth);
# Line 639  DimRegionEdit::DimRegionEdit() : Line 841  DimRegionEdit::DimRegionEdit() :
841    
842      nextPage();      nextPage();
843    
844      addHeader(_("Velocity Reponse"));      addHeader(_("Velocity Response"));
845      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);
846      addProp(eVelocityResponseCurve);      addProp(eVelocityResponseCurve);
847      addProp(eVelocityResponseDepth);      addProp(eVelocityResponseDepth);
# Line 654  DimRegionEdit::DimRegionEdit() : Line 856  DimRegionEdit::DimRegionEdit() :
856    
857      frame = new Gtk::Frame;      frame = new Gtk::Frame;
858      frame->add(velocity_curve);      frame->add(velocity_curve);
859        // on Gtk 3 there is no margin at all by default
860    #if GTKMM_MAJOR_VERSION >= 3
861        frame->set_margin_top(12);
862        frame->set_margin_bottom(12);
863    #endif
864    #if USE_GTKMM_GRID
865        table[pageno]->attach(*frame, 1, rowno, 2);
866    #else
867      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
868                            Gtk::SHRINK, Gtk::SHRINK);                            Gtk::SHRINK, Gtk::SHRINK);
869    #endif
870      rowno++;      rowno++;
871    
872      addHeader(_("Release Velocity Reponse"));      addHeader(_("Release Velocity Response"));
873      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,
874                                                curve_type_values);                                                curve_type_values);
875      addProp(eReleaseVelocityResponseCurve);      addProp(eReleaseVelocityResponseCurve);
# Line 670  DimRegionEdit::DimRegionEdit() : Line 881  DimRegionEdit::DimRegionEdit() :
881          sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));          sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
882      frame = new Gtk::Frame;      frame = new Gtk::Frame;
883      frame->add(release_curve);      frame->add(release_curve);
884        // on Gtk 3 there is no margin at all by default
885    #if GTKMM_MAJOR_VERSION >= 3
886        frame->set_margin_top(12);
887        frame->set_margin_bottom(12);
888    #endif
889    #if USE_GTKMM_GRID
890        table[pageno]->attach(*frame, 1, rowno, 2);
891    #else
892      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,      table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
893                            Gtk::SHRINK, Gtk::SHRINK);                            Gtk::SHRINK, Gtk::SHRINK);
894    #endif
895      rowno++;      rowno++;
896    
897      addProp(eReleaseTriggerDecay);      addProp(eReleaseTriggerDecay);
898      {      {
899            const char* choices[] = { _("off"), _("on (max. velocity)"), _("on (key velocity)"), 0 };
900            static const gig::sust_rel_trg_t values[] = {
901                gig::sust_rel_trg_none,
902                gig::sust_rel_trg_maxvelocity,
903                gig::sust_rel_trg_keyvelocity
904            };
905            eSustainReleaseTrigger.set_choices(choices, values);
906        }
907        eSustainReleaseTrigger.set_tip(_(
908            "By default release trigger samples are played on note-off events only. "
909            "This option allows to play release trigger sample on sustain pedal up "
910            "events as well. NOTE: This is a format extension!"
911        ));
912        addProp(eSustainReleaseTrigger);
913        {
914          const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 };          const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 };
915          static const gig::dim_bypass_ctrl_t values[] = {          static const gig::dim_bypass_ctrl_t values[] = {
916              gig::dim_bypass_ctrl_none,              gig::dim_bypass_ctrl_none,
# Line 684  DimRegionEdit::DimRegionEdit() : Line 919  DimRegionEdit::DimRegionEdit() :
919          };          };
920          eDimensionBypass.set_choices(choices, values);          eDimensionBypass.set_choices(choices, values);
921      }      }
922        eNoNoteOffReleaseTrigger.set_tip(_(
923            "By default release trigger samples are played on note-off events only. "
924            "If this option is checked, then no release trigger sample is played "
925            "when releasing a note. NOTE: This is a format extension!"
926        ));
927        addProp(eNoNoteOffReleaseTrigger);
928      addProp(eDimensionBypass);      addProp(eDimensionBypass);
929        eSelfMask.widget.set_tooltip_text(_(
930            "If enabled: new notes with higher velocity value will stop older "
931            "notes with lower velocity values, that way you can save voices that "
932            "would barely be audible. This is also useful for certain drum sounds."
933        ));
934      addProp(eSelfMask);      addProp(eSelfMask);
935        eSustainDefeat.widget.set_tooltip_text(_(
936            "If enabled: sustain pedal will not hold a note. This way you can use "
937            "the sustain pedal for other purposes, for example to switch among "
938            "dimension regions."
939        ));
940      addProp(eSustainDefeat);      addProp(eSustainDefeat);
941        eMSDecode.widget.set_tooltip_text(_(
942            "Defines if Mid/Side Recordings should be decoded. Mid/Side Recordings "
943            "are an alternative way to record sounds in stereo. The sampler needs "
944            "to decode such samples to actually make use of them. Note: this "
945            "feature is currently not supported by LinuxSampler."
946        ));
947      addProp(eMSDecode);      addProp(eMSDecode);
948    
949      nextPage();      nextPage();
# Line 740  DimRegionEdit::DimRegionEdit() : Line 997  DimRegionEdit::DimRegionEdit() :
997      append_page(*table[4], _("Filter (2)"));      append_page(*table[4], _("Filter (2)"));
998      append_page(*table[5], _("Pitch"));      append_page(*table[5], _("Pitch"));
999      append_page(*table[6], _("Misc"));      append_page(*table[6], _("Misc"));
1000    
1001        Settings::singleton()->showTooltips.get_proxy().signal_changed().connect(
1002            sigc::mem_fun(*this, &DimRegionEdit::on_show_tooltips_changed)
1003        );
1004    
1005        on_show_tooltips_changed();
1006  }  }
1007    
1008  DimRegionEdit::~DimRegionEdit()  DimRegionEdit::~DimRegionEdit()
# Line 750  void DimRegionEdit::addString(const char Line 1013  void DimRegionEdit::addString(const char
1013                                Gtk::Entry*& widget)                                Gtk::Entry*& widget)
1014  {  {
1015      label = new Gtk::Label(Glib::ustring(labelText) + ":");      label = new Gtk::Label(Glib::ustring(labelText) + ":");
1016    #if HAS_GTKMM_ALIGNMENT
1017      label->set_alignment(Gtk::ALIGN_START);      label->set_alignment(Gtk::ALIGN_START);
1018    #else
1019        label->set_halign(Gtk::Align::START);
1020    #endif
1021    
1022    #if USE_GTKMM_GRID
1023        table[pageno]->attach(*label, 1, rowno);
1024    #else
1025      table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,      table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,
1026                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
1027    #endif
1028    
1029      widget = new Gtk::Entry();      widget = new Gtk::Entry();
1030    
1031    #if USE_GTKMM_GRID
1032        table[pageno]->attach(*widget, 2, rowno);
1033    #else
1034      table[pageno]->attach(*widget, 2, 3, rowno, rowno + 1,      table[pageno]->attach(*widget, 2, 3, rowno, rowno + 1,
1035                            Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);                            Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
1036    #endif
1037    
1038        rowno++;
1039    }
1040    
1041    void DimRegionEdit::addString(const char* labelText, Gtk::Label*& label,
1042                                  Gtk::Entry*& widget, Gtk::Button*& button)
1043    {
1044        label = new Gtk::Label(Glib::ustring(labelText) + ":");
1045    #if HAS_GTKMM_ALIGNMENT
1046        label->set_alignment(Gtk::ALIGN_START);
1047    #else
1048        label->set_halign(Gtk::Align::START);
1049    #endif
1050    
1051    #if USE_GTKMM_GRID
1052        table[pageno]->attach(*label, 1, rowno);
1053    #else
1054        table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,
1055                              Gtk::FILL, Gtk::SHRINK);
1056    #endif
1057    
1058        widget = new Gtk::Entry();
1059        button = new Gtk::Button();
1060    
1061        HBox* hbox = new HBox;
1062        hbox->pack_start(*widget);
1063        hbox->pack_start(*button, Gtk::PACK_SHRINK);
1064    
1065    #if USE_GTKMM_GRID
1066        table[pageno]->attach(*hbox, 2, rowno);
1067    #else
1068        table[pageno]->attach(*hbox, 2, 3, rowno, rowno + 1,
1069                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
1070    #endif
1071    
1072      rowno++;      rowno++;
1073  }  }
# Line 768  Gtk::Label* DimRegionEdit::addHeader(con Line 1077  Gtk::Label* DimRegionEdit::addHeader(con
1077      if (firstRowInBlock < rowno - 1)      if (firstRowInBlock < rowno - 1)
1078      {      {
1079          Gtk::Label* filler = new Gtk::Label("    ");          Gtk::Label* filler = new Gtk::Label("    ");
1080    #if USE_GTKMM_GRID
1081            table[pageno]->attach(*filler, 0, firstRowInBlock);
1082    #else
1083          table[pageno]->attach(*filler, 0, 1, firstRowInBlock, rowno,          table[pageno]->attach(*filler, 0, 1, firstRowInBlock, rowno,
1084                                Gtk::FILL, Gtk::SHRINK);                                Gtk::FILL, Gtk::SHRINK);
1085    #endif
1086      }      }
1087      Glib::ustring str = "<b>";      Glib::ustring str = "<b>";
1088      str += text;      str += text;
1089      str += "</b>";      str += "</b>";
1090      Gtk::Label* label = new Gtk::Label(str);      Gtk::Label* label = new Gtk::Label(str);
1091      label->set_use_markup();      label->set_use_markup();
1092    #if HAS_GTKMM_ALIGNMENT
1093      label->set_alignment(Gtk::ALIGN_START);      label->set_alignment(Gtk::ALIGN_START);
1094    #else
1095        label->set_halign(Gtk::Align::START);
1096    #endif
1097        // on GTKMM 3 there is absolutely no margin by default
1098    #if GTKMM_MAJOR_VERSION >= 3
1099        label->set_margin_top(18);
1100        label->set_margin_bottom(13);
1101    #endif
1102    #if USE_GTKMM_GRID
1103        table[pageno]->attach(*label, 0, rowno, 3);
1104    #else
1105      table[pageno]->attach(*label, 0, 3, rowno, rowno + 1,      table[pageno]->attach(*label, 0, 3, rowno, rowno + 1,
1106                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
1107    #endif
1108      rowno++;      rowno++;
1109      firstRowInBlock = rowno;      firstRowInBlock = rowno;
1110      return label;      return label;
1111  }  }
1112    
1113    void DimRegionEdit::on_show_tooltips_changed() {
1114        const bool b = Settings::singleton()->showTooltips;
1115    
1116        buttonSelectSample.set_has_tooltip(b);
1117        buttonNullSampleReference->set_has_tooltip(b);
1118        wSample->set_has_tooltip(b);
1119    
1120        eEG1StateOptions.on_show_tooltips_changed();
1121        eEG2StateOptions.on_show_tooltips_changed();
1122    
1123        set_has_tooltip(b);
1124    }
1125    
1126  void DimRegionEdit::nextPage()  void DimRegionEdit::nextPage()
1127  {  {
1128      if (firstRowInBlock < rowno - 1)      if (firstRowInBlock < rowno - 1)
1129      {      {
1130          Gtk::Label* filler = new Gtk::Label("    ");          Gtk::Label* filler = new Gtk::Label("    ");
1131    #if USE_GTKMM_GRID
1132            table[pageno]->attach(*filler, 0, firstRowInBlock);
1133    #else
1134          table[pageno]->attach(*filler, 0, 1, firstRowInBlock, rowno,          table[pageno]->attach(*filler, 0, 1, firstRowInBlock, rowno,
1135                                Gtk::FILL, Gtk::SHRINK);                                Gtk::FILL, Gtk::SHRINK);
1136    #endif
1137      }      }
1138      pageno++;      pageno++;
1139      rowno = 0;      rowno = 0;
# Line 799  void DimRegionEdit::nextPage() Line 1142  void DimRegionEdit::nextPage()
1142    
1143  void DimRegionEdit::addProp(BoolEntry& boolentry)  void DimRegionEdit::addProp(BoolEntry& boolentry)
1144  {  {
1145    #if USE_GTKMM_GRID
1146        table[pageno]->attach(boolentry.widget, 1, rowno, 2);
1147    #else
1148      table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1,      table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1,
1149                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
1150    #endif
1151      rowno++;      rowno++;
1152  }  }
1153    
1154  void DimRegionEdit::addProp(BoolEntryPlus6& boolentry)  void DimRegionEdit::addProp(BoolEntryPlus6& boolentry)
1155  {  {
1156    #if USE_GTKMM_GRID
1157        table[pageno]->attach(boolentry.widget, 1, rowno, 2);
1158    #else
1159      table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1,      table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1,
1160                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
1161    #endif
1162      rowno++;      rowno++;
1163  }  }
1164    
1165  void DimRegionEdit::addProp(LabelWidget& prop)  void DimRegionEdit::addProp(LabelWidget& prop)
1166  {  {
1167    #if USE_GTKMM_GRID
1168        table[pageno]->attach(prop.label, 1, rowno);
1169        table[pageno]->attach(prop.widget, 2, rowno);
1170    #else
1171      table[pageno]->attach(prop.label, 1, 2, rowno, rowno + 1,      table[pageno]->attach(prop.label, 1, 2, rowno, rowno + 1,
1172                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
1173      table[pageno]->attach(prop.widget, 2, 3, rowno, rowno + 1,      table[pageno]->attach(prop.widget, 2, 3, rowno, rowno + 1,
1174                            Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);                            Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
1175    #endif
1176      rowno++;      rowno++;
1177  }  }
1178    
1179    void DimRegionEdit::addLine(HBox& line)
1180    {
1181    #if USE_GTKMM_GRID
1182        table[pageno]->attach(line, 1, rowno, 2);
1183    #else
1184        table[pageno]->attach(line, 1, 3, rowno, rowno + 1,
1185                              Gtk::FILL, Gtk::SHRINK);
1186    #endif
1187        rowno++;
1188    }
1189    
1190    void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)
1191    {
1192    #if USE_GTKMM_GRID
1193        table[pageno]->attach(widget, 2, rowno);
1194    #else
1195        table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,
1196                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
1197    #endif
1198        rowno++;
1199    }
1200    
1201  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)
1202  {  {
# Line 846  void DimRegionEdit::set_dim_region(gig:: Line 1223  void DimRegionEdit::set_dim_region(gig::
1223      eEG1ControllerAttackInfluence.set_value(d->EG1ControllerAttackInfluence);      eEG1ControllerAttackInfluence.set_value(d->EG1ControllerAttackInfluence);
1224      eEG1ControllerDecayInfluence.set_value(d->EG1ControllerDecayInfluence);      eEG1ControllerDecayInfluence.set_value(d->EG1ControllerDecayInfluence);
1225      eEG1ControllerReleaseInfluence.set_value(d->EG1ControllerReleaseInfluence);      eEG1ControllerReleaseInfluence.set_value(d->EG1ControllerReleaseInfluence);
1226        eEG1StateOptions.checkBoxAttack.set_value(d->EG1Options.AttackCancel);
1227        eEG1StateOptions.checkBoxAttackHold.set_value(d->EG1Options.AttackHoldCancel);
1228        eEG1StateOptions.checkBoxDecay1.set_value(d->EG1Options.Decay1Cancel);
1229        eEG1StateOptions.checkBoxDecay2.set_value(d->EG1Options.Decay2Cancel);
1230        eEG1StateOptions.checkBoxRelease.set_value(d->EG1Options.ReleaseCancel);
1231      eLFO1Frequency.set_value(d->LFO1Frequency);      eLFO1Frequency.set_value(d->LFO1Frequency);
1232      eLFO1InternalDepth.set_value(d->LFO1InternalDepth);      eLFO1InternalDepth.set_value(d->LFO1InternalDepth);
1233      eLFO1ControlDepth.set_value(d->LFO1ControlDepth);      eLFO1ControlDepth.set_value(d->LFO1ControlDepth);
# Line 864  void DimRegionEdit::set_dim_region(gig:: Line 1246  void DimRegionEdit::set_dim_region(gig::
1246      eEG2ControllerAttackInfluence.set_value(d->EG2ControllerAttackInfluence);      eEG2ControllerAttackInfluence.set_value(d->EG2ControllerAttackInfluence);
1247      eEG2ControllerDecayInfluence.set_value(d->EG2ControllerDecayInfluence);      eEG2ControllerDecayInfluence.set_value(d->EG2ControllerDecayInfluence);
1248      eEG2ControllerReleaseInfluence.set_value(d->EG2ControllerReleaseInfluence);      eEG2ControllerReleaseInfluence.set_value(d->EG2ControllerReleaseInfluence);
1249        eEG2StateOptions.checkBoxAttack.set_value(d->EG2Options.AttackCancel);
1250        eEG2StateOptions.checkBoxAttackHold.set_value(d->EG2Options.AttackHoldCancel);
1251        eEG2StateOptions.checkBoxDecay1.set_value(d->EG2Options.Decay1Cancel);
1252        eEG2StateOptions.checkBoxDecay2.set_value(d->EG2Options.Decay2Cancel);
1253        eEG2StateOptions.checkBoxRelease.set_value(d->EG2Options.ReleaseCancel);
1254      eLFO2Frequency.set_value(d->LFO2Frequency);      eLFO2Frequency.set_value(d->LFO2Frequency);
1255      eLFO2InternalDepth.set_value(d->LFO2InternalDepth);      eLFO2InternalDepth.set_value(d->LFO2InternalDepth);
1256      eLFO2ControlDepth.set_value(d->LFO2ControlDepth);      eLFO2ControlDepth.set_value(d->LFO2ControlDepth);
# Line 901  void DimRegionEdit::set_dim_region(gig:: Line 1288  void DimRegionEdit::set_dim_region(gig::
1288      eCrossfade_out_start.set_value(d->Crossfade.out_start);      eCrossfade_out_start.set_value(d->Crossfade.out_start);
1289      eCrossfade_out_end.set_value(d->Crossfade.out_end);      eCrossfade_out_end.set_value(d->Crossfade.out_end);
1290      ePitchTrack.set_value(d->PitchTrack);      ePitchTrack.set_value(d->PitchTrack);
1291        eSustainReleaseTrigger.set_value(d->SustainReleaseTrigger);
1292        eNoNoteOffReleaseTrigger.set_value(d->NoNoteOffReleaseTrigger);
1293      eDimensionBypass.set_value(d->DimensionBypass);      eDimensionBypass.set_value(d->DimensionBypass);
1294      ePan.set_value(d->Pan);      ePan.set_value(d->Pan);
1295      eSelfMask.set_value(d->SelfMask);      eSelfMask.set_value(d->SelfMask);
# Line 912  void DimRegionEdit::set_dim_region(gig:: Line 1301  void DimRegionEdit::set_dim_region(gig::
1301      eMSDecode.set_value(d->MSDecode);      eMSDecode.set_value(d->MSDecode);
1302      eSampleStartOffset.set_value(d->SampleStartOffset);      eSampleStartOffset.set_value(d->SampleStartOffset);
1303      eUnityNote.set_value(d->UnityNote);      eUnityNote.set_value(d->UnityNote);
1304        // show sample group name
1305        {
1306            Glib::ustring s = "---";
1307            if (d->pSample && d->pSample->GetGroup())
1308                s = d->pSample->GetGroup()->Name;
1309            eSampleGroup.text.set_text(s);
1310        }
1311        // assemble sample format info string
1312        {
1313            Glib::ustring s;
1314            if (d->pSample) {
1315                switch (d->pSample->Channels) {
1316                    case 1: s = _("Mono"); break;
1317                    case 2: s = _("Stereo"); break;
1318                    default:
1319                        s = ToString(d->pSample->Channels) + _(" audio channels");
1320                        break;
1321                }
1322                s += " " + ToString(d->pSample->BitDepth) + " Bits";
1323                s += " " + ToString(d->pSample->SamplesPerSecond/1000) + "."
1324                          + ToString((d->pSample->SamplesPerSecond%1000)/100) + " kHz";
1325            } else {
1326                s = _("No sample assigned to this dimension region.");
1327            }
1328            eSampleFormatInfo.text.set_text(s);
1329        }
1330        // generate sample's memory address pointer string
1331        {
1332            Glib::ustring s;
1333            if (d->pSample) {
1334                char buf[64] = {};
1335                snprintf(buf, sizeof(buf), "%p", d->pSample);
1336                s = buf;
1337            } else {
1338                s = "---";
1339            }
1340            eSampleID.text.set_text(s);
1341        }
1342        // generate raw wave form data CRC-32 checksum string
1343        {
1344            Glib::ustring s = "---";
1345            if (d->pSample) {
1346                char buf[64] = {};
1347                snprintf(buf, sizeof(buf), "%x", d->pSample->GetWaveDataCRC32Checksum());
1348                s = buf;
1349            }
1350            eChecksum.text.set_text(s);
1351        }
1352        buttonSelectSample.set_sensitive(d && d->pSample);
1353      eFineTune.set_value(d->FineTune);      eFineTune.set_value(d->FineTune);
1354      eGain.set_value(d->Gain);      eGain.set_value(d->Gain);
1355      eGainPlus6.set_value(d->Gain);      eGainPlus6.set_value(d->Gain);
# Line 928  void DimRegionEdit::set_dim_region(gig:: Line 1366  void DimRegionEdit::set_dim_region(gig::
1366          d->pSample ? d->pSample->LoopPlayCount : 0);          d->pSample ? d->pSample->LoopPlayCount : 0);
1367      update_model--;      update_model--;
1368    
1369      wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : _("NULL"));      wSample->set_text(d->pSample ? gig_to_utf8(d->pSample->pInfo->Name) :
1370                          _("NULL"));
1371    
1372      update_loop_elements();      update_loop_elements();
1373      VCFEnabled_toggled();      VCFEnabled_toggled();
# Line 959  void DimRegionEdit::VCFEnabled_toggled() Line 1398  void DimRegionEdit::VCFEnabled_toggled()
1398      eEG2ControllerAttackInfluence.set_sensitive(sensitive);      eEG2ControllerAttackInfluence.set_sensitive(sensitive);
1399      eEG2ControllerDecayInfluence.set_sensitive(sensitive);      eEG2ControllerDecayInfluence.set_sensitive(sensitive);
1400      eEG2ControllerReleaseInfluence.set_sensitive(sensitive);      eEG2ControllerReleaseInfluence.set_sensitive(sensitive);
1401        eEG2StateOptions.set_sensitive(sensitive);
1402      lLFO2->set_sensitive(sensitive);      lLFO2->set_sensitive(sensitive);
1403      eLFO2Frequency.set_sensitive(sensitive);      eLFO2Frequency.set_sensitive(sensitive);
1404      eLFO2InternalDepth.set_sensitive(sensitive);      eLFO2InternalDepth.set_sensitive(sensitive);
# Line 1150  void DimRegionEdit::loop_infinite_toggle Line 1590  void DimRegionEdit::loop_infinite_toggle
1590      update_model--;      update_model--;
1591  }  }
1592    
1593  bool DimRegionEdit::set_sample(gig::Sample* sample)  bool DimRegionEdit::set_sample(gig::Sample* sample, bool copy_sample_unity, bool copy_sample_tune, bool copy_sample_loop)
1594    {
1595        bool result = false;
1596        for (std::set<gig::DimensionRegion*>::iterator itDimReg = dimregs.begin();
1597             itDimReg != dimregs.end(); ++itDimReg)
1598        {
1599            result |= set_sample(*itDimReg, sample, copy_sample_unity, copy_sample_tune, copy_sample_loop);
1600        }
1601        return result;
1602    }
1603    
1604    bool DimRegionEdit::set_sample(gig::DimensionRegion* dimreg, gig::Sample* sample, bool copy_sample_unity, bool copy_sample_tune, bool copy_sample_loop)
1605  {  {
1606      if (dimregion) {      if (dimreg) {
1607          //TODO: we should better move the code from MainWindow::on_sample_label_drop_drag_data_received() here          //TODO: we should better move the code from MainWindow::on_sample_label_drop_drag_data_received() here
1608    
1609          // currently commented because we're sending a similar signal in MainWindow::on_sample_label_drop_drag_data_received()          // currently commented because we're sending a similar signal in MainWindow::on_sample_label_drop_drag_data_received()
1610          //dimreg_to_be_changed_signal.emit(dimregion);          //DimRegionChangeGuard(this, dimregion);
1611    
1612          // make sure stereo samples always are the same in both          // make sure stereo samples always are the same in both
1613          // dimregs in the samplechannel dimension          // dimregs in the samplechannel dimension
1614          int nbDimregs = 1;          int nbDimregs = 1;
1615          gig::DimensionRegion* d[2] = { dimregion, 0 };          gig::DimensionRegion* d[2] = { dimreg, 0 };
1616          if (sample->Channels == 2) {          if (sample->Channels == 2) {
1617              gig::Region* region = dimregion->GetParent();              gig::Region* region = dimreg->GetParent();
1618    
1619              int bitcount = 0;              int bitcount = 0;
1620              int stereo_bit = 0;              int stereo_bit = 0;
# Line 1178  bool DimRegionEdit::set_sample(gig::Samp Line 1629  bool DimRegionEdit::set_sample(gig::Samp
1629              if (stereo_bit) {              if (stereo_bit) {
1630                  int dimregno;                  int dimregno;
1631                  for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {                  for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1632                      if (region->pDimensionRegions[dimregno] == dimregion) {                      if (region->pDimensionRegions[dimregno] == dimreg) {
1633                          break;                          break;
1634                      }                      }
1635                  }                  }
# Line 1188  bool DimRegionEdit::set_sample(gig::Samp Line 1639  bool DimRegionEdit::set_sample(gig::Samp
1639              }              }
1640          }          }
1641    
1642          gig::Sample* oldref = dimregion->pSample;          gig::Sample* oldref = dimreg->pSample;
1643    
1644          for (int i = 0 ; i < nbDimregs ; i++) {          for (int i = 0 ; i < nbDimregs ; i++) {
1645              d[i]->pSample = sample;              d[i]->pSample = sample;
1646    
1647              // copy sample information from Sample to DimensionRegion              // copy sample information from Sample to DimensionRegion
1648                if (copy_sample_unity)
1649              d[i]->UnityNote = sample->MIDIUnityNote;                  d[i]->UnityNote = sample->MIDIUnityNote;
1650              d[i]->FineTune = sample->FineTune;              if (copy_sample_tune)
1651                    d[i]->FineTune = sample->FineTune;
1652              int loops = sample->Loops ? 1 : 0;              if (copy_sample_loop) {
1653              while (d[i]->SampleLoops > loops) {                  int loops = sample->Loops ? 1 : 0;
1654                  d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);                  while (d[i]->SampleLoops > loops) {
1655              }                      d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);
1656              while (d[i]->SampleLoops < sample->Loops) {                  }
1657                  DLS::sample_loop_t loop;                  while (d[i]->SampleLoops < sample->Loops) {
1658                  d[i]->AddSampleLoop(&loop);                      DLS::sample_loop_t loop;
1659              }                      d[i]->AddSampleLoop(&loop);
1660              if (loops) {                  }
1661                  d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);                  if (loops) {
1662                  d[i]->pSampleLoops[0].LoopType = sample->LoopType;                      d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);
1663                  d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;                      d[i]->pSampleLoops[0].LoopType = sample->LoopType;
1664                  d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;                      d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;
1665                        d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;
1666                    }
1667              }              }
1668          }          }
1669    
1670          // update ui          // update ui
1671          update_model++;          update_model++;
1672          wSample->set_text(dimregion->pSample->pInfo->Name);          wSample->set_text(gig_to_utf8(dimreg->pSample->pInfo->Name));
1673          eUnityNote.set_value(dimregion->UnityNote);          eUnityNote.set_value(dimreg->UnityNote);
1674          eFineTune.set_value(dimregion->FineTune);          eFineTune.set_value(dimreg->FineTune);
1675          eSampleLoopEnabled.set_value(dimregion->SampleLoops);          eSampleLoopEnabled.set_value(dimreg->SampleLoops);
1676          update_loop_elements();          update_loop_elements();
1677          update_model--;          update_model--;
1678    
1679          sample_ref_changed_signal.emit(oldref, sample);          sample_ref_changed_signal.emit(oldref, sample);
         // currently commented because we're sending a similar signal in MainWindow::on_sample_label_drop_drag_data_received()  
         //dimreg_changed_signal.emit(dimregion);  
1680          return true;          return true;
1681      }      }
1682      return false;      return false;
# Line 1294  void DimRegionEdit::set_LoopEnabled(gig: Line 1745  void DimRegionEdit::set_LoopEnabled(gig:
1745      if (value) {      if (value) {
1746          // create a new sample loop in case there is none yet          // create a new sample loop in case there is none yet
1747          if (!d->SampleLoops) {          if (!d->SampleLoops) {
1748                DimRegionChangeGuard(this, d);
1749    
1750              DLS::sample_loop_t loop;              DLS::sample_loop_t loop;
1751              loop.LoopType = gig::loop_type_normal;              loop.LoopType = gig::loop_type_normal;
1752              // loop the whole sample by default              // loop the whole sample by default
1753              loop.LoopStart  = 0;              loop.LoopStart  = 0;
1754              loop.LoopLength =              loop.LoopLength =
1755                  (d->pSample) ? d->pSample->SamplesTotal : 0;                  (d->pSample) ? d->pSample->SamplesTotal : 0;
             dimreg_to_be_changed_signal.emit(d);  
1756              d->AddSampleLoop(&loop);              d->AddSampleLoop(&loop);
             dimreg_changed_signal.emit(d);  
1757          }          }
1758      } else {      } else {
1759          if (d->SampleLoops) {          if (d->SampleLoops) {
1760              dimreg_to_be_changed_signal.emit(d);              DimRegionChangeGuard(this, d);
1761    
1762              // delete ALL existing sample loops              // delete ALL existing sample loops
1763              while (d->SampleLoops) {              while (d->SampleLoops) {
1764                  d->DeleteSampleLoop(&d->pSampleLoops[0]);                  d->DeleteSampleLoop(&d->pSampleLoops[0]);
1765              }              }
             dimreg_changed_signal.emit(d);  
1766          }          }
1767      }      }
1768  }  }
# Line 1355  void DimRegionEdit::set_LoopPlayCount(gi Line 1806  void DimRegionEdit::set_LoopPlayCount(gi
1806  {  {
1807      if (d->pSample) d->pSample->LoopPlayCount = value;      if (d->pSample) d->pSample->LoopPlayCount = value;
1808  }  }
1809    
1810    void DimRegionEdit::nullOutSampleReference() {
1811        if (!dimregion) return;
1812        gig::Sample* oldref = dimregion->pSample;
1813        if (!oldref) return;
1814    
1815        DimRegionChangeGuard(this, dimregion);
1816    
1817        // in case currently assigned sample is a stereo one, then remove both
1818        // references (expected to be due to a "stereo dimension")
1819        gig::DimensionRegion* d[2] = { dimregion, NULL };
1820        if (oldref->Channels == 2) {
1821            gig::Region* region = dimregion->GetParent();
1822            {
1823                int stereo_bit = 0;
1824                int bitcount = 0;
1825                for (int dim = 0 ; dim < region->Dimensions ; dim++) {
1826                    if (region->pDimensionDefinitions[dim].dimension == gig::dimension_samplechannel) {
1827                        stereo_bit = 1 << bitcount;
1828                        break;
1829                    }
1830                    bitcount += region->pDimensionDefinitions[dim].bits;
1831                }
1832    
1833                if (stereo_bit) {
1834                    int dimregno;
1835                    for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1836                        if (region->pDimensionRegions[dimregno] == dimregion) {
1837                            break;
1838                        }
1839                    }
1840                    d[0] = region->pDimensionRegions[dimregno & ~stereo_bit];
1841                    d[1] = region->pDimensionRegions[dimregno | stereo_bit];
1842                }
1843            }
1844        }
1845    
1846        if (d[0]) d[0]->pSample = NULL;
1847        if (d[1]) d[1]->pSample = NULL;
1848    
1849        // update UI elements
1850        set_dim_region(dimregion);
1851    
1852        sample_ref_changed_signal.emit(oldref, NULL);
1853    }
1854    
1855    void DimRegionEdit::onButtonSelectSamplePressed() {
1856        if (!dimregion) return;
1857        if (!dimregion->pSample) return;
1858        select_sample_signal.emit(dimregion->pSample);
1859    }
1860    
1861    sigc::signal<void, gig::Sample*>& DimRegionEdit::signal_select_sample() {
1862        return select_sample_signal;
1863    }
Legend:
Removed from v.2430  
changed lines
  Added in v.3449
  ViewVC Help
Powered by ViewVC