/[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 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC revision 3461 by persson, Sat Feb 2 17:53:36 2019 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2017 Andreas Persson   * Copyright (C) 2006-2019 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 28  Line 28 
28  # include <gtkmm/table.h>  # include <gtkmm/table.h>
29  #endif  #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 187  EGStateOptions::EGStateOptions() : HBox( Line 189  EGStateOptions::EGStateOptions() : HBox(
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),
# Line 260  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(_("Kill lower velocity voices (a.k.a \"Self mask\")")),      eSelfMask(_("Kill lower velocity voices (a.k.a \"Self mask\")")),
# Line 279  DimRegionEdit::DimRegionEdit() : Line 293  DimRegionEdit::DimRegionEdit() :
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")),
# Line 307  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      {      connect(eEG1StateOptions.checkBoxAttack, &gig::DimensionRegion::EG1Options,
325          ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.AttackCancel));              &gig::eg_opt_t::AttackCancel);
326          connect(eEG1StateOptions.checkBoxAttack, mp.pmember);      connect(eEG1StateOptions.checkBoxAttackHold, &gig::DimensionRegion::EG1Options,
327      }              &gig::eg_opt_t::AttackHoldCancel);
328      {      connect(eEG1StateOptions.checkBoxDecay1, &gig::DimensionRegion::EG1Options,
329          ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.AttackHoldCancel));              &gig::eg_opt_t::Decay1Cancel);
330          connect(eEG1StateOptions.checkBoxAttackHold, mp.pmember);      connect(eEG1StateOptions.checkBoxDecay2, &gig::DimensionRegion::EG1Options,
331      }              &gig::eg_opt_t::Decay2Cancel);
332      {      connect(eEG1StateOptions.checkBoxRelease, &gig::DimensionRegion::EG1Options,
333          ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.Decay1Cancel));              &gig::eg_opt_t::ReleaseCancel);
         connect(eEG1StateOptions.checkBoxDecay1, mp.pmember);  
     }  
     {  
         ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.Decay2Cancel));  
         connect(eEG1StateOptions.checkBoxDecay2, mp.pmember);  
     }  
     {  
         ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG1Options.ReleaseCancel));  
         connect(eEG1StateOptions.checkBoxRelease, mp.pmember);  
     }  
