--- gigedit/trunk/src/gigedit/dimregionedit.cpp 2018/01/19 19:17:41 3408 +++ gigedit/trunk/src/gigedit/dimregionedit.cpp 2019/10/01 16:21:28 3619 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2017 Andreas Persson + * Copyright (C) 2006-2019 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -28,6 +28,8 @@ # include #endif +#include "Settings.h" + VelocityCurve::VelocityCurve(double (gig::DimensionRegion::*getter)(uint8_t)) : getter(getter), dimreg(0) { set_size_request(80, 80); @@ -37,9 +39,6 @@ bool VelocityCurve::on_expose_event(GdkEventExpose* e) { const Cairo::RefPtr& cr = get_window()->create_cairo_context(); -#if 0 -} -#endif #else bool VelocityCurve::on_draw(const Cairo::RefPtr& cr) { #endif @@ -82,9 +81,6 @@ bool CrossfadeCurve::on_expose_event(GdkEventExpose* e) { const Cairo::RefPtr& cr = get_window()->create_cairo_context(); -#if 0 -} -#endif #else bool CrossfadeCurve::on_draw(const Cairo::RefPtr& cr) { #endif @@ -153,6 +149,138 @@ } +LFOGraph::LFOGraph() : dimreg(0) { + set_size_request(500, 100); +} + +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 +bool LFOGraph::on_expose_event(GdkEventExpose* e) { + const Cairo::RefPtr& cr = + get_window()->create_cairo_context(); +#else +bool LFOGraph::on_draw(const Cairo::RefPtr& cr) { +#endif + if (dimreg) { + const int w = get_width(); + const int h = get_height(); + const bool sensitive = is_sensitive(); + const bool signedRange = this->signedRange(); + const float visiblePeriods = 5.f; // such that minimum LFO frequency 0.1 Hz draws exactly a half period + + // short-hand functions for setting colors + auto setGrayColor = [&] { + cr->set_source_rgba(0.88, 0.88, 0.88, sensitive ? 1.0 : 0.3); + }; + auto setBlackColor = [&] { + cr->set_source_rgba(0, 0, 0, sensitive ? 1.0 : 0.3); + }; + auto setGreenColor = [&] { + cr->set_source_rgba(94/255.f, 219/255.f, 80/255.f, sensitive ? 1.0 : 0.3); + }; + auto setRedColor = [&] { + cr->set_source_rgba(255.f, 44/255.f, 44/255.f, sensitive ? 1.0 : 0.3); + }; + /*auto setBlueColor = [&] { + cr->set_source_rgba(53/255.f, 167/255.f, 255.f, sensitive ? 1.0 : 0.3); + };*/ + auto setOrangeColor = [&] { + cr->set_source_rgba(255.f, 177/255.f, 82/255.f, sensitive ? 1.0 : 0.3); + }; + + // draw horizontal center line (dashed gray) if LFO range is signed + if (signedRange) { + cr->move_to(0, h/2); + cr->line_to(w, h/2); + cr->set_line_width(2); + setGrayColor(); + cr->set_dash(std::vector{ 7, 5 }, 0 /*offset*/); + cr->stroke(); + } + + // draw a vertical line for each second + for (int period = 1; period < visiblePeriods; ++period) { + int x = float(w) / float(visiblePeriods) * period; + cr->move_to(x, 0); + cr->line_to(x, h); + cr->set_line_width(2); + setGrayColor(); + cr->set_dash(std::vector{ 5, 3 }, 0 /*offset*/); + cr->stroke(); + } + + // how many curves shall we draw, two or one? + const int runs = (hasControllerAssigned()) ? 2 : 1; + // only draw the two curves in dashed style if they're very close to each other + const bool dashedCurves = (runs == 2 && controllerDepth() < 63); + // draw the required amount of curves + for (int run = 0; run < runs; ++run) { + // setup the LFO generator with the relevant parameters + lfo.setup({ + .waveType = LinuxSampler::LFO::wave_sine, // see https://sourceforge.net/p/linuxsampler/mailman/linuxsampler-devel/thread/2189307.cNP0Xbctxq%40silver/#msg36774029 + .rangeType = (signedRange) ? LinuxSampler::LFO::range_signed : LinuxSampler::LFO::range_unsigned, + .frequency = frequency(), + //.phase = TODO + .startLevel = startLevel(), + .internalDepth = internalDepth(), + .midiControllerDepth = controllerDepth(), + .flipPolarity = flipPolarity(), + .samplerate = w / visiblePeriods, + .maxValue = (signedRange) ? h/2 : h, + }); + // 1st curve reflects min. CC value, 2nd curve max. CC value + lfo.setMIDICtrlValue( (run == 0) ? 0 : 127 ); + + // the actual render/draw loop + for (int x = 0; x < w ; ++x) { + const float y = + (signedRange) ? + h/2 - lfo.render() : + h - lfo.render(); + if (x == 0) + cr->move_to(x, y); + else + cr->line_to(x, y); + } + cr->set_line_width( (frequency() <= 4.f) ? 2 : 1 ); + if (runs == 1) + setOrangeColor(); + else if (run == 0) + setGreenColor(); + else + setRedColor(); + if (dashedCurves) + cr->set_dash(std::vector{ 3, 3 }, (run == 0) ? 0 : 3 /*offset*/); + else + cr->set_dash(std::vector(), 0 /*offset*/); + cr->stroke(); + } + + // draw text legend + if (runs == 2) { + setRedColor(); + cr->move_to(2, 10); + cr->show_text("CC Max."); + + setGreenColor(); + cr->move_to(2, 23); + cr->show_text("CC Min."); + } else { // no controller assigned, internal depth only ... + setOrangeColor(); + cr->move_to(2, 10); + cr->show_text("Const. Depth"); + } + // draw text legend for each second ("1s", "2s", ...) + for (int period = 1; period < visiblePeriods; ++period) { + int x = float(w) / float(visiblePeriods) * period; + setBlackColor(); + cr->move_to(x - 13, h - 3); + cr->show_text(ToString(period) + "s"); + } + } + return true; +} + + EGStateOptions::EGStateOptions() : HBox(), label(_("May be cancelled: ")), checkBoxAttack(_("Attack")), @@ -187,6 +315,16 @@ )); } +void EGStateOptions::on_show_tooltips_changed() { + const bool b = Settings::singleton()->showTooltips; + + checkBoxAttack.set_has_tooltip(b); + checkBoxAttackHold.set_has_tooltip(b); + checkBoxDecay1.set_has_tooltip(b); + checkBoxDecay2.set_has_tooltip(b); + checkBoxRelease.set_has_tooltip(b); +} + DimRegionEdit::DimRegionEdit() : velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation), @@ -260,6 +398,8 @@ eCrossfade_out_start(_("Crossfade-out start")), eCrossfade_out_end(_("Crossfade-out end")), ePitchTrack(_("Pitch track")), + eSustainReleaseTrigger(_("Sustain Release Trigger")), + eNoNoteOffReleaseTrigger(_("No note-off release trigger")), eDimensionBypass(_("Dimension bypass")), ePan(_("Pan"), -64, 63), eSelfMask(_("Kill lower velocity voices (a.k.a \"Self mask\")")), @@ -307,26 +447,16 @@ &gig::DimensionRegion::EG1ControllerDecayInfluence); connect(eEG1ControllerReleaseInfluence, &gig::DimensionRegion::EG1ControllerReleaseInfluence); - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG1Options.AttackCancel)); - connect(eEG1StateOptions.checkBoxAttack, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG1Options.AttackHoldCancel)); - connect(eEG1StateOptions.checkBoxAttackHold, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG1Options.Decay1Cancel)); - connect(eEG1StateOptions.checkBoxDecay1, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG1Options.Decay2Cancel)); - connect(eEG1StateOptions.checkBoxDecay2, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG1Options.ReleaseCancel)); - connect(eEG1StateOptions.checkBoxRelease, mp.pmember); - } + connect(eEG1StateOptions.checkBoxAttack, &gig::DimensionRegion::EG1Options, + &gig::eg_opt_t::AttackCancel); + connect(eEG1StateOptions.checkBoxAttackHold, &gig::DimensionRegion::EG1Options, + &gig::eg_opt_t::AttackHoldCancel); + connect(eEG1StateOptions.checkBoxDecay1, &gig::DimensionRegion::EG1Options, + &gig::eg_opt_t::Decay1Cancel); + connect(eEG1StateOptions.checkBoxDecay2, &gig::DimensionRegion::EG1Options, + &gig::eg_opt_t::Decay2Cancel); + connect(eEG1StateOptions.checkBoxRelease, &gig::DimensionRegion::EG1Options, + &gig::eg_opt_t::ReleaseCancel); connect(eLFO1Frequency, &gig::DimensionRegion::LFO1Frequency); connect(eLFO1InternalDepth, &gig::DimensionRegion::LFO1InternalDepth); connect(eLFO1ControlDepth, &gig::DimensionRegion::LFO1ControlDepth); @@ -348,26 +478,16 @@ &gig::DimensionRegion::EG2ControllerDecayInfluence); connect(eEG2ControllerReleaseInfluence, &gig::DimensionRegion::EG2ControllerReleaseInfluence); - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG2Options.AttackCancel)); - connect(eEG2StateOptions.checkBoxAttack, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG2Options.AttackHoldCancel)); - connect(eEG2StateOptions.checkBoxAttackHold, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG2Options.Decay1Cancel)); - connect(eEG2StateOptions.checkBoxDecay1, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG2Options.Decay2Cancel)); - connect(eEG2StateOptions.checkBoxDecay2, mp.pmember); - } - { - ClassMemberPtr mp(offsetof(gig::DimensionRegion, EG2Options.ReleaseCancel)); - connect(eEG2StateOptions.checkBoxRelease, mp.pmember); - } + connect(eEG2StateOptions.checkBoxAttack, &gig::DimensionRegion::EG2Options, + &gig::eg_opt_t::AttackCancel); + connect(eEG2StateOptions.checkBoxAttackHold, &gig::DimensionRegion::EG2Options, + &gig::eg_opt_t::AttackHoldCancel); + connect(eEG2StateOptions.checkBoxDecay1, &gig::DimensionRegion::EG2Options, + &gig::eg_opt_t::Decay1Cancel); + connect(eEG2StateOptions.checkBoxDecay2, &gig::DimensionRegion::EG2Options, + &gig::eg_opt_t::Decay2Cancel); + connect(eEG2StateOptions.checkBoxRelease, &gig::DimensionRegion::EG2Options, + &gig::eg_opt_t::ReleaseCancel); connect(eLFO2Frequency, &gig::DimensionRegion::LFO2Frequency); connect(eLFO2InternalDepth, &gig::DimensionRegion::LFO2InternalDepth); connect(eLFO2ControlDepth, &gig::DimensionRegion::LFO2ControlDepth); @@ -415,6 +535,8 @@ connect(eCrossfade_out_start, &DimRegionEdit::set_Crossfade_out_start); connect(eCrossfade_out_end, &DimRegionEdit::set_Crossfade_out_end); connect(ePitchTrack, &gig::DimensionRegion::PitchTrack); + connect(eSustainReleaseTrigger, &gig::DimensionRegion::SustainReleaseTrigger); + connect(eNoNoteOffReleaseTrigger, &gig::DimensionRegion::NoNoteOffReleaseTrigger); connect(eDimensionBypass, &gig::DimensionRegion::DimensionBypass); connect(ePan, &gig::DimensionRegion::Pan); connect(eSelfMask, &gig::DimensionRegion::SelfMask); @@ -442,7 +564,7 @@ sigc::mem_fun(*this, &DimRegionEdit::onButtonSelectSamplePressed) ); - for (int i = 0 ; i < 7 ; i++) { + for (int i = 0 ; i < 9 ; i++) { #if USE_GTKMM_GRID table[i] = new Gtk::Grid; table[i]->set_column_spacing(7); @@ -634,6 +756,28 @@ addProp(eLFO1Controller); addProp(eLFO1FlipPhase); addProp(eLFO1Sync); + { + Gtk::Frame* frame = new Gtk::Frame; + frame->add(lfo1Graph); + // on Gtk 3 there is no margin at all by default +#if GTKMM_MAJOR_VERSION >= 3 + frame->set_margin_top(12); + frame->set_margin_bottom(12); +#endif +#if USE_GTKMM_GRID + table[pageno]->attach(*frame, 1, rowno, 2); +#else + table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1, + Gtk::SHRINK, Gtk::SHRINK); +#endif + rowno++; + } + eLFO1FlipPhase.signal_value_changed().connect( + sigc::mem_fun(lfo1Graph, &LFOGraph::queue_draw) + ); + + nextPage(); + addHeader(_("Crossfade")); addProp(eAttenuationController); addProp(eInvertAttenuationController); @@ -776,6 +920,9 @@ addProp(eEG2ControllerDecayInfluence); addProp(eEG2ControllerReleaseInfluence); addLine(eEG2StateOptions); + + nextPage(); + lLFO2 = addHeader(_("Filter Cutoff Oscillator (LFO2)")); addProp(eLFO2Frequency); addProp(eLFO2InternalDepth); @@ -795,6 +942,25 @@ addProp(eLFO2Controller); addProp(eLFO2FlipPhase); addProp(eLFO2Sync); + { + Gtk::Frame* frame = new Gtk::Frame; + frame->add(lfo2Graph); + // on Gtk 3 there is no margin at all by default +#if GTKMM_MAJOR_VERSION >= 3 + frame->set_margin_top(12); + frame->set_margin_bottom(12); +#endif +#if USE_GTKMM_GRID + table[pageno]->attach(*frame, 1, rowno, 2); +#else + table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1, + Gtk::SHRINK, Gtk::SHRINK); +#endif + rowno++; + } + eLFO2FlipPhase.signal_value_changed().connect( + sigc::mem_fun(lfo2Graph, &LFOGraph::queue_draw) + ); nextPage(); @@ -822,6 +988,22 @@ } addProp(eLFO3Controller); addProp(eLFO3Sync); + { + Gtk::Frame* frame = new Gtk::Frame; + frame->add(lfo3Graph); + // on Gtk 3 there is no margin at all by default +#if GTKMM_MAJOR_VERSION >= 3 + frame->set_margin_top(12); + frame->set_margin_bottom(12); +#endif +#if USE_GTKMM_GRID + table[pageno]->attach(*frame, 1, rowno, 2); +#else + table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1, + Gtk::SHRINK, Gtk::SHRINK); +#endif + rowno++; + } nextPage(); @@ -880,6 +1062,21 @@ addProp(eReleaseTriggerDecay); { + const char* choices[] = { _("off"), _("on (max. velocity)"), _("on (key velocity)"), 0 }; + static const gig::sust_rel_trg_t values[] = { + gig::sust_rel_trg_none, + gig::sust_rel_trg_maxvelocity, + gig::sust_rel_trg_keyvelocity + }; + eSustainReleaseTrigger.set_choices(choices, values); + } + eSustainReleaseTrigger.set_tip(_( + "By default release trigger samples are played on note-off events only. " + "This option allows to play release trigger sample on sustain pedal up " + "events as well. NOTE: This is a format extension!" + )); + addProp(eSustainReleaseTrigger); + { const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 }; static const gig::dim_bypass_ctrl_t values[] = { gig::dim_bypass_ctrl_none, @@ -888,6 +1085,12 @@ }; eDimensionBypass.set_choices(choices, values); } + eNoNoteOffReleaseTrigger.set_tip(_( + "By default release trigger samples are played on note-off events only. " + "If this option is checked, then no release trigger sample is played " + "when releasing a note. NOTE: This is a format extension!" + )); + addProp(eNoNoteOffReleaseTrigger); addProp(eDimensionBypass); eSelfMask.widget.set_tooltip_text(_( "If enabled: new notes with higher velocity value will stop older " @@ -954,12 +1157,20 @@ sigc::mem_fun(*this, &DimRegionEdit::loop_infinite_toggled)); append_page(*table[0], _("Sample")); - append_page(*table[1], _("Amplitude (1)")); - append_page(*table[2], _("Amplitude (2)")); - append_page(*table[3], _("Filter (1)")); - append_page(*table[4], _("Filter (2)")); - append_page(*table[5], _("Pitch")); - append_page(*table[6], _("Misc")); + append_page(*table[1], _("Amp (1)")); + append_page(*table[2], _("Amp (2)")); + append_page(*table[3], _("Amp (3)")); + append_page(*table[4], _("Filter (1)")); + append_page(*table[5], _("Filter (2)")); + append_page(*table[6], _("Filter (3)")); + append_page(*table[7], _("Pitch")); + append_page(*table[8], _("Misc")); + + Settings::singleton()->showTooltips.get_proxy().signal_changed().connect( + sigc::mem_fun(*this, &DimRegionEdit::on_show_tooltips_changed) + ); + + on_show_tooltips_changed(); } DimRegionEdit::~DimRegionEdit() @@ -1067,6 +1278,19 @@ return label; } +void DimRegionEdit::on_show_tooltips_changed() { + const bool b = Settings::singleton()->showTooltips; + + buttonSelectSample.set_has_tooltip(b); + buttonNullSampleReference->set_has_tooltip(b); + wSample->set_has_tooltip(b); + + eEG1StateOptions.on_show_tooltips_changed(); + eEG2StateOptions.on_show_tooltips_changed(); + + set_has_tooltip(b); +} + void DimRegionEdit::nextPage() { if (firstRowInBlock < rowno - 1) @@ -1149,6 +1373,9 @@ release_curve.set_dim_region(d); cutoff_curve.set_dim_region(d); crossfade_curve.set_dim_region(d); + lfo1Graph.set_dim_region(d); + lfo2Graph.set_dim_region(d); + lfo3Graph.set_dim_region(d); set_sensitive(d); if (!d) return; @@ -1232,6 +1459,8 @@ eCrossfade_out_start.set_value(d->Crossfade.out_start); eCrossfade_out_end.set_value(d->Crossfade.out_end); ePitchTrack.set_value(d->PitchTrack); + eSustainReleaseTrigger.set_value(d->SustainReleaseTrigger); + eNoNoteOffReleaseTrigger.set_value(d->NoNoteOffReleaseTrigger); eDimensionBypass.set_value(d->DimensionBypass); ePan.set_value(d->Pan); eSelfMask.set_value(d->SelfMask); @@ -1348,6 +1577,7 @@ eLFO2Controller.set_sensitive(sensitive); eLFO2FlipPhase.set_sensitive(sensitive); eLFO2Sync.set_sensitive(sensitive); + lfo2Graph.set_sensitive(sensitive); if (sensitive) { VCFCutoffController_changed(); VCFResonanceController_changed(); @@ -1637,116 +1867,116 @@ } -void DimRegionEdit::set_UnityNote(gig::DimensionRegion* d, uint8_t value) +void DimRegionEdit::set_UnityNote(gig::DimensionRegion& d, uint8_t value) { - d->UnityNote = value; + d.UnityNote = value; } -void DimRegionEdit::set_FineTune(gig::DimensionRegion* d, int16_t value) +void DimRegionEdit::set_FineTune(gig::DimensionRegion& d, int16_t value) { - d->FineTune = value; + d.FineTune = value; } -void DimRegionEdit::set_Crossfade_in_start(gig::DimensionRegion* d, +void DimRegionEdit::set_Crossfade_in_start(gig::DimensionRegion& d, uint8_t value) { - d->Crossfade.in_start = value; - if (d->Crossfade.in_end < value) set_Crossfade_in_end(d, value); + d.Crossfade.in_start = value; + if (d.Crossfade.in_end < value) set_Crossfade_in_end(d, value); } -void DimRegionEdit::set_Crossfade_in_end(gig::DimensionRegion* d, +void DimRegionEdit::set_Crossfade_in_end(gig::DimensionRegion& d, uint8_t value) { - d->Crossfade.in_end = value; - if (value < d->Crossfade.in_start) set_Crossfade_in_start(d, value); - if (value > d->Crossfade.out_start) set_Crossfade_out_start(d, value); + d.Crossfade.in_end = value; + if (value < d.Crossfade.in_start) set_Crossfade_in_start(d, value); + if (value > d.Crossfade.out_start) set_Crossfade_out_start(d, value); } -void DimRegionEdit::set_Crossfade_out_start(gig::DimensionRegion* d, +void DimRegionEdit::set_Crossfade_out_start(gig::DimensionRegion& d, uint8_t value) { - d->Crossfade.out_start = value; - if (value < d->Crossfade.in_end) set_Crossfade_in_end(d, value); - if (value > d->Crossfade.out_end) set_Crossfade_out_end(d, value); + d.Crossfade.out_start = value; + if (value < d.Crossfade.in_end) set_Crossfade_in_end(d, value); + if (value > d.Crossfade.out_end) set_Crossfade_out_end(d, value); } -void DimRegionEdit::set_Crossfade_out_end(gig::DimensionRegion* d, +void DimRegionEdit::set_Crossfade_out_end(gig::DimensionRegion& d, uint8_t value) { - d->Crossfade.out_end = value; - if (value < d->Crossfade.out_start) set_Crossfade_out_start(d, value); + d.Crossfade.out_end = value; + if (value < d.Crossfade.out_start) set_Crossfade_out_start(d, value); } -void DimRegionEdit::set_Gain(gig::DimensionRegion* d, int32_t value) +void DimRegionEdit::set_Gain(gig::DimensionRegion& d, int32_t value) { - d->SetGain(value); + d.SetGain(value); } -void DimRegionEdit::set_LoopEnabled(gig::DimensionRegion* d, bool value) +void DimRegionEdit::set_LoopEnabled(gig::DimensionRegion& d, bool value) { if (value) { // create a new sample loop in case there is none yet - if (!d->SampleLoops) { - DimRegionChangeGuard(this, d); + if (!d.SampleLoops) { + DimRegionChangeGuard(this, &d); DLS::sample_loop_t loop; loop.LoopType = gig::loop_type_normal; // loop the whole sample by default loop.LoopStart = 0; loop.LoopLength = - (d->pSample) ? d->pSample->SamplesTotal : 0; - d->AddSampleLoop(&loop); + (d.pSample) ? d.pSample->SamplesTotal : 0; + d.AddSampleLoop(&loop); } } else { - if (d->SampleLoops) { - DimRegionChangeGuard(this, d); + if (d.SampleLoops) { + DimRegionChangeGuard(this, &d); // delete ALL existing sample loops - while (d->SampleLoops) { - d->DeleteSampleLoop(&d->pSampleLoops[0]); + while (d.SampleLoops) { + d.DeleteSampleLoop(&d.pSampleLoops[0]); } } } } -void DimRegionEdit::set_LoopType(gig::DimensionRegion* d, uint32_t value) +void DimRegionEdit::set_LoopType(gig::DimensionRegion& d, uint32_t value) { - if (d->SampleLoops) d->pSampleLoops[0].LoopType = value; + if (d.SampleLoops) d.pSampleLoops[0].LoopType = value; } -void DimRegionEdit::set_LoopStart(gig::DimensionRegion* d, uint32_t value) +void DimRegionEdit::set_LoopStart(gig::DimensionRegion& d, uint32_t value) { - if (d->SampleLoops) { - d->pSampleLoops[0].LoopStart = - d->pSample ? - std::min(value, uint32_t(d->pSample->SamplesTotal - - d->pSampleLoops[0].LoopLength)) : + if (d.SampleLoops) { + d.pSampleLoops[0].LoopStart = + d.pSample ? + std::min(value, uint32_t(d.pSample->SamplesTotal - + d.pSampleLoops[0].LoopLength)) : 0; } } -void DimRegionEdit::set_LoopLength(gig::DimensionRegion* d, uint32_t value) +void DimRegionEdit::set_LoopLength(gig::DimensionRegion& d, uint32_t value) { - if (d->SampleLoops) { - d->pSampleLoops[0].LoopLength = - d->pSample ? - std::min(value, uint32_t(d->pSample->SamplesTotal - - d->pSampleLoops[0].LoopStart)) : + if (d.SampleLoops) { + d.pSampleLoops[0].LoopLength = + d.pSample ? + std::min(value, uint32_t(d.pSample->SamplesTotal - + d.pSampleLoops[0].LoopStart)) : 0; } } -void DimRegionEdit::set_LoopInfinite(gig::DimensionRegion* d, bool value) +void DimRegionEdit::set_LoopInfinite(gig::DimensionRegion& d, bool value) { - if (d->pSample) { - if (value) d->pSample->LoopPlayCount = 0; - else if (d->pSample->LoopPlayCount == 0) d->pSample->LoopPlayCount = 1; + if (d.pSample) { + if (value) d.pSample->LoopPlayCount = 0; + else if (d.pSample->LoopPlayCount == 0) d.pSample->LoopPlayCount = 1; } } -void DimRegionEdit::set_LoopPlayCount(gig::DimensionRegion* d, uint32_t value) +void DimRegionEdit::set_LoopPlayCount(gig::DimensionRegion& d, uint32_t value) { - if (d->pSample) d->pSample->LoopPlayCount = value; + if (d.pSample) d.pSample->LoopPlayCount = value; } void DimRegionEdit::nullOutSampleReference() {