/[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 1460 by persson, Sat Oct 27 12:28:33 2007 UTC revision 2566 by schoenebeck, Tue May 20 14:35:36 2014 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006, 2007 Andreas Persson   * Copyright (C) 2006-2014 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 20  Line 20 
20  #include "dimregionedit.h"  #include "dimregionedit.h"
21    
22  #include "global.h"  #include "global.h"
23    #include "compat.h"
24    
25    VelocityCurve::VelocityCurve(double (gig::DimensionRegion::*getter)(uint8_t)) :
26        getter(getter), dimreg(0) {
27        set_size_request(80, 80);
28    }
29    
30    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
31    bool VelocityCurve::on_expose_event(GdkEventExpose* e) {
32        const Cairo::RefPtr<Cairo::Context>& cr =
33            get_window()->create_cairo_context();
34    #if 0
35    }
36    #endif
37    #else
38    bool VelocityCurve::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
39    #endif
40        if (dimreg) {
41            int w = get_width();
42            int h = get_height();
43    
44            for (int pass = 0 ; pass < 2 ; pass++) {
45                for (double x = 0 ; x <= w ; x++) {
46                    int vel = int(x * (127 - 1e-10) / w + 1);
47                    double y = (1 - (dimreg->*getter)(vel)) * (h - 3) + 1.5;
48    
49                    if (x < 1e-10) {
50                        cr->move_to(x, y);
51                    } else {
52                        cr->line_to(x, y);
53                    }
54                }
55                if (pass == 0) {
56                    cr->line_to(w, h);
57                    cr->line_to(0, h);
58                    cr->set_source_rgba(0.5, 0.44, 1.0, is_sensitive() ? 0.2 : 0.1);
59                    cr->fill();
60                } else {
61                    cr->set_line_width(3);
62                    cr->set_source_rgba(0.5, 0.44, 1.0, is_sensitive() ? 1.0 : 0.3);
63                    cr->stroke();
64                }
65            }
66        }
67        return true;
68    }
69    
70    
71    CrossfadeCurve::CrossfadeCurve() : dimreg(0) {
72        set_size_request(280, 80);
73    }
74    
75    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
76    bool CrossfadeCurve::on_expose_event(GdkEventExpose* e) {
77        const Cairo::RefPtr<Cairo::Context>& cr =
78            get_window()->create_cairo_context();
79    #if 0
80    }
81    #endif
82    #else
83    bool CrossfadeCurve::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
84    #endif
85        if (dimreg) {
86            cr->translate(1.5, 0);
87    
88            // first, draw curves for the other layers
89            gig::Region* region = dimreg->GetParent();
90            int dimregno;
91            for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
92                if (region->pDimensionRegions[dimregno] == dimreg) {
93                    break;
94                }
95            }
96            int bitcount = 0;
97            for (int dim = 0 ; dim < region->Dimensions ; dim++) {
98                if (region->pDimensionDefinitions[dim].dimension ==
99                    gig::dimension_layer) {
100                    int mask =
101                        ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<
102                          bitcount);
103                    int c = dimregno & mask; // mask away the layer dimension
104    
105                    for (int i = 0 ; i < region->pDimensionDefinitions[dim].zones ;
106                         i++) {
107                        gig::DimensionRegion* d =
108                            region->pDimensionRegions[c + (i << bitcount)];
109                        if (d != dimreg) {
110                            draw_one_curve(cr, d, false);
111                        }
112                    }
113                    break;
114                }
115                bitcount += region->pDimensionDefinitions[dim].bits;
116            }
117    
118            // then, draw the currently selected layer
119            draw_one_curve(cr, dimreg, is_sensitive());
120        }
121        return true;
122    }
123    
124    void CrossfadeCurve::draw_one_curve(const Cairo::RefPtr<Cairo::Context>& cr,
125                                        const gig::DimensionRegion* d,
126                                        bool sensitive) {
127        int w = get_width();
128        int h = get_height();
129    
130        if (d->Crossfade.out_end) {
131            for (int pass = 0 ; pass < 2 ; pass++) {
132                cr->move_to(d->Crossfade.in_start / 127.0 * (w - 3), h);
133                cr->line_to(d->Crossfade.in_end / 127.0 * (w - 3), 1.5);
134                cr->line_to(d->Crossfade.out_start / 127.0 * (w - 3), 1.5);
135                cr->line_to(d->Crossfade.out_end / 127.0 * (w - 3), h);
136    
137                if (pass == 0) {
138                    cr->set_source_rgba(0.5, 0.44, 1.0, sensitive ? 0.2 : 0.1);
139                    cr->fill();
140                } else {
141                    cr->set_line_width(3);
142                    cr->set_source_rgba(0.5, 0.44, 1.0, sensitive ? 1.0 : 0.3);
143                    cr->stroke();
144                }
145            }
146        }
147    }
148    
149    
150  DimRegionEdit::DimRegionEdit() :  DimRegionEdit::DimRegionEdit() :
151      eEG1PreAttack("Pre-attack", 0, 100, 2),      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),
152      eEG1Attack("Attack", 0, 60, 3),      release_curve(&gig::DimensionRegion::GetVelocityRelease),
153      eEG1Decay1("Decay 1", 0.005, 60, 3),      cutoff_curve(&gig::DimensionRegion::GetVelocityCutoff),
154      eEG1Decay2("Decay 2", 0, 60, 3),      eEG1PreAttack(_("Pre-attack Level (%)"), 0, 100, 2),
155      eEG1InfiniteSustain("Infinite sustain"),      eEG1Attack(_("Attack Time (seconds)"), 0, 60, 3),
156      eEG1Sustain("Sustain", 0, 100, 2),      eEG1Decay1(_("Decay 1 Time (seconds)"), 0.005, 60, 3),
157      eEG1Release("Release", 0, 60, 3),      eEG1Decay2(_("Decay 2 Time (seconds)"), 0, 60, 3),
158      eEG1Hold("Hold"),      eEG1InfiniteSustain(_("Infinite sustain")),
159      eEG1Controller("Controller"),      eEG1Sustain(_("Sustain Level (%)"), 0, 100, 2),
160      eEG1ControllerInvert("Controller invert"),      eEG1Release(_("Release Time (seconds)"), 0, 60, 3),
161      eEG1ControllerAttackInfluence("Controller attack influence", 0, 3),      eEG1Hold(_("Hold Attack Stage until Loop End")),
162      eEG1ControllerDecayInfluence("Controller decay influence", 0, 3),      eEG1Controller(_("Controller")),
163      eEG1ControllerReleaseInfluence("Controller release influence", 0, 3),      eEG1ControllerInvert(_("Controller invert")),
164      eLFO1Frequency("Frequency", 0.1, 10, 2),      eEG1ControllerAttackInfluence(_("Controller attack influence"), 0, 3),
165      eLFO1InternalDepth("Internal depth", 0, 1200),      eEG1ControllerDecayInfluence(_("Controller decay influence"), 0, 3),
166      eLFO1ControlDepth("Control depth", 0, 1200),      eEG1ControllerReleaseInfluence(_("Controller release influence"), 0, 3),
167      eLFO1Controller("Controller"),      eLFO1Frequency(_("Frequency"), 0.1, 10, 2),
168      eLFO1FlipPhase("Flip phase"),      eLFO1InternalDepth(_("Internal depth"), 0, 1200),
169      eLFO1Sync("Sync"),      eLFO1ControlDepth(_("Control depth"), 0, 1200),
170      eEG2PreAttack("Pre-attack", 0, 100, 2),      eLFO1Controller(_("Controller")),
171      eEG2Attack("Attack", 0, 60, 3),      eLFO1FlipPhase(_("Flip phase")),
172      eEG2Decay1("Decay 1", 0.005, 60, 3),      eLFO1Sync(_("Sync")),
173      eEG2Decay2("Decay 2", 0, 60, 3),      eEG2PreAttack(_("Pre-attack Level (%)"), 0, 100, 2),
174      eEG2InfiniteSustain("Infinite sustain"),      eEG2Attack(_("Attack Time (seconds)"), 0, 60, 3),
175      eEG2Sustain("Sustain", 0, 100, 2),      eEG2Decay1(_("Decay 1 Time (seconds)"), 0.005, 60, 3),
176      eEG2Release("Release", 0, 60, 3),      eEG2Decay2(_("Decay 2 Time (seconds)"), 0, 60, 3),
177      eEG2Controller("Controller"),      eEG2InfiniteSustain(_("Infinite sustain")),
178      eEG2ControllerInvert("Controller invert"),      eEG2Sustain(_("Sustain Level (%)"), 0, 100, 2),
179      eEG2ControllerAttackInfluence("Controller attack influence", 0, 3),      eEG2Release(_("Release Time (seconds)"), 0, 60, 3),
180      eEG2ControllerDecayInfluence("Controller decay influence", 0, 3),      eEG2Controller(_("Controller")),
181      eEG2ControllerReleaseInfluence("Controller release influence", 0, 3),      eEG2ControllerInvert(_("Controller invert")),
182      eLFO2Frequency("Frequency", 0.1, 10, 2),      eEG2ControllerAttackInfluence(_("Controller attack influence"), 0, 3),
183      eLFO2InternalDepth("Internal depth", 0, 1200),      eEG2ControllerDecayInfluence(_("Controller decay influence"), 0, 3),
184      eLFO2ControlDepth("Control depth", 0, 1200),      eEG2ControllerReleaseInfluence(_("Controller release influence"), 0, 3),
185      eLFO2Controller("Controller"),      eLFO2Frequency(_("Frequency"), 0.1, 10, 2),
186      eLFO2FlipPhase("Flip phase"),      eLFO2InternalDepth(_("Internal depth"), 0, 1200),
187      eLFO2Sync("Sync"),      eLFO2ControlDepth(_("Control depth"), 0, 1200),
188      eEG3Attack("Attack", 0, 10, 3),      eLFO2Controller(_("Controller")),
189      eEG3Depth("Depth", -1200, 1200),      eLFO2FlipPhase(_("Flip phase")),
190      eLFO3Frequency("Frequency", 0.1, 10, 2),      eLFO2Sync(_("Sync")),
191      eLFO3InternalDepth("Internal depth", 0, 1200),      eEG3Attack(_("Attack"), 0, 10, 3),
192      eLFO3ControlDepth("Control depth", 0, 1200),      eEG3Depth(_("Depth"), -1200, 1200),
193      eLFO3Controller("Controller"),      eLFO3Frequency(_("Frequency"), 0.1, 10, 2),
194      eLFO3Sync("Sync"),      eLFO3InternalDepth(_("Internal depth"), 0, 1200),
195      eVCFEnabled("Enabled"),      eLFO3ControlDepth(_("Control depth"), 0, 1200),
196      eVCFType("Type"),      eLFO3Controller(_("Controller")),
197      eVCFCutoffController("Cutoff controller"),      eLFO3Sync(_("Sync")),
198      eVCFCutoffControllerInvert("Cutoff controller invert"),      eVCFEnabled(_("Enabled")),
199      eVCFCutoff("Cutoff"),      eVCFType(_("Type")),
200      eVCFVelocityCurve("Velocity curve"),      eVCFCutoffController(_("Cutoff controller")),
201      eVCFVelocityScale("Velocity scale"),      eVCFCutoffControllerInvert(_("Cutoff controller invert")),
202      eVCFVelocityDynamicRange("Velocity dynamic range", 0, 4),      eVCFCutoff(_("Cutoff")),
203      eVCFResonance("Resonance"),      eVCFVelocityCurve(_("Velocity curve")),
204      eVCFResonanceDynamic("Resonance dynamic"),      eVCFVelocityScale(_("Velocity scale")),
205      eVCFResonanceController("Resonance controller"),      eVCFVelocityDynamicRange(_("Velocity dynamic range"), 0, 4),
206      eVCFKeyboardTracking("Keyboard tracking"),      eVCFResonance(_("Resonance")),
207      eVCFKeyboardTrackingBreakpoint("Keyboard tracking breakpoint"),      eVCFResonanceDynamic(_("Resonance dynamic")),
208      eVelocityResponseCurve("Velocity response curve"),      eVCFResonanceController(_("Resonance controller")),
209      eVelocityResponseDepth("Velocity response depth", 0, 4),      eVCFKeyboardTracking(_("Keyboard tracking")),
210      eVelocityResponseCurveScaling("Velocity response curve scaling"),      eVCFKeyboardTrackingBreakpoint(_("Keyboard tracking breakpoint")),
211      eReleaseVelocityResponseCurve("Release velocity response curve"),      eVelocityResponseCurve(_("Velocity response curve")),
212      eReleaseVelocityResponseDepth("Release velocity response depth", 0, 4),      eVelocityResponseDepth(_("Velocity response depth"), 0, 4),
213      eReleaseTriggerDecay("Release trigger decay", 0, 8),      eVelocityResponseCurveScaling(_("Velocity response curve scaling")),
214      eCrossfade_in_start("Crossfade-in start"),      eReleaseVelocityResponseCurve(_("Release velocity response curve")),
215      eCrossfade_in_end("Crossfade-in end"),      eReleaseVelocityResponseDepth(_("Release velocity response depth"), 0, 4),
216      eCrossfade_out_start("Crossfade-out start"),      eReleaseTriggerDecay(_("Release trigger decay"), 0, 8),
217      eCrossfade_out_end("Crossfade-out end"),      eCrossfade_in_start(_("Crossfade-in start")),
218      ePitchTrack("Pitch track"),      eCrossfade_in_end(_("Crossfade-in end")),
219      eDimensionBypass("Dimension bypass"),      eCrossfade_out_start(_("Crossfade-out start")),
220      ePan("Pan", -64, 63),      eCrossfade_out_end(_("Crossfade-out end")),
221      eSelfMask("Self mask"),      ePitchTrack(_("Pitch track")),
222      eAttenuationController("Attenuation controller"),      eDimensionBypass(_("Dimension bypass")),
223      eInvertAttenuationController("Invert attenuation controller"),      ePan(_("Pan"), -64, 63),
224      eAttenuationControllerThreshold("Attenuation controller threshold"),      eSelfMask(_("Kill lower velocity voices (a.k.a \"Self mask\")")),
225      eChannelOffset("Channel offset", 0, 9),      eAttenuationController(_("Attenuation controller")),
226      eSustainDefeat("Sustain defeat"),      eInvertAttenuationController(_("Invert attenuation controller")),
227      eMSDecode("MS decode"),      eAttenuationControllerThreshold(_("Attenuation controller threshold")),
228      eSampleStartOffset("Sample start offset", 0, 2000),      eChannelOffset(_("Channel offset"), 0, 9),
229      eUnityNote("Unity note"),      eSustainDefeat(_("Ignore Hold Pedal (a.k.a. \"Sustain defeat\")")),
230      eFineTune("Fine tune", -49, 50),      eMSDecode(_("Decode Mid/Side Recordings")),
231      eGain("Gain", -96, 0, 2, -655360),      eSampleStartOffset(_("Sample start offset"), 0, 2000),
232      eGainPlus6("Gain +6dB", eGain, 6 * -655360),      eUnityNote(_("Unity note")),
233      eSampleLoopEnabled("Enabled"),      eFineTune(_("Fine tune"), -49, 50),
234      eSampleLoopStart("Loop start positon"),      eGain(_("Gain"), -96, 0, 2, -655360),
235      eSampleLoopLength("Loop size"),      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),
236      eSampleLoopType("Loop type"),      eSampleLoopEnabled(_("Enabled")),
237      eSampleLoopInfinite("Infinite loop"),      eSampleLoopStart(_("Loop start positon")),
238      eSampleLoopPlayCount("Playback count", 1),      eSampleLoopLength(_("Loop size")),
239        eSampleLoopType(_("Loop type")),
240        eSampleLoopInfinite(_("Infinite loop")),
241        eSampleLoopPlayCount(_("Playback count"), 1),
242      update_model(0)      update_model(0)
243  {  {
244      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);
# Line 259  DimRegionEdit::DimRegionEdit() : Line 388  DimRegionEdit::DimRegionEdit() :
388            "Caution: this setting is stored on Sample side, thus is shared "            "Caution: this setting is stored on Sample side, thus is shared "
389            "among all dimension regions that use this sample!")            "among all dimension regions that use this sample!")
390      );      );
391        
392        eEG1PreAttack.set_tip(
393            "Very first level this EG starts with. It rises then in Attack Time "
394            "seconds from this initial level to 100%."
395        );
396        eEG1Attack.set_tip(
397            "Duration of the EG's Attack stage, which raises its level from "
398            "Pre-Attack Level to 100%."
399        );
400        eEG1Hold.set_tip(
401           "On looped sounds, enabling this will cause the Decay 1 stage not to "
402           "enter before the loop has been passed one time."
403        );
404        eAttenuationController.set_tip(_(
405            "If you are not using the 'Layer' dimension, then this controller "
406            "simply alters the volume. If you are using the 'Layer' dimension, "
407            "then this controller is controlling the crossfade between Layers in "
408            "real-time."
409        ));
410    
411        eLFO1Sync.set_tip(
412            "If not checked, every voice will use its own LFO instance, which "
413            "causes voices triggered at different points in time to have different "
414            "LFO levels. By enabling 'Sync' here the voices will instead use and "
415            "share one single LFO, causing all voices to have the same LFO level, "
416            "no matter when the individual notes have been triggered."
417        );
418        eLFO2Sync.set_tip(
419            "If not checked, every voice will use its own LFO instance, which "
420            "causes voices triggered at different points in time to have different "
421            "LFO levels. By enabling 'Sync' here the voices will instead use and "
422            "share one single LFO, causing all voices to have the same LFO level, "
423            "no matter when the individual notes have been triggered."
424        );
425        eLFO3Sync.set_tip(
426            "If not checked, every voice will use its own LFO instance, which "
427            "causes voices triggered at different points in time to have different "
428            "LFO levels. By enabling 'Sync' here the voices will instead use and "
429            "share one single LFO, causing all voices to have the same LFO level, "
430            "no matter when the individual notes have been triggered."
431        );
432        eLFO1FlipPhase.set_tip(
433           "Inverts the LFO's generated wave vertically."
434        );
435        eLFO2FlipPhase.set_tip(
436           "Inverts the LFO's generated wave vertically."
437        );
438    
439      pageno = 0;      pageno = 0;
440      rowno = 0;      rowno = 0;
441      firstRowInBlock = 0;      firstRowInBlock = 0;
442    
443      addHeader(_("Mandatory Settings"));      addHeader(_("Mandatory Settings"));
444      addString("Sample", lSample, wSample);      addString(_("Sample"), lSample, wSample);
445      //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);
446      tooltips.set_tip(*wSample, _("Drop a sample here"));  #ifdef OLD_TOOLTIPS
447        tooltips.set_tip(*wSample, _("Drag & drop a sample here"));
448    #else
449        wSample->set_tooltip_text(_("Drag & drop a sample here"));
450    #endif
451      addProp(eUnityNote);      addProp(eUnityNote);
452      addHeader(_("Optional Settings"));      addHeader(_("Optional Settings"));
453      addProp(eSampleStartOffset);      addProp(eSampleStartOffset);
454      addProp(eChannelOffset);      addProp(eChannelOffset);
455      addHeader("Loops");      addHeader(_("Loops"));
456      addProp(eSampleLoopEnabled);      addProp(eSampleLoopEnabled);
457      addProp(eSampleLoopStart);      addProp(eSampleLoopStart);
458      addProp(eSampleLoopLength);      addProp(eSampleLoopLength);
459      {      {
460          const char* choices[] = { "normal", "bidirectional", "backward", 0 };          const char* choices[] = { _("normal"), _("bidirectional"), _("backward"), 0 };
461          static const uint32_t values[] = {          static const uint32_t values[] = {
462              gig::loop_type_normal,              gig::loop_type_normal,
463              gig::loop_type_bidirectional,              gig::loop_type_bidirectional,
# Line 298  DimRegionEdit::DimRegionEdit() : Line 478  DimRegionEdit::DimRegionEdit() :
478      addHeader(_("Amplitude Envelope (EG1)"));      addHeader(_("Amplitude Envelope (EG1)"));
479      addProp(eEG1PreAttack);      addProp(eEG1PreAttack);
480      addProp(eEG1Attack);      addProp(eEG1Attack);
481        addProp(eEG1Hold);
482      addProp(eEG1Decay1);      addProp(eEG1Decay1);
483      addProp(eEG1Decay2);      addProp(eEG1Decay2);
484      addProp(eEG1InfiniteSustain);      addProp(eEG1InfiniteSustain);
485      addProp(eEG1Sustain);      addProp(eEG1Sustain);
486      addProp(eEG1Release);      addProp(eEG1Release);
     addProp(eEG1Hold);  
487      addProp(eEG1Controller);      addProp(eEG1Controller);
488      addProp(eEG1ControllerInvert);      addProp(eEG1ControllerInvert);
489      addProp(eEG1ControllerAttackInfluence);      addProp(eEG1ControllerAttackInfluence);
# Line 317  DimRegionEdit::DimRegionEdit() : Line 497  DimRegionEdit::DimRegionEdit() :
497      addProp(eLFO1InternalDepth);      addProp(eLFO1InternalDepth);
498      addProp(eLFO1ControlDepth);      addProp(eLFO1ControlDepth);
499      {      {
500          const char* choices[] = { "internal", "modwheel", "breath",          const char* choices[] = { _("internal"), _("modwheel"), _("breath"),
501                                    "internal+modwheel", "internal+breath", 0 };                                    _("internal+modwheel"), _("internal+breath"), 0 };
502          static const gig::lfo1_ctrl_t values[] = {          static const gig::lfo1_ctrl_t values[] = {
503              gig::lfo1_ctrl_internal,              gig::lfo1_ctrl_internal,
504              gig::lfo1_ctrl_modwheel,              gig::lfo1_ctrl_modwheel,
# Line 331  DimRegionEdit::DimRegionEdit() : Line 511  DimRegionEdit::DimRegionEdit() :
511      addProp(eLFO1Controller);      addProp(eLFO1Controller);
512      addProp(eLFO1FlipPhase);      addProp(eLFO1FlipPhase);
513      addProp(eLFO1Sync);      addProp(eLFO1Sync);
514      addHeader("Crossfade");      addHeader(_("Crossfade"));
515      addProp(eAttenuationController);      addProp(eAttenuationController);
516      addProp(eInvertAttenuationController);      addProp(eInvertAttenuationController);
517      addProp(eAttenuationControllerThreshold);      addProp(eAttenuationControllerThreshold);
# Line 340  DimRegionEdit::DimRegionEdit() : Line 520  DimRegionEdit::DimRegionEdit() :
520      addProp(eCrossfade_out_start);      addProp(eCrossfade_out_start);
521      addProp(eCrossfade_out_end);      addProp(eCrossfade_out_end);
522    
523        Gtk::Frame* frame = new Gtk::Frame;
524        frame->add(crossfade_curve);
525        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
526                              Gtk::SHRINK, Gtk::SHRINK);
527        rowno++;
528    
529        eCrossfade_in_start.signal_value_changed().connect(
530            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
531        eCrossfade_in_end.signal_value_changed().connect(
532            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
533        eCrossfade_out_start.signal_value_changed().connect(
534            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
535        eCrossfade_out_end.signal_value_changed().connect(
536            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
537    
538      nextPage();      nextPage();
539    
540      addHeader(_("General Filter Settings"));      addHeader(_("General Filter Settings"));
541      addProp(eVCFEnabled);      addProp(eVCFEnabled);
542      {      {
543          const char* choices[] = { "lowpass", "lowpassturbo", "bandpass",          const char* choices[] = { _("lowpass"), _("lowpassturbo"), _("bandpass"),
544                                    "highpass", "bandreject", 0 };                                    _("highpass"), _("bandreject"), 0 };
545          static const gig::vcf_type_t values[] = {          static const gig::vcf_type_t values[] = {
546              gig::vcf_type_lowpass,              gig::vcf_type_lowpass,
547              gig::vcf_type_lowpassturbo,              gig::vcf_type_lowpassturbo,
# Line 358  DimRegionEdit::DimRegionEdit() : Line 553  DimRegionEdit::DimRegionEdit() :
553      }      }
554      addProp(eVCFType);      addProp(eVCFType);
555      {      {
556          const char* choices[] = { "none", "none2", "modwheel", "effect1", "effect2",          const char* choices[] = { _("none"), _("none2"), _("modwheel"), _("effect1"), _("effect2"),
557                                    "breath", "foot", "sustainpedal", "softpedal",                                    _("breath"), _("foot"), _("sustainpedal"), _("softpedal"),
558                                    "genpurpose7", "genpurpose8", "aftertouch", 0 };                                    _("genpurpose7"), _("genpurpose8"), _("aftertouch"), 0 };
559          static const gig::vcf_cutoff_ctrl_t values[] = {          static const gig::vcf_cutoff_ctrl_t values[] = {
560              gig::vcf_cutoff_ctrl_none,              gig::vcf_cutoff_ctrl_none,
561              gig::vcf_cutoff_ctrl_none2,              gig::vcf_cutoff_ctrl_none2,
# Line 380  DimRegionEdit::DimRegionEdit() : Line 575  DimRegionEdit::DimRegionEdit() :
575      addProp(eVCFCutoffController);      addProp(eVCFCutoffController);
576      addProp(eVCFCutoffControllerInvert);      addProp(eVCFCutoffControllerInvert);
577      addProp(eVCFCutoff);      addProp(eVCFCutoff);
578      const char* curve_type_texts[] = { "nonlinear", "linear", "special", 0 };      const char* curve_type_texts[] = { _("nonlinear"), _("linear"), _("special"), 0 };
579      static const gig::curve_type_t curve_type_values[] = {      static const gig::curve_type_t curve_type_values[] = {
580          gig::curve_type_nonlinear,          gig::curve_type_nonlinear,
581          gig::curve_type_linear,          gig::curve_type_linear,
# Line 390  DimRegionEdit::DimRegionEdit() : Line 585  DimRegionEdit::DimRegionEdit() :
585      addProp(eVCFVelocityCurve);      addProp(eVCFVelocityCurve);
586      addProp(eVCFVelocityScale);      addProp(eVCFVelocityScale);
587      addProp(eVCFVelocityDynamicRange);      addProp(eVCFVelocityDynamicRange);
588    
589        eVCFCutoffController.signal_value_changed().connect(
590            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
591        eVCFVelocityCurve.signal_value_changed().connect(
592            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
593        eVCFVelocityScale.signal_value_changed().connect(
594            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
595        eVCFVelocityDynamicRange.signal_value_changed().connect(
596            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
597    
598        frame = new Gtk::Frame;
599        frame->add(cutoff_curve);
600        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
601                              Gtk::SHRINK, Gtk::SHRINK);
602        rowno++;
603    
604      addProp(eVCFResonance);      addProp(eVCFResonance);
605      addProp(eVCFResonanceDynamic);      addProp(eVCFResonanceDynamic);
606      {      {
607          const char* choices[] = { "none", "genpurpose3", "genpurpose4",          const char* choices[] = { _("none"), _("genpurpose3"), _("genpurpose4"),
608                                    "genpurpose5", "genpurpose6", 0 };                                    _("genpurpose5"), _("genpurpose6"), 0 };
609          static const gig::vcf_res_ctrl_t values[] = {          static const gig::vcf_res_ctrl_t values[] = {
610              gig::vcf_res_ctrl_none,              gig::vcf_res_ctrl_none,
611              gig::vcf_res_ctrl_genpurpose3,              gig::vcf_res_ctrl_genpurpose3,
# Line 410  DimRegionEdit::DimRegionEdit() : Line 621  DimRegionEdit::DimRegionEdit() :
621    
622      nextPage();      nextPage();
623    
624      addHeader(_("Filter Cutoff Envelope (EG2)"));      lEG2 = addHeader(_("Filter Cutoff Envelope (EG2)"));
625      addProp(eEG2PreAttack);      addProp(eEG2PreAttack);
626      addProp(eEG2Attack);      addProp(eEG2Attack);
627      addProp(eEG2Decay1);      addProp(eEG2Decay1);
# Line 423  DimRegionEdit::DimRegionEdit() : Line 634  DimRegionEdit::DimRegionEdit() :
634      addProp(eEG2ControllerAttackInfluence);      addProp(eEG2ControllerAttackInfluence);
635      addProp(eEG2ControllerDecayInfluence);      addProp(eEG2ControllerDecayInfluence);
636      addProp(eEG2ControllerReleaseInfluence);      addProp(eEG2ControllerReleaseInfluence);
637      addHeader(_("Filter Cutoff Oscillator (LFO2)"));      lLFO2 = addHeader(_("Filter Cutoff Oscillator (LFO2)"));
638      addProp(eLFO2Frequency);      addProp(eLFO2Frequency);
639      addProp(eLFO2InternalDepth);      addProp(eLFO2InternalDepth);
640      addProp(eLFO2ControlDepth);      addProp(eLFO2ControlDepth);
641      {      {
642          const char* choices[] = { "internal", "modwheel", "foot",          const char* choices[] = { _("internal"), _("modwheel"), _("foot"),
643                                    "internal+modwheel", "internal+foot", 0 };                                    _("internal+modwheel"), _("internal+foot"), 0 };
644          static const gig::lfo2_ctrl_t values[] = {          static const gig::lfo2_ctrl_t values[] = {
645              gig::lfo2_ctrl_internal,              gig::lfo2_ctrl_internal,
646              gig::lfo2_ctrl_modwheel,              gig::lfo2_ctrl_modwheel,
# Line 456  DimRegionEdit::DimRegionEdit() : Line 667  DimRegionEdit::DimRegionEdit() :
667      addProp(eLFO3InternalDepth);      addProp(eLFO3InternalDepth);
668      addProp(eLFO3ControlDepth);      addProp(eLFO3ControlDepth);
669      {      {
670          const char* choices[] = { "internal", "modwheel", "aftertouch",          const char* choices[] = { _("internal"), _("modwheel"), _("aftertouch"),
671                                    "internal+modwheel", "internal+aftertouch", 0 };                                    _("internal+modwheel"), _("internal+aftertouch"), 0 };
672          static const gig::lfo3_ctrl_t values[] = {          static const gig::lfo3_ctrl_t values[] = {
673              gig::lfo3_ctrl_internal,              gig::lfo3_ctrl_internal,
674              gig::lfo3_ctrl_modwheel,              gig::lfo3_ctrl_modwheel,
# Line 472  DimRegionEdit::DimRegionEdit() : Line 683  DimRegionEdit::DimRegionEdit() :
683    
684      nextPage();      nextPage();
685    
686        addHeader(_("Velocity Response"));
687      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);
688      addProp(eVelocityResponseCurve);      addProp(eVelocityResponseCurve);
689      addProp(eVelocityResponseDepth);      addProp(eVelocityResponseDepth);
690      addProp(eVelocityResponseCurveScaling);      addProp(eVelocityResponseCurveScaling);
691    
692        eVelocityResponseCurve.signal_value_changed().connect(
693            sigc::mem_fun(velocity_curve, &VelocityCurve::queue_draw));
694        eVelocityResponseDepth.signal_value_changed().connect(
695            sigc::mem_fun(velocity_curve, &VelocityCurve::queue_draw));
696        eVelocityResponseCurveScaling.signal_value_changed().connect(
697            sigc::mem_fun(velocity_curve, &VelocityCurve::queue_draw));
698    
699        frame = new Gtk::Frame;
700        frame->add(velocity_curve);
701        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
702                              Gtk::SHRINK, Gtk::SHRINK);
703        rowno++;
704    
705        addHeader(_("Release Velocity Response"));
706      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,
707                                                curve_type_values);                                                curve_type_values);
708      addProp(eReleaseVelocityResponseCurve);      addProp(eReleaseVelocityResponseCurve);
709      addProp(eReleaseVelocityResponseDepth);      addProp(eReleaseVelocityResponseDepth);
710    
711        eReleaseVelocityResponseCurve.signal_value_changed().connect(
712            sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
713        eReleaseVelocityResponseDepth.signal_value_changed().connect(
714            sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
715        frame = new Gtk::Frame;
716        frame->add(release_curve);
717        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
718                              Gtk::SHRINK, Gtk::SHRINK);
719        rowno++;
720    
721      addProp(eReleaseTriggerDecay);      addProp(eReleaseTriggerDecay);
722      {      {
723          const char* choices[] = { "none", "effect4depth", "effect5depth", 0 };          const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 };
724          static const gig::dim_bypass_ctrl_t values[] = {          static const gig::dim_bypass_ctrl_t values[] = {
725              gig::dim_bypass_ctrl_none,              gig::dim_bypass_ctrl_none,
726              gig::dim_bypass_ctrl_94,              gig::dim_bypass_ctrl_94,
# Line 491  DimRegionEdit::DimRegionEdit() : Line 729  DimRegionEdit::DimRegionEdit() :
729          eDimensionBypass.set_choices(choices, values);          eDimensionBypass.set_choices(choices, values);
730      }      }
731      addProp(eDimensionBypass);      addProp(eDimensionBypass);
732        eSelfMask.widget.set_tooltip_text(_(
733            "If enabled: new notes with higher velocity value will stop older "
734            "notes with lower velocity values, that way you can save voices that "
735            "would barely be audible. This is also useful for certain drum sounds."
736        ));
737      addProp(eSelfMask);      addProp(eSelfMask);
738        eSustainDefeat.widget.set_tooltip_text(_(
739            "If enabled: sustain pedal will not hold a note. This way you can use "
740            "the sustain pedal for other purposes, for example to switch among "
741            "dimension regions."
742        ));
743      addProp(eSustainDefeat);      addProp(eSustainDefeat);
744        eMSDecode.widget.set_tooltip_text(_(
745            "Defines if Mid/Side Recordings should be decoded. Mid/Side Recordings "
746            "are an alternative way to record sounds in stereo. The sampler needs "
747            "to decode such samples to actually make use of them. Note: this "
748            "feature is currently not supported by LinuxSampler."
749        ));
750      addProp(eMSDecode);      addProp(eMSDecode);
751    
752      nextPage();      nextPage();
# Line 539  DimRegionEdit::DimRegionEdit() : Line 793  DimRegionEdit::DimRegionEdit() :
793      eSampleLoopInfinite.signal_value_changed().connect(      eSampleLoopInfinite.signal_value_changed().connect(
794          sigc::mem_fun(*this, &DimRegionEdit::loop_infinite_toggled));          sigc::mem_fun(*this, &DimRegionEdit::loop_infinite_toggled));
795    
796      append_page(*table[0], "Sample");      append_page(*table[0], _("Sample"));
797      append_page(*table[1], "Amplitude (1)");      append_page(*table[1], _("Amplitude (1)"));
798      append_page(*table[2], "Amplitude (2)");      append_page(*table[2], _("Amplitude (2)"));
799      append_page(*table[3], "Filter (1)");      append_page(*table[3], _("Filter (1)"));
800      append_page(*table[4], "Filter (2)");      append_page(*table[4], _("Filter (2)"));
801      append_page(*table[5], "Pitch");      append_page(*table[5], _("Pitch"));
802      append_page(*table[6], "Misc");      append_page(*table[6], _("Misc"));
803  }  }
804    
805  DimRegionEdit::~DimRegionEdit()  DimRegionEdit::~DimRegionEdit()
# Line 556  void DimRegionEdit::addString(const char Line 810  void DimRegionEdit::addString(const char
810                                Gtk::Entry*& widget)                                Gtk::Entry*& widget)
811  {  {
812      label = new Gtk::Label(Glib::ustring(labelText) + ":");      label = new Gtk::Label(Glib::ustring(labelText) + ":");
813      label->set_alignment(Gtk::ALIGN_LEFT);      label->set_alignment(Gtk::ALIGN_START);
814    
815      table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,      table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,
816                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
# Line 569  void DimRegionEdit::addString(const char Line 823  void DimRegionEdit::addString(const char
823      rowno++;      rowno++;
824  }  }
825    
826  void DimRegionEdit::addHeader(const char* text)  Gtk::Label* DimRegionEdit::addHeader(const char* text)
827  {  {
828      if (firstRowInBlock < rowno - 1)      if (firstRowInBlock < rowno - 1)
829      {      {
# Line 582  void DimRegionEdit::addHeader(const char Line 836  void DimRegionEdit::addHeader(const char
836      str += "</b>";      str += "</b>";
837      Gtk::Label* label = new Gtk::Label(str);      Gtk::Label* label = new Gtk::Label(str);
838      label->set_use_markup();      label->set_use_markup();
839      label->set_alignment(Gtk::ALIGN_LEFT);      label->set_alignment(Gtk::ALIGN_START);
840      table[pageno]->attach(*label, 0, 3, rowno, rowno + 1,      table[pageno]->attach(*label, 0, 3, rowno, rowno + 1,
841                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
842      rowno++;      rowno++;
843      firstRowInBlock = rowno;      firstRowInBlock = rowno;
844        return label;
845  }  }
846    
847  void DimRegionEdit::nextPage()  void DimRegionEdit::nextPage()
# Line 629  void DimRegionEdit::addProp(LabelWidget& Line 884  void DimRegionEdit::addProp(LabelWidget&
884  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)
885  {  {
886      dimregion = d;      dimregion = d;
887        velocity_curve.set_dim_region(d);
888        release_curve.set_dim_region(d);
889        cutoff_curve.set_dim_region(d);
890        crossfade_curve.set_dim_region(d);
891    
892      set_sensitive(d);      set_sensitive(d);
893      if (!d) return;      if (!d) return;
894    
     // TODO: Here is where we decide which dimregions that are going  
     // to be modified when the user changes a parameter. For now, just  
     // choose the shown dimregion.  
     dimregs.clear();  
     dimregs.insert(d);  
   
895      update_model++;      update_model++;
896      eEG1PreAttack.set_value(d->EG1PreAttack);      eEG1PreAttack.set_value(d->EG1PreAttack);
897      eEG1Attack.set_value(d->EG1Attack);      eEG1Attack.set_value(d->EG1Attack);
# Line 735  void DimRegionEdit::set_dim_region(gig:: Line 988  void DimRegionEdit::set_dim_region(gig::
988          d->pSample ? d->pSample->LoopPlayCount : 0);          d->pSample ? d->pSample->LoopPlayCount : 0);
989      update_model--;      update_model--;
990    
991      wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : "NULL");      wSample->set_text(d->pSample ? gig_to_utf8(d->pSample->pInfo->Name) :
992                          _("NULL"));
993    
994      update_loop_elements();      update_loop_elements();
995      VCFEnabled_toggled();      VCFEnabled_toggled();
# Line 750  void DimRegionEdit::VCFEnabled_toggled() Line 1004  void DimRegionEdit::VCFEnabled_toggled()
1004      eVCFVelocityCurve.set_sensitive(sensitive);      eVCFVelocityCurve.set_sensitive(sensitive);
1005      eVCFVelocityScale.set_sensitive(sensitive);      eVCFVelocityScale.set_sensitive(sensitive);
1006      eVCFVelocityDynamicRange.set_sensitive(sensitive);      eVCFVelocityDynamicRange.set_sensitive(sensitive);
1007        cutoff_curve.set_sensitive(sensitive);
1008      eVCFResonance.set_sensitive(sensitive);      eVCFResonance.set_sensitive(sensitive);
1009      eVCFResonanceController.set_sensitive(sensitive);      eVCFResonanceController.set_sensitive(sensitive);
1010      eVCFKeyboardTracking.set_sensitive(sensitive);      eVCFKeyboardTracking.set_sensitive(sensitive);
1011      eVCFKeyboardTrackingBreakpoint.set_sensitive(sensitive);      eVCFKeyboardTrackingBreakpoint.set_sensitive(sensitive);
1012        lEG2->set_sensitive(sensitive);
1013      eEG2PreAttack.set_sensitive(sensitive);      eEG2PreAttack.set_sensitive(sensitive);
1014      eEG2Attack.set_sensitive(sensitive);      eEG2Attack.set_sensitive(sensitive);
1015      eEG2Decay1.set_sensitive(sensitive);      eEG2Decay1.set_sensitive(sensitive);
# Line 764  void DimRegionEdit::VCFEnabled_toggled() Line 1020  void DimRegionEdit::VCFEnabled_toggled()
1020      eEG2ControllerAttackInfluence.set_sensitive(sensitive);      eEG2ControllerAttackInfluence.set_sensitive(sensitive);
1021      eEG2ControllerDecayInfluence.set_sensitive(sensitive);      eEG2ControllerDecayInfluence.set_sensitive(sensitive);
1022      eEG2ControllerReleaseInfluence.set_sensitive(sensitive);      eEG2ControllerReleaseInfluence.set_sensitive(sensitive);
1023        lLFO2->set_sensitive(sensitive);
1024      eLFO2Frequency.set_sensitive(sensitive);      eLFO2Frequency.set_sensitive(sensitive);
1025      eLFO2InternalDepth.set_sensitive(sensitive);      eLFO2InternalDepth.set_sensitive(sensitive);
1026      eLFO2ControlDepth.set_sensitive(sensitive);      eLFO2ControlDepth.set_sensitive(sensitive);
# Line 796  void DimRegionEdit::VCFCutoffController_ Line 1053  void DimRegionEdit::VCFCutoffController_
1053      eVCFCutoffControllerInvert.set_sensitive(hasController);      eVCFCutoffControllerInvert.set_sensitive(hasController);
1054      eVCFCutoff.set_sensitive(!hasController);      eVCFCutoff.set_sensitive(!hasController);
1055      eVCFResonanceDynamic.set_sensitive(!hasController);      eVCFResonanceDynamic.set_sensitive(!hasController);
1056      eVCFVelocityScale.label.set_text(hasController ? "Minimum cutoff:" :      eVCFVelocityScale.label.set_text(hasController ? _("Minimum cutoff:") :
1057                                       "Velocity scale:");                                       _("Velocity scale:"));
1058  }  }
1059    
1060  void DimRegionEdit::VCFResonanceController_changed()  void DimRegionEdit::VCFResonanceController_changed()
# Line 840  void DimRegionEdit::AttenuationControlle Line 1097  void DimRegionEdit::AttenuationControlle
1097      eCrossfade_in_end.set_sensitive(hasController);      eCrossfade_in_end.set_sensitive(hasController);
1098      eCrossfade_out_start.set_sensitive(hasController);      eCrossfade_out_start.set_sensitive(hasController);
1099      eCrossfade_out_end.set_sensitive(hasController);      eCrossfade_out_end.set_sensitive(hasController);
1100        crossfade_curve.set_sensitive(hasController);
1101  }  }
1102    
1103  void DimRegionEdit::LFO1Controller_changed()  void DimRegionEdit::LFO1Controller_changed()
# Line 953  void DimRegionEdit::loop_infinite_toggle Line 1211  void DimRegionEdit::loop_infinite_toggle
1211      update_model--;      update_model--;
1212  }  }
1213    
1214  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)
1215  {  {
1216      if (dimregion) {      if (dimregion) {
1217          //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
# Line 961  bool DimRegionEdit::set_sample(gig::Samp Line 1219  bool DimRegionEdit::set_sample(gig::Samp
1219          // 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()
1220          //dimreg_to_be_changed_signal.emit(dimregion);          //dimreg_to_be_changed_signal.emit(dimregion);
1221    
1222          gig::Sample* oldref = dimregion->pSample;          // make sure stereo samples always are the same in both
1223          dimregion->pSample = sample;          // dimregs in the samplechannel dimension
1224            int nbDimregs = 1;
1225            gig::DimensionRegion* d[2] = { dimregion, 0 };
1226            if (sample->Channels == 2) {
1227                gig::Region* region = dimregion->GetParent();
1228    
1229                int bitcount = 0;
1230                int stereo_bit = 0;
1231                for (int dim = 0 ; dim < region->Dimensions ; dim++) {
1232                    if (region->pDimensionDefinitions[dim].dimension == gig::dimension_samplechannel) {
1233                        stereo_bit = 1 << bitcount;
1234                        break;
1235                    }
1236                    bitcount += region->pDimensionDefinitions[dim].bits;
1237                }
1238    
1239                if (stereo_bit) {
1240                    int dimregno;
1241                    for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1242                        if (region->pDimensionRegions[dimregno] == dimregion) {
1243                            break;
1244                        }
1245                    }
1246                    d[0] = region->pDimensionRegions[dimregno & ~stereo_bit];
1247                    d[1] = region->pDimensionRegions[dimregno | stereo_bit];
1248                    nbDimregs = 2;
1249                }
1250            }
1251    
1252          // copy sample information from Sample to DimensionRegion          gig::Sample* oldref = dimregion->pSample;
1253    
1254          dimregion->UnityNote = sample->MIDIUnityNote;          for (int i = 0 ; i < nbDimregs ; i++) {
1255          dimregion->FineTune = sample->FineTune;              d[i]->pSample = sample;
1256    
1257          int loops = sample->Loops ? 1 : 0;              // copy sample information from Sample to DimensionRegion
1258          while (dimregion->SampleLoops > loops) {              if (copy_sample_unity)
1259              dimregion->DeleteSampleLoop(&dimregion->pSampleLoops[0]);                  d[i]->UnityNote = sample->MIDIUnityNote;
1260          }              if (copy_sample_tune)
1261          while (dimregion->SampleLoops < sample->Loops) {                  d[i]->FineTune = sample->FineTune;
1262              DLS::sample_loop_t loop;              if (copy_sample_loop) {
1263              dimregion->AddSampleLoop(&loop);                  int loops = sample->Loops ? 1 : 0;
1264          }                  while (d[i]->SampleLoops > loops) {
1265          if (loops) {                      d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);
1266              dimregion->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);                  }
1267              dimregion->pSampleLoops[0].LoopType = sample->LoopType;                  while (d[i]->SampleLoops < sample->Loops) {
1268              dimregion->pSampleLoops[0].LoopStart = sample->LoopStart;                      DLS::sample_loop_t loop;
1269              dimregion->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;                      d[i]->AddSampleLoop(&loop);
1270                    }
1271                    if (loops) {
1272                        d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);
1273                        d[i]->pSampleLoops[0].LoopType = sample->LoopType;
1274                        d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;
1275                        d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;
1276                    }
1277                }
1278          }          }
1279    
1280          // update ui          // update ui
1281          update_model++;          update_model++;
1282          wSample->set_text(dimregion->pSample->pInfo->Name);          wSample->set_text(gig_to_utf8(dimregion->pSample->pInfo->Name));
1283          eUnityNote.set_value(dimregion->UnityNote);          eUnityNote.set_value(dimregion->UnityNote);
1284          eFineTune.set_value(dimregion->FineTune);          eFineTune.set_value(dimregion->FineTune);
1285          eSampleLoopEnabled.set_value(dimregion->SampleLoops);          eSampleLoopEnabled.set_value(dimregion->SampleLoops);

Legend:
Removed from v.1460  
changed lines
  Added in v.2566

  ViewVC Help
Powered by ViewVC