334      connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency);      connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency);
335      connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth);      connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth);
336      connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth);      connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth);
# Line 348  DimRegionEdit::DimRegionEdit() : Line 352  DimRegionEdit::DimRegionEdit() :
352              &gig::DimensionRegion::EG2ControllerDecayInfluence);              &gig::DimensionRegion::EG2ControllerDecayInfluence);
353      connect(eEG2ControllerReleaseInfluence,      connect(eEG2ControllerReleaseInfluence,
354              &gig::DimensionRegion::EG2ControllerReleaseInfluence);              &gig::DimensionRegion::EG2ControllerReleaseInfluence);
355      {      connect(eEG2StateOptions.checkBoxAttack, &gig::DimensionRegion::EG2Options,
356          ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.AttackCancel));              &gig::eg_opt_t::AttackCancel);
357          connect(eEG2StateOptions.checkBoxAttack, mp.pmember);      connect(eEG2StateOptions.checkBoxAttackHold, &gig::DimensionRegion::EG2Options,
358      }              &gig::eg_opt_t::AttackHoldCancel);
359      {      connect(eEG2StateOptions.checkBoxDecay1, &gig::DimensionRegion::EG2Options,
360          ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.AttackHoldCancel));              &gig::eg_opt_t::Decay1Cancel);
361          connect(eEG2StateOptions.checkBoxAttackHold, mp.pmember);      connect(eEG2StateOptions.checkBoxDecay2, &gig::DimensionRegion::EG2Options,
362      }              &gig::eg_opt_t::Decay2Cancel);
363      {      connect(eEG2StateOptions.checkBoxRelease, &gig::DimensionRegion::EG2Options,
364          ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.Decay1Cancel));              &gig::eg_opt_t::ReleaseCancel);
         connect(eEG2StateOptions.checkBoxDecay1, mp.pmember);  
     }  
     {  
         ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.Decay2Cancel));  
         connect(eEG2StateOptions.checkBoxDecay2, mp.pmember);  
     }  
     {  
         ClassMemberPtr<gig::DimensionRegion, bool> mp(offsetof(gig::DimensionRegion, EG2Options.ReleaseCancel));  
         connect(eEG2StateOptions.checkBoxRelease, mp.pmember);  
     }  
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 415  DimRegionEdit::DimRegionEdit() : Line 409  DimRegionEdit::DimRegionEdit() :
409      connect(eCrossfade_out_start, &DimRegionEdit::set_Crossfade_out_start);      connect(eCrossfade_out_start, &DimRegionEdit::set_Crossfade_out_start);
410      connect(eCrossfade_out_end, &DimRegionEdit::set_Crossfade_out_end);      connect(eCrossfade_out_end, &DimRegionEdit::set_Crossfade_out_end);
411      connect(ePitchTrack, &gig::DimensionRegion::PitchTrack);      connect(ePitchTrack, &gig::DimensionRegion::PitchTrack);
412        connect(eSustainReleaseTrigger, &gig::DimensionRegion::SustainReleaseTrigger);
413        connect(eNoNoteOffReleaseTrigger, &gig::DimensionRegion::NoNoteOffReleaseTrigger);
414      connect(eDimensionBypass, &gig::DimensionRegion::DimensionBypass);      connect(eDimensionBypass, &gig::DimensionRegion::DimensionBypass);
415      connect(ePan, &gig::DimensionRegion::Pan);      connect(ePan, &gig::DimensionRegion::Pan);
416      connect(eSelfMask, &gig::DimensionRegion::SelfMask);      connect(eSelfMask, &gig::DimensionRegion::SelfMask);
# Line 451  DimRegionEdit::DimRegionEdit() : Line 447  DimRegionEdit::DimRegionEdit() :
447          table[i]->set_col_spacings(7);          table[i]->set_col_spacings(7);
448  #endif  #endif
449    
450    // on Gtk 3 there is absolutely no margin by default
451    #if GTKMM_MAJOR_VERSION >= 3
452    # if GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 12
453            table[i]->set_margin_left(12);
454            table[i]->set_margin_right(12);
455    # else
456            table[i]->set_margin_start(12);
457            table[i]->set_margin_end(12);
458    # endif
459    #endif
460      }      }
461    
462      // set tooltips      // set tooltips
# Line 635  DimRegionEdit::DimRegionEdit() : Line 641  DimRegionEdit::DimRegionEdit() :
641    
642      Gtk::Frame* frame = new Gtk::Frame;      Gtk::Frame* frame = new Gtk::Frame;
643      frame->add(crossfade_curve);      frame->add(crossfade_curve);
644        // on Gtk 3 there is no margin at all by default
645    #if GTKMM_MAJOR_VERSION >= 3
646        frame->set_margin_top(12);
647        frame->set_margin_bottom(12);
648    #endif
649  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
650      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
651  #else  #else
# Line 714  DimRegionEdit::DimRegionEdit() : Line 725  DimRegionEdit::DimRegionEdit() :
725    
726      frame = new Gtk::Frame;      frame = new Gtk::Frame;
727      frame->add(cutoff_curve);      frame->add(cutoff_curve);
728        // on Gtk 3 there is no margin at all by default
729    #if GTKMM_MAJOR_VERSION >= 3
730        frame->set_margin_top(12);
731        frame->set_margin_bottom(12);
732    #endif
733  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
734      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
735  #else  #else
# Line 820  DimRegionEdit::DimRegionEdit() : Line 836  DimRegionEdit::DimRegionEdit() :
836    
837      frame = new Gtk::Frame;      frame = new Gtk::Frame;
838      frame->add(velocity_curve);      frame->add(velocity_curve);
839        // on Gtk 3 there is no margin at all by default
840    #if GTKMM_MAJOR_VERSION >= 3
841        frame->set_margin_top(12);
842        frame->set_margin_bottom(12);
843    #endif
844  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
845      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
846  #else  #else
# Line 840  DimRegionEdit::DimRegionEdit() : Line 861  DimRegionEdit::DimRegionEdit() :
861          sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));          sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
862      frame = new Gtk::Frame;      frame = new Gtk::Frame;
863      frame->add(release_curve);      frame->add(release_curve);
864        // on Gtk 3 there is no margin at all by default
865    #if GTKMM_MAJOR_VERSION >= 3
866        frame->set_margin_top(12);
867        frame->set_margin_bottom(12);
868    #endif
869  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
870      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
871  #else  #else
# Line 850  DimRegionEdit::DimRegionEdit() : Line 876  DimRegionEdit::DimRegionEdit() :
876    
877      addProp(eReleaseTriggerDecay);      addProp(eReleaseTriggerDecay);
878      {      {
879            const char* choices[] = { _("off"), _("on (max. velocity)"), _("on (key velocity)"), 0 };
880            static const gig::sust_rel_trg_t values[] = {
881                gig::sust_rel_trg_none,
882                gig::sust_rel_trg_maxvelocity,
883                gig::sust_rel_trg_keyvelocity
884            };
885            eSustainReleaseTrigger.set_choices(choices, values);
886        }
887        eSustainReleaseTrigger.set_tip(_(
888            "By default release trigger samples are played on note-off events only. "
889            "This option allows to play release trigger sample on sustain pedal up "
890            "events as well. NOTE: This is a format extension!"
891        ));
892        addProp(eSustainReleaseTrigger);
893        {
894          const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 };          const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 };
895          static const gig::dim_bypass_ctrl_t values[] = {          static const gig::dim_bypass_ctrl_t values[] = {
896              gig::dim_bypass_ctrl_none,              gig::dim_bypass_ctrl_none,
# Line 858  DimRegionEdit::DimRegionEdit() : Line 899  DimRegionEdit::DimRegionEdit() :
899          };          };
900          eDimensionBypass.set_choices(choices, values);          eDimensionBypass.set_choices(choices, values);
901      }      }
902        eNoNoteOffReleaseTrigger.set_tip(_(
903            "By default release trigger samples are played on note-off events only. "
904            "If this option is checked, then no release trigger sample is played "
905            "when releasing a note. NOTE: This is a format extension!"
906        ));
907        addProp(eNoNoteOffReleaseTrigger);
908      addProp(eDimensionBypass);      addProp(eDimensionBypass);
909      eSelfMask.widget.set_tooltip_text(_(      eSelfMask.widget.set_tooltip_text(_(
910          "If enabled: new notes with higher velocity value will stop older "          "If enabled: new notes with higher velocity value will stop older "
# Line 930  DimRegionEdit::DimRegionEdit() : Line 977  DimRegionEdit::DimRegionEdit() :
977      append_page(*table[4], _("Filter (2)"));      append_page(*table[4], _("Filter (2)"));
978      append_page(*table[5], _("Pitch"));      append_page(*table[5], _("Pitch"));
979      append_page(*table[6], _("Misc"));      append_page(*table[6], _("Misc"));
980    
981        Settings::singleton()->showTooltips.get_proxy().signal_changed().connect(
982            sigc::mem_fun(*this, &DimRegionEdit::on_show_tooltips_changed)
983        );
984    
985        on_show_tooltips_changed();
986  }  }
987    
988  DimRegionEdit::~DimRegionEdit()  DimRegionEdit::~DimRegionEdit()
# Line 1021  Gtk::Label* DimRegionEdit::addHeader(con Line 1074  Gtk::Label* DimRegionEdit::addHeader(con
1074  #else  #else
1075      label->set_halign(Gtk::Align::START);      label->set_halign(Gtk::Align::START);
1076  #endif  #endif
1077        // on GTKMM 3 there is absolutely no margin by default
1078    #if GTKMM_MAJOR_VERSION >= 3
1079        label->set_margin_top(18);
1080        label->set_margin_bottom(13);
1081    #endif
1082  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
1083      table[pageno]->attach(*label, 0, rowno, 3);      table[pageno]->attach(*label, 0, rowno, 3);
1084  #else  #else
# Line 1032  Gtk::Label* DimRegionEdit::addHeader(con Line 1090  Gtk::Label* DimRegionEdit::addHeader(con
1090      return label;      return label;
1091  }  }
1092    
1093    void DimRegionEdit::on_show_tooltips_changed() {
1094        const bool b = Settings::singleton()->showTooltips;
1095    
1096        buttonSelectSample.set_has_tooltip(b);
1097        buttonNullSampleReference->set_has_tooltip(b);
1098        wSample->set_has_tooltip(b);
1099    
1100        eEG1StateOptions.on_show_tooltips_changed();
1101        eEG2StateOptions.on_show_tooltips_changed();
1102    
1103        set_has_tooltip(b);
1104    }
1105    
1106  void DimRegionEdit::nextPage()  void DimRegionEdit::nextPage()
1107  {  {
1108      if (firstRowInBlock < rowno - 1)      if (firstRowInBlock < rowno - 1)
# Line 1197  void DimRegionEdit::set_dim_region(gig:: Line 1268  void DimRegionEdit::set_dim_region(gig::
1268      eCrossfade_out_start.set_value(d->Crossfade.out_start);      eCrossfade_out_start.set_value(d->Crossfade.out_start);
1269      eCrossfade_out_end.set_value(d->Crossfade.out_end);      eCrossfade_out_end.set_value(d->Crossfade.out_end);
1270      ePitchTrack.set_value(d->PitchTrack);      ePitchTrack.set_value(d->PitchTrack);
1271        eSustainReleaseTrigger.set_value(d->SustainReleaseTrigger);
1272        eNoNoteOffReleaseTrigger.set_value(d->NoNoteOffReleaseTrigger);
1273      eDimensionBypass.set_value(d->DimensionBypass);      eDimensionBypass.set_value(d->DimensionBypass);
1274      ePan.set_value(d->Pan);      ePan.set_value(d->Pan);
1275      eSelfMask.set_value(d->SelfMask);      eSelfMask.set_value(d->SelfMask);
# Line 1602  sigc::signal<void, gig::Sample*/*old*/, Line 1675  sigc::signal<void, gig::Sample*/*old*/,
1675  }  }
1676    
1677    
1678  void DimRegionEdit::set_UnityNote(gig::DimensionRegion* d, uint8_t value)  void DimRegionEdit::set_UnityNote(gig::DimensionRegion& d, uint8_t value)
1679  {  {
1680      d->UnityNote = value;      d.UnityNote = value;
1681  }  }
1682    
1683  void DimRegionEdit::set_FineTune(gig::DimensionRegion* d, int16_t value)  void DimRegionEdit::set_FineTune(gig::DimensionRegion& d, int16_t value)
1684  {  {
1685      d->FineTune = value;      d.FineTune = value;
1686  }  }
1687    
1688  void DimRegionEdit::set_Crossfade_in_start(gig::DimensionRegion* d,  void DimRegionEdit::set_Crossfade_in_start(gig::DimensionRegion& d,
1689                                             uint8_t value)                                             uint8_t value)
1690  {  {
1691      d->Crossfade.in_start = value;      d.Crossfade.in_start = value;
1692      if (d->Crossfade.in_end < value) set_Crossfade_in_end(d, value);      if (d.Crossfade.in_end < value) set_Crossfade_in_end(d, value);
1693  }  }
1694    
1695  void DimRegionEdit::set_Crossfade_in_end(gig::DimensionRegion* d,  void DimRegionEdit::set_Crossfade_in_end(gig::DimensionRegion& d,
1696                                           uint8_t value)                                           uint8_t value)
1697  {  {
1698      d->Crossfade.in_end = value;      d.Crossfade.in_end = value;
1699      if (value < d->Crossfade.in_start) set_Crossfade_in_start(d, value);      if (value < d.Crossfade.in_start) set_Crossfade_in_start(d, value);
1700      if (value > d->Crossfade.out_start) set_Crossfade_out_start(d, value);      if (value > d.Crossfade.out_start) set_Crossfade_out_start(d, value);
1701  }  }
1702    
1703  void DimRegionEdit::set_Crossfade_out_start(gig::DimensionRegion* d,  void DimRegionEdit::set_Crossfade_out_start(gig::DimensionRegion& d,
1704                                              uint8_t value)                                              uint8_t value)
1705  {  {
1706      d->Crossfade.out_start = value;      d.Crossfade.out_start = value;
1707      if (value < d->Crossfade.in_end) set_Crossfade_in_end(d, value);      if (value < d.Crossfade.in_end) set_Crossfade_in_end(d, value);
1708      if (value > d->Crossfade.out_end) set_Crossfade_out_end(d, value);      if (value > d.Crossfade.out_end) set_Crossfade_out_end(d, value);
1709  }  }
1710    
1711  void DimRegionEdit::set_Crossfade_out_end(gig::DimensionRegion* d,  void DimRegionEdit::set_Crossfade_out_end(gig::DimensionRegion& d,
1712                                            uint8_t value)                                            uint8_t value)
1713  {  {
1714      d->Crossfade.out_end = value;      d.Crossfade.out_end = value;
1715      if (value < d->Crossfade.out_start) set_Crossfade_out_start(d, value);      if (value < d.Crossfade.out_start) set_Crossfade_out_start(d, value);
1716  }  }
1717    
1718  void DimRegionEdit::set_Gain(gig::DimensionRegion* d, int32_t value)  void DimRegionEdit::set_Gain(gig::DimensionRegion& d, int32_t value)
1719  {  {
1720      d->SetGain(value);      d.SetGain(value);
1721  }  }
1722    
1723  void DimRegionEdit::set_LoopEnabled(gig::DimensionRegion* d, bool value)  void DimRegionEdit::set_LoopEnabled(gig::DimensionRegion& d, bool value)
1724  {  {
1725      if (value) {      if (value) {
1726          // create a new sample loop in case there is none yet          // create a new sample loop in case there is none yet
1727          if (!d->SampleLoops) {          if (!d.SampleLoops) {
1728              DimRegionChangeGuard(this, d);              DimRegionChangeGuard(this, &d);
1729    
1730              DLS::sample_loop_t loop;              DLS::sample_loop_t loop;
1731              loop.LoopType = gig::loop_type_normal;              loop.LoopType = gig::loop_type_normal;
1732              // loop the whole sample by default              // loop the whole sample by default
1733              loop.LoopStart  = 0;              loop.LoopStart  = 0;
1734              loop.LoopLength =              loop.LoopLength =
1735                  (d->pSample) ? d->pSample->SamplesTotal : 0;                  (d.pSample) ? d.pSample->SamplesTotal : 0;
1736              d->AddSampleLoop(&loop);              d.AddSampleLoop(&loop);
1737          }          }
1738      } else {      } else {
1739          if (d->SampleLoops) {          if (d.SampleLoops) {
1740              DimRegionChangeGuard(this, d);              DimRegionChangeGuard(this, &d);
1741    
1742              // delete ALL existing sample loops              // delete ALL existing sample loops
1743              while (d->SampleLoops) {              while (d.SampleLoops) {
1744                  d->DeleteSampleLoop(&d->pSampleLoops[0]);                  d.DeleteSampleLoop(&d.pSampleLoops[0]);
1745              }              }
1746          }          }
1747      }      }
1748  }  }
1749    
1750  void DimRegionEdit::set_LoopType(gig::DimensionRegion* d, uint32_t value)  void DimRegionEdit::set_LoopType(gig::DimensionRegion& d, uint32_t value)
1751  {  {
1752      if (d->SampleLoops) d->pSampleLoops[0].LoopType = value;      if (d.SampleLoops) d.pSampleLoops[0].LoopType = value;
1753  }  }
1754    
1755  void DimRegionEdit::set_LoopStart(gig::DimensionRegion* d, uint32_t value)  void DimRegionEdit::set_LoopStart(gig::DimensionRegion& d, uint32_t value)
1756  {  {
1757      if (d->SampleLoops) {      if (d.SampleLoops) {
1758          d->pSampleLoops[0].LoopStart =          d.pSampleLoops[0].LoopStart =
1759              d->pSample ?              d.pSample ?
1760              std::min(value, uint32_t(d->pSample->SamplesTotal -              std::min(value, uint32_t(d.pSample->SamplesTotal -
1761                                       d->pSampleLoops[0].LoopLength)) :                                       d.pSampleLoops[0].LoopLength)) :
1762              0;              0;
1763      }      }
1764  }  }
1765    
1766  void DimRegionEdit::set_LoopLength(gig::DimensionRegion* d, uint32_t value)  void DimRegionEdit::set_LoopLength(gig::DimensionRegion& d, uint32_t value)
1767  {  {
1768      if (d->SampleLoops) {      if (d.SampleLoops) {
1769          d->pSampleLoops[0].LoopLength =          d.pSampleLoops[0].LoopLength =
1770              d->pSample ?              d.pSample ?
1771              std::min(value, uint32_t(d->pSample->SamplesTotal -              std::min(value, uint32_t(d.pSample->SamplesTotal -
1772                                       d->pSampleLoops[0].LoopStart)) :                                       d.pSampleLoops[0].LoopStart)) :
1773              0;              0;
1774      }      }
1775  }  }
1776    
1777  void DimRegionEdit::set_LoopInfinite(gig::DimensionRegion* d, bool value)  void DimRegionEdit::set_LoopInfinite(gig::DimensionRegion& d, bool value)
1778  {  {
1779      if (d->pSample) {      if (d.pSample) {
1780          if (value) d->pSample->LoopPlayCount = 0;          if (value) d.pSample->LoopPlayCount = 0;
1781          else if (d->pSample->LoopPlayCount == 0) d->pSample->LoopPlayCount = 1;          else if (d.pSample->LoopPlayCount == 0) d.pSample->LoopPlayCount = 1;
1782      }      }
1783  }  }
1784    
1785  void DimRegionEdit::set_LoopPlayCount(gig::DimensionRegion* d, uint32_t value)  void DimRegionEdit::set_LoopPlayCount(gig::DimensionRegion& d, uint32_t value)
1786  {  {
1787      if (d->pSample) d->pSample->LoopPlayCount = value;      if (d.pSample) d.pSample->LoopPlayCount = value;
1788  }  }
1789    
1790  void DimRegionEdit::nullOutSampleReference() {  void DimRegionEdit::nullOutSampleReference() {
Legend:
Removed from v.3364  
changed lines
  Added in v.3461
  ViewVC Help
Powered by ViewVC