/[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 1623 by persson, Fri Jan 4 19:42:45 2008 UTC revision 2691 by schoenebeck, Sun Jan 4 19:46:54 2015 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2008 Andreas Persson   * Copyright (C) 2006-2015 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"),      eSampleFormatInfo(_("Sample Format")),
234      eSampleLoopStart("Loop start positon"),      eSampleID("Sample ID"),
235      eSampleLoopLength("Loop size"),      eFineTune(_("Fine tune"), -49, 50),
236      eSampleLoopType("Loop type"),      eGain(_("Gain"), -96, 0, 2, -655360),
237      eSampleLoopInfinite("Infinite loop"),      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),
238      eSampleLoopPlayCount("Playback count", 1),      eSampleLoopEnabled(_("Enabled")),
239        eSampleLoopStart(_("Loop start positon")),
240        eSampleLoopLength(_("Loop size")),
241        eSampleLoopType(_("Loop type")),
242        eSampleLoopInfinite(_("Infinite loop")),
243        eSampleLoopPlayCount(_("Playback count"), 1),
244        buttonSelectSample(Glib::ustring("<- ") + _("Select Sample")),
245      update_model(0)      update_model(0)
246  {  {
247      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);
# Line 219  DimRegionEdit::DimRegionEdit() : Line 351  DimRegionEdit::DimRegionEdit() :
351      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);
352      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);
353      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);
354        buttonSelectSample.signal_clicked().connect(
355            sigc::mem_fun(*this, &DimRegionEdit::onButtonSelectSamplePressed)
356        );
357    
358      for (int i = 0 ; i < 7 ; i++) {      for (int i = 0 ; i < 7 ; i++) {
359          table[i] = new Gtk::Table(3, 1);          table[i] = new Gtk::Table(3, 1);
# Line 229  DimRegionEdit::DimRegionEdit() : Line 364  DimRegionEdit::DimRegionEdit() :
364      eUnityNote.set_tip(      eUnityNote.set_tip(
365          _("Note this sample is associated with (a.k.a. 'root note')")          _("Note this sample is associated with (a.k.a. 'root note')")
366      );      );
367        buttonSelectSample.set_tooltip_text(
368            _("Selects the sample of this dimension region on the left hand side's sample tree view.")
369        );
370      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));
371      ePan.set_tip(_("Stereo balance (left/right)"));      ePan.set_tip(_("Stereo balance (left/right)"));
372      eChannelOffset.set_tip(      eChannelOffset.set_tip(
# Line 259  DimRegionEdit::DimRegionEdit() : Line 397  DimRegionEdit::DimRegionEdit() :
397            "Caution: this setting is stored on Sample side, thus is shared "            "Caution: this setting is stored on Sample side, thus is shared "
398            "among all dimension regions that use this sample!")            "among all dimension regions that use this sample!")
399      );      );
400        
401        eEG1PreAttack.set_tip(
402            "Very first level this EG starts with. It rises then in Attack Time "
403            "seconds from this initial level to 100%."
404        );
405        eEG1Attack.set_tip(
406            "Duration of the EG's Attack stage, which raises its level from "
407            "Pre-Attack Level to 100%."
408        );
409        eEG1Hold.set_tip(
410           "On looped sounds, enabling this will cause the Decay 1 stage not to "
411           "enter before the loop has been passed one time."
412        );
413        eAttenuationController.set_tip(_(
414            "If you are not using the 'Layer' dimension, then this controller "
415            "simply alters the volume. If you are using the 'Layer' dimension, "
416            "then this controller is controlling the crossfade between Layers in "
417            "real-time."
418        ));
419    
420        eLFO1Sync.set_tip(
421            "If not checked, every voice will use its own LFO instance, which "
422            "causes voices triggered at different points in time to have different "
423            "LFO levels. By enabling 'Sync' here the voices will instead use and "
424            "share one single LFO, causing all voices to have the same LFO level, "
425            "no matter when the individual notes have been triggered."
426        );
427        eLFO2Sync.set_tip(
428            "If not checked, every voice will use its own LFO instance, which "
429            "causes voices triggered at different points in time to have different "
430            "LFO levels. By enabling 'Sync' here the voices will instead use and "
431            "share one single LFO, causing all voices to have the same LFO level, "
432            "no matter when the individual notes have been triggered."
433        );
434        eLFO3Sync.set_tip(
435            "If not checked, every voice will use its own LFO instance, which "
436            "causes voices triggered at different points in time to have different "
437            "LFO levels. By enabling 'Sync' here the voices will instead use and "
438            "share one single LFO, causing all voices to have the same LFO level, "
439            "no matter when the individual notes have been triggered."
440        );
441        eLFO1FlipPhase.set_tip(
442           "Inverts the LFO's generated wave vertically."
443        );
444        eLFO2FlipPhase.set_tip(
445           "Inverts the LFO's generated wave vertically."
446        );
447    
448      pageno = 0;      pageno = 0;
449      rowno = 0;      rowno = 0;
450      firstRowInBlock = 0;      firstRowInBlock = 0;
451    
452      addHeader(_("Mandatory Settings"));      addHeader(_("Mandatory Settings"));
453      addString("Sample", lSample, wSample);      addString(_("Sample"), lSample, wSample);
454      //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);
455      tooltips.set_tip(*wSample, _("Drop a sample here"));  #ifdef OLD_TOOLTIPS
456        tooltips.set_tip(*wSample, _("Drag & drop a sample here"));
457    #else
458        wSample->set_tooltip_text(_("Drag & drop a sample here"));
459    #endif
460      addProp(eUnityNote);      addProp(eUnityNote);
461        addProp(eSampleFormatInfo);
462        addProp(eSampleID);
463        addRightHandSide(buttonSelectSample);
464      addHeader(_("Optional Settings"));      addHeader(_("Optional Settings"));
465      addProp(eSampleStartOffset);      addProp(eSampleStartOffset);
466      addProp(eChannelOffset);      addProp(eChannelOffset);
467      addHeader("Loops");      addHeader(_("Loops"));
468      addProp(eSampleLoopEnabled);      addProp(eSampleLoopEnabled);
469      addProp(eSampleLoopStart);      addProp(eSampleLoopStart);
470      addProp(eSampleLoopLength);      addProp(eSampleLoopLength);
471      {      {
472          const char* choices[] = { "normal", "bidirectional", "backward", 0 };          const char* choices[] = { _("normal"), _("bidirectional"), _("backward"), 0 };
473          static const uint32_t values[] = {          static const uint32_t values[] = {
474              gig::loop_type_normal,              gig::loop_type_normal,
475              gig::loop_type_bidirectional,              gig::loop_type_bidirectional,
# Line 298  DimRegionEdit::DimRegionEdit() : Line 490  DimRegionEdit::DimRegionEdit() :
490      addHeader(_("Amplitude Envelope (EG1)"));      addHeader(_("Amplitude Envelope (EG1)"));
491      addProp(eEG1PreAttack);      addProp(eEG1PreAttack);
492      addProp(eEG1Attack);      addProp(eEG1Attack);
493        addProp(eEG1Hold);
494      addProp(eEG1Decay1);      addProp(eEG1Decay1);
495      addProp(eEG1Decay2);      addProp(eEG1Decay2);
496      addProp(eEG1InfiniteSustain);      addProp(eEG1InfiniteSustain);
497      addProp(eEG1Sustain);      addProp(eEG1Sustain);
498      addProp(eEG1Release);      addProp(eEG1Release);
     addProp(eEG1Hold);  
499      addProp(eEG1Controller);      addProp(eEG1Controller);
500      addProp(eEG1ControllerInvert);      addProp(eEG1ControllerInvert);
501      addProp(eEG1ControllerAttackInfluence);      addProp(eEG1ControllerAttackInfluence);
# Line 317  DimRegionEdit::DimRegionEdit() : Line 509  DimRegionEdit::DimRegionEdit() :
509      addProp(eLFO1InternalDepth);      addProp(eLFO1InternalDepth);
510      addProp(eLFO1ControlDepth);      addProp(eLFO1ControlDepth);
511      {      {
512          const char* choices[] = { "internal", "modwheel", "breath",          const char* choices[] = { _("internal"), _("modwheel"), _("breath"),
513                                    "internal+modwheel", "internal+breath", 0 };                                    _("internal+modwheel"), _("internal+breath"), 0 };
514          static const gig::lfo1_ctrl_t values[] = {          static const gig::lfo1_ctrl_t values[] = {
515              gig::lfo1_ctrl_internal,              gig::lfo1_ctrl_internal,
516              gig::lfo1_ctrl_modwheel,              gig::lfo1_ctrl_modwheel,
# Line 331  DimRegionEdit::DimRegionEdit() : Line 523  DimRegionEdit::DimRegionEdit() :
523      addProp(eLFO1Controller);      addProp(eLFO1Controller);
524      addProp(eLFO1FlipPhase);      addProp(eLFO1FlipPhase);
525      addProp(eLFO1Sync);      addProp(eLFO1Sync);
526      addHeader("Crossfade");      addHeader(_("Crossfade"));
527      addProp(eAttenuationController);      addProp(eAttenuationController);
528      addProp(eInvertAttenuationController);      addProp(eInvertAttenuationController);
529      addProp(eAttenuationControllerThreshold);      addProp(eAttenuationControllerThreshold);
# Line 340  DimRegionEdit::DimRegionEdit() : Line 532  DimRegionEdit::DimRegionEdit() :
532      addProp(eCrossfade_out_start);      addProp(eCrossfade_out_start);
533      addProp(eCrossfade_out_end);      addProp(eCrossfade_out_end);
534    
535        Gtk::Frame* frame = new Gtk::Frame;
536        frame->add(crossfade_curve);
537        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
538                              Gtk::SHRINK, Gtk::SHRINK);
539        rowno++;
540    
541        eCrossfade_in_start.signal_value_changed().connect(
542            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
543        eCrossfade_in_end.signal_value_changed().connect(
544            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
545        eCrossfade_out_start.signal_value_changed().connect(
546            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
547        eCrossfade_out_end.signal_value_changed().connect(
548            sigc::mem_fun(crossfade_curve, &CrossfadeCurve::queue_draw));
549    
550      nextPage();      nextPage();
551    
552      addHeader(_("General Filter Settings"));      addHeader(_("General Filter Settings"));
553      addProp(eVCFEnabled);      addProp(eVCFEnabled);
554      {      {
555          const char* choices[] = { "lowpass", "lowpassturbo", "bandpass",          const char* choices[] = { _("lowpass"), _("lowpassturbo"), _("bandpass"),
556                                    "highpass", "bandreject", 0 };                                    _("highpass"), _("bandreject"), 0 };
557          static const gig::vcf_type_t values[] = {          static const gig::vcf_type_t values[] = {
558              gig::vcf_type_lowpass,              gig::vcf_type_lowpass,
559              gig::vcf_type_lowpassturbo,              gig::vcf_type_lowpassturbo,
# Line 358  DimRegionEdit::DimRegionEdit() : Line 565  DimRegionEdit::DimRegionEdit() :
565      }      }
566      addProp(eVCFType);      addProp(eVCFType);
567      {      {
568          const char* choices[] = { "none", "none2", "modwheel", "effect1", "effect2",          const char* choices[] = { _("none"), _("none2"), _("modwheel"), _("effect1"), _("effect2"),
569                                    "breath", "foot", "sustainpedal", "softpedal",                                    _("breath"), _("foot"), _("sustainpedal"), _("softpedal"),
570                                    "genpurpose7", "genpurpose8", "aftertouch", 0 };                                    _("genpurpose7"), _("genpurpose8"), _("aftertouch"), 0 };
571          static const gig::vcf_cutoff_ctrl_t values[] = {          static const gig::vcf_cutoff_ctrl_t values[] = {
572              gig::vcf_cutoff_ctrl_none,              gig::vcf_cutoff_ctrl_none,
573              gig::vcf_cutoff_ctrl_none2,              gig::vcf_cutoff_ctrl_none2,
# Line 380  DimRegionEdit::DimRegionEdit() : Line 587  DimRegionEdit::DimRegionEdit() :
587      addProp(eVCFCutoffController);      addProp(eVCFCutoffController);
588      addProp(eVCFCutoffControllerInvert);      addProp(eVCFCutoffControllerInvert);
589      addProp(eVCFCutoff);      addProp(eVCFCutoff);
590      const char* curve_type_texts[] = { "nonlinear", "linear", "special", 0 };      const char* curve_type_texts[] = { _("nonlinear"), _("linear"), _("special"), 0 };
591      static const gig::curve_type_t curve_type_values[] = {      static const gig::curve_type_t curve_type_values[] = {
592          gig::curve_type_nonlinear,          gig::curve_type_nonlinear,
593          gig::curve_type_linear,          gig::curve_type_linear,
# Line 390  DimRegionEdit::DimRegionEdit() : Line 597  DimRegionEdit::DimRegionEdit() :
597      addProp(eVCFVelocityCurve);      addProp(eVCFVelocityCurve);
598      addProp(eVCFVelocityScale);      addProp(eVCFVelocityScale);
599      addProp(eVCFVelocityDynamicRange);      addProp(eVCFVelocityDynamicRange);
600    
601        eVCFCutoffController.signal_value_changed().connect(
602            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
603        eVCFVelocityCurve.signal_value_changed().connect(
604            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
605        eVCFVelocityScale.signal_value_changed().connect(
606            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
607        eVCFVelocityDynamicRange.signal_value_changed().connect(
608            sigc::mem_fun(cutoff_curve, &VelocityCurve::queue_draw));
609    
610        frame = new Gtk::Frame;
611        frame->add(cutoff_curve);
612        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
613                              Gtk::SHRINK, Gtk::SHRINK);
614        rowno++;
615    
616      addProp(eVCFResonance);      addProp(eVCFResonance);
617      addProp(eVCFResonanceDynamic);      addProp(eVCFResonanceDynamic);
618      {      {
619          const char* choices[] = { "none", "genpurpose3", "genpurpose4",          const char* choices[] = { _("none"), _("genpurpose3"), _("genpurpose4"),
620                                    "genpurpose5", "genpurpose6", 0 };                                    _("genpurpose5"), _("genpurpose6"), 0 };
621          static const gig::vcf_res_ctrl_t values[] = {          static const gig::vcf_res_ctrl_t values[] = {
622              gig::vcf_res_ctrl_none,              gig::vcf_res_ctrl_none,
623              gig::vcf_res_ctrl_genpurpose3,              gig::vcf_res_ctrl_genpurpose3,
# Line 428  DimRegionEdit::DimRegionEdit() : Line 651  DimRegionEdit::DimRegionEdit() :
651      addProp(eLFO2InternalDepth);      addProp(eLFO2InternalDepth);
652      addProp(eLFO2ControlDepth);      addProp(eLFO2ControlDepth);
653      {      {
654          const char* choices[] = { "internal", "modwheel", "foot",          const char* choices[] = { _("internal"), _("modwheel"), _("foot"),
655                                    "internal+modwheel", "internal+foot", 0 };                                    _("internal+modwheel"), _("internal+foot"), 0 };
656          static const gig::lfo2_ctrl_t values[] = {          static const gig::lfo2_ctrl_t values[] = {
657              gig::lfo2_ctrl_internal,              gig::lfo2_ctrl_internal,
658              gig::lfo2_ctrl_modwheel,              gig::lfo2_ctrl_modwheel,
# Line 456  DimRegionEdit::DimRegionEdit() : Line 679  DimRegionEdit::DimRegionEdit() :
679      addProp(eLFO3InternalDepth);      addProp(eLFO3InternalDepth);
680      addProp(eLFO3ControlDepth);      addProp(eLFO3ControlDepth);
681      {      {
682          const char* choices[] = { "internal", "modwheel", "aftertouch",          const char* choices[] = { _("internal"), _("modwheel"), _("aftertouch"),
683                                    "internal+modwheel", "internal+aftertouch", 0 };                                    _("internal+modwheel"), _("internal+aftertouch"), 0 };
684          static const gig::lfo3_ctrl_t values[] = {          static const gig::lfo3_ctrl_t values[] = {
685              gig::lfo3_ctrl_internal,              gig::lfo3_ctrl_internal,
686              gig::lfo3_ctrl_modwheel,              gig::lfo3_ctrl_modwheel,
# Line 472  DimRegionEdit::DimRegionEdit() : Line 695  DimRegionEdit::DimRegionEdit() :
695    
696      nextPage();      nextPage();
697    
698        addHeader(_("Velocity Response"));
699      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);
700      addProp(eVelocityResponseCurve);      addProp(eVelocityResponseCurve);
701      addProp(eVelocityResponseDepth);      addProp(eVelocityResponseDepth);
702      addProp(eVelocityResponseCurveScaling);      addProp(eVelocityResponseCurveScaling);
703    
704        eVelocityResponseCurve.signal_value_changed().connect(
705            sigc::mem_fun(velocity_curve, &VelocityCurve::queue_draw));
706        eVelocityResponseDepth.signal_value_changed().connect(
707            sigc::mem_fun(velocity_curve, &VelocityCurve::queue_draw));
708        eVelocityResponseCurveScaling.signal_value_changed().connect(
709            sigc::mem_fun(velocity_curve, &VelocityCurve::queue_draw));
710    
711        frame = new Gtk::Frame;
712        frame->add(velocity_curve);
713        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
714                              Gtk::SHRINK, Gtk::SHRINK);
715        rowno++;
716    
717        addHeader(_("Release Velocity Response"));
718      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,
719                                                curve_type_values);                                                curve_type_values);
720      addProp(eReleaseVelocityResponseCurve);      addProp(eReleaseVelocityResponseCurve);
721      addProp(eReleaseVelocityResponseDepth);      addProp(eReleaseVelocityResponseDepth);
722    
723        eReleaseVelocityResponseCurve.signal_value_changed().connect(
724            sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
725        eReleaseVelocityResponseDepth.signal_value_changed().connect(
726            sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
727        frame = new Gtk::Frame;
728        frame->add(release_curve);
729        table[pageno]->attach(*frame, 1, 3, rowno, rowno + 1,
730                              Gtk::SHRINK, Gtk::SHRINK);
731        rowno++;
732    
733      addProp(eReleaseTriggerDecay);      addProp(eReleaseTriggerDecay);
734      {      {
735          const char* choices[] = { "none", "effect4depth", "effect5depth", 0 };          const char* choices[] = { _("none"), _("effect4depth"), _("effect5depth"), 0 };
736          static const gig::dim_bypass_ctrl_t values[] = {          static const gig::dim_bypass_ctrl_t values[] = {
737              gig::dim_bypass_ctrl_none,              gig::dim_bypass_ctrl_none,
738              gig::dim_bypass_ctrl_94,              gig::dim_bypass_ctrl_94,
# Line 491  DimRegionEdit::DimRegionEdit() : Line 741  DimRegionEdit::DimRegionEdit() :
741          eDimensionBypass.set_choices(choices, values);          eDimensionBypass.set_choices(choices, values);
742      }      }
743      addProp(eDimensionBypass);      addProp(eDimensionBypass);
744        eSelfMask.widget.set_tooltip_text(_(
745            "If enabled: new notes with higher velocity value will stop older "
746            "notes with lower velocity values, that way you can save voices that "
747            "would barely be audible. This is also useful for certain drum sounds."
748        ));
749      addProp(eSelfMask);      addProp(eSelfMask);
750        eSustainDefeat.widget.set_tooltip_text(_(
751            "If enabled: sustain pedal will not hold a note. This way you can use "
752            "the sustain pedal for other purposes, for example to switch among "
753            "dimension regions."
754        ));
755      addProp(eSustainDefeat);      addProp(eSustainDefeat);
756        eMSDecode.widget.set_tooltip_text(_(
757            "Defines if Mid/Side Recordings should be decoded. Mid/Side Recordings "
758            "are an alternative way to record sounds in stereo. The sampler needs "
759            "to decode such samples to actually make use of them. Note: this "
760            "feature is currently not supported by LinuxSampler."
761        ));
762      addProp(eMSDecode);      addProp(eMSDecode);
763    
764      nextPage();      nextPage();
# Line 539  DimRegionEdit::DimRegionEdit() : Line 805  DimRegionEdit::DimRegionEdit() :
805      eSampleLoopInfinite.signal_value_changed().connect(      eSampleLoopInfinite.signal_value_changed().connect(
806          sigc::mem_fun(*this, &DimRegionEdit::loop_infinite_toggled));          sigc::mem_fun(*this, &DimRegionEdit::loop_infinite_toggled));
807    
808      append_page(*table[0], "Sample");      append_page(*table[0], _("Sample"));
809      append_page(*table[1], "Amplitude (1)");      append_page(*table[1], _("Amplitude (1)"));
810      append_page(*table[2], "Amplitude (2)");      append_page(*table[2], _("Amplitude (2)"));
811      append_page(*table[3], "Filter (1)");      append_page(*table[3], _("Filter (1)"));
812      append_page(*table[4], "Filter (2)");      append_page(*table[4], _("Filter (2)"));
813      append_page(*table[5], "Pitch");      append_page(*table[5], _("Pitch"));
814      append_page(*table[6], "Misc");      append_page(*table[6], _("Misc"));
815  }  }
816    
817  DimRegionEdit::~DimRegionEdit()  DimRegionEdit::~DimRegionEdit()
# Line 556  void DimRegionEdit::addString(const char Line 822  void DimRegionEdit::addString(const char
822                                Gtk::Entry*& widget)                                Gtk::Entry*& widget)
823  {  {
824      label = new Gtk::Label(Glib::ustring(labelText) + ":");      label = new Gtk::Label(Glib::ustring(labelText) + ":");
825      label->set_alignment(Gtk::ALIGN_LEFT);      label->set_alignment(Gtk::ALIGN_START);
826    
827      table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,      table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,
828                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
# Line 582  Gtk::Label* DimRegionEdit::addHeader(con Line 848  Gtk::Label* DimRegionEdit::addHeader(con
848      str += "</b>";      str += "</b>";
849      Gtk::Label* label = new Gtk::Label(str);      Gtk::Label* label = new Gtk::Label(str);
850      label->set_use_markup();      label->set_use_markup();
851      label->set_alignment(Gtk::ALIGN_LEFT);      label->set_alignment(Gtk::ALIGN_START);
852      table[pageno]->attach(*label, 0, 3, rowno, rowno + 1,      table[pageno]->attach(*label, 0, 3, rowno, rowno + 1,
853                            Gtk::FILL, Gtk::SHRINK);                            Gtk::FILL, Gtk::SHRINK);
854      rowno++;      rowno++;
# Line 626  void DimRegionEdit::addProp(LabelWidget& Line 892  void DimRegionEdit::addProp(LabelWidget&
892      rowno++;      rowno++;
893  }  }
894    
895    void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)
896    {
897        table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,
898                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
899        rowno++;
900    }
901    
902  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)
903  {  {
904      dimregion = d;      dimregion = d;
905        velocity_curve.set_dim_region(d);
906        release_curve.set_dim_region(d);
907        cutoff_curve.set_dim_region(d);
908        crossfade_curve.set_dim_region(d);
909    
910      set_sensitive(d);      set_sensitive(d);
911      if (!d) return;      if (!d) return;
# Line 714  void DimRegionEdit::set_dim_region(gig:: Line 990  void DimRegionEdit::set_dim_region(gig::
990      eMSDecode.set_value(d->MSDecode);      eMSDecode.set_value(d->MSDecode);
991      eSampleStartOffset.set_value(d->SampleStartOffset);      eSampleStartOffset.set_value(d->SampleStartOffset);
992      eUnityNote.set_value(d->UnityNote);      eUnityNote.set_value(d->UnityNote);
993        // assemble sample format info string
994        {
995            Glib::ustring s;
996            if (d->pSample) {
997                switch (d->pSample->Channels) {
998                    case 1: s = _("Mono"); break;
999                    case 2: s = _("Stereo"); break;
1000                    default:
1001                        s = ToString(d->pSample->Channels) + _(" audio channels");
1002                        break;
1003                }
1004                s += " " + ToString(d->pSample->BitDepth) + " Bits";
1005                s += " " + ToString(d->pSample->SamplesPerSecond/1000) + "."
1006                          + ToString((d->pSample->SamplesPerSecond%1000)/100) + " kHz";
1007            } else {
1008                s = _("No sample assigned to this dimension region.");
1009            }
1010            eSampleFormatInfo.text.set_text(s);
1011        }
1012        // generate sample's memory address pointer string
1013        {
1014            Glib::ustring s;
1015            if (d->pSample) {
1016                char buf[64] = {};
1017                snprintf(buf, sizeof(buf), "%p", d->pSample);
1018                s = buf;
1019            } else {
1020                s = "---";
1021            }
1022            eSampleID.text.set_text(s);
1023        }
1024        buttonSelectSample.set_sensitive(d && d->pSample);
1025      eFineTune.set_value(d->FineTune);      eFineTune.set_value(d->FineTune);
1026      eGain.set_value(d->Gain);      eGain.set_value(d->Gain);
1027      eGainPlus6.set_value(d->Gain);      eGainPlus6.set_value(d->Gain);
# Line 730  void DimRegionEdit::set_dim_region(gig:: Line 1038  void DimRegionEdit::set_dim_region(gig::
1038          d->pSample ? d->pSample->LoopPlayCount : 0);          d->pSample ? d->pSample->LoopPlayCount : 0);
1039      update_model--;      update_model--;
1040    
1041      wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : "NULL");      wSample->set_text(d->pSample ? gig_to_utf8(d->pSample->pInfo->Name) :
1042                          _("NULL"));
1043    
1044      update_loop_elements();      update_loop_elements();
1045      VCFEnabled_toggled();      VCFEnabled_toggled();
# Line 745  void DimRegionEdit::VCFEnabled_toggled() Line 1054  void DimRegionEdit::VCFEnabled_toggled()
1054      eVCFVelocityCurve.set_sensitive(sensitive);      eVCFVelocityCurve.set_sensitive(sensitive);
1055      eVCFVelocityScale.set_sensitive(sensitive);      eVCFVelocityScale.set_sensitive(sensitive);
1056      eVCFVelocityDynamicRange.set_sensitive(sensitive);      eVCFVelocityDynamicRange.set_sensitive(sensitive);
1057        cutoff_curve.set_sensitive(sensitive);
1058      eVCFResonance.set_sensitive(sensitive);      eVCFResonance.set_sensitive(sensitive);
1059      eVCFResonanceController.set_sensitive(sensitive);      eVCFResonanceController.set_sensitive(sensitive);
1060      eVCFKeyboardTracking.set_sensitive(sensitive);      eVCFKeyboardTracking.set_sensitive(sensitive);
# Line 793  void DimRegionEdit::VCFCutoffController_ Line 1103  void DimRegionEdit::VCFCutoffController_
1103      eVCFCutoffControllerInvert.set_sensitive(hasController);      eVCFCutoffControllerInvert.set_sensitive(hasController);
1104      eVCFCutoff.set_sensitive(!hasController);      eVCFCutoff.set_sensitive(!hasController);
1105      eVCFResonanceDynamic.set_sensitive(!hasController);      eVCFResonanceDynamic.set_sensitive(!hasController);
1106      eVCFVelocityScale.label.set_text(hasController ? "Minimum cutoff:" :      eVCFVelocityScale.label.set_text(hasController ? _("Minimum cutoff:") :
1107                                       "Velocity scale:");                                       _("Velocity scale:"));
1108  }  }
1109    
1110  void DimRegionEdit::VCFResonanceController_changed()  void DimRegionEdit::VCFResonanceController_changed()
# Line 837  void DimRegionEdit::AttenuationControlle Line 1147  void DimRegionEdit::AttenuationControlle
1147      eCrossfade_in_end.set_sensitive(hasController);      eCrossfade_in_end.set_sensitive(hasController);
1148      eCrossfade_out_start.set_sensitive(hasController);      eCrossfade_out_start.set_sensitive(hasController);
1149      eCrossfade_out_end.set_sensitive(hasController);      eCrossfade_out_end.set_sensitive(hasController);
1150        crossfade_curve.set_sensitive(hasController);
1151  }  }
1152    
1153  void DimRegionEdit::LFO1Controller_changed()  void DimRegionEdit::LFO1Controller_changed()
# Line 950  void DimRegionEdit::loop_infinite_toggle Line 1261  void DimRegionEdit::loop_infinite_toggle
1261      update_model--;      update_model--;
1262  }  }
1263    
1264  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)
1265  {  {
1266      if (dimregion) {      if (dimregion) {
1267          //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 958  bool DimRegionEdit::set_sample(gig::Samp Line 1269  bool DimRegionEdit::set_sample(gig::Samp
1269          // 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()
1270          //dimreg_to_be_changed_signal.emit(dimregion);          //dimreg_to_be_changed_signal.emit(dimregion);
1271    
1272          gig::Sample* oldref = dimregion->pSample;          // make sure stereo samples always are the same in both
1273          dimregion->pSample = sample;          // dimregs in the samplechannel dimension
1274            int nbDimregs = 1;
1275            gig::DimensionRegion* d[2] = { dimregion, 0 };
1276            if (sample->Channels == 2) {
1277                gig::Region* region = dimregion->GetParent();
1278    
1279                int bitcount = 0;
1280                int stereo_bit = 0;
1281                for (int dim = 0 ; dim < region->Dimensions ; dim++) {
1282                    if (region->pDimensionDefinitions[dim].dimension == gig::dimension_samplechannel) {
1283                        stereo_bit = 1 << bitcount;
1284                        break;
1285                    }
1286                    bitcount += region->pDimensionDefinitions[dim].bits;
1287                }
1288    
1289          // copy sample information from Sample to DimensionRegion              if (stereo_bit) {
1290                    int dimregno;
1291                    for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1292                        if (region->pDimensionRegions[dimregno] == dimregion) {
1293                            break;
1294                        }
1295                    }
1296                    d[0] = region->pDimensionRegions[dimregno & ~stereo_bit];
1297                    d[1] = region->pDimensionRegions[dimregno | stereo_bit];
1298                    nbDimregs = 2;
1299                }
1300            }
1301    
1302          dimregion->UnityNote = sample->MIDIUnityNote;          gig::Sample* oldref = dimregion->pSample;
         dimregion->FineTune = sample->FineTune;  
1303    
1304          int loops = sample->Loops ? 1 : 0;          for (int i = 0 ; i < nbDimregs ; i++) {
1305          while (dimregion->SampleLoops > loops) {              d[i]->pSample = sample;
1306              dimregion->DeleteSampleLoop(&dimregion->pSampleLoops[0]);  
1307          }              // copy sample information from Sample to DimensionRegion
1308          while (dimregion->SampleLoops < sample->Loops) {              if (copy_sample_unity)
1309              DLS::sample_loop_t loop;                  d[i]->UnityNote = sample->MIDIUnityNote;
1310              dimregion->AddSampleLoop(&loop);              if (copy_sample_tune)
1311          }                  d[i]->FineTune = sample->FineTune;
1312          if (loops) {              if (copy_sample_loop) {
1313              dimregion->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);                  int loops = sample->Loops ? 1 : 0;
1314              dimregion->pSampleLoops[0].LoopType = sample->LoopType;                  while (d[i]->SampleLoops > loops) {
1315              dimregion->pSampleLoops[0].LoopStart = sample->LoopStart;                      d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);
1316              dimregion->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;                  }
1317                    while (d[i]->SampleLoops < sample->Loops) {
1318                        DLS::sample_loop_t loop;
1319                        d[i]->AddSampleLoop(&loop);
1320                    }
1321                    if (loops) {
1322                        d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);
1323                        d[i]->pSampleLoops[0].LoopType = sample->LoopType;
1324                        d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;
1325                        d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;
1326                    }
1327                }
1328          }          }
1329    
1330          // update ui          // update ui
1331          update_model++;          update_model++;
1332          wSample->set_text(dimregion->pSample->pInfo->Name);          wSample->set_text(gig_to_utf8(dimregion->pSample->pInfo->Name));
1333          eUnityNote.set_value(dimregion->UnityNote);          eUnityNote.set_value(dimregion->UnityNote);
1334          eFineTune.set_value(dimregion->FineTune);          eFineTune.set_value(dimregion->FineTune);
1335          eSampleLoopEnabled.set_value(dimregion->SampleLoops);          eSampleLoopEnabled.set_value(dimregion->SampleLoops);
# Line 1122  void DimRegionEdit::set_LoopPlayCount(gi Line 1468  void DimRegionEdit::set_LoopPlayCount(gi
1468  {  {
1469      if (d->pSample) d->pSample->LoopPlayCount = value;      if (d->pSample) d->pSample->LoopPlayCount = value;
1470  }  }
1471    
1472    void DimRegionEdit::onButtonSelectSamplePressed() {
1473        if (!dimregion) return;
1474        if (!dimregion->pSample) return;
1475        select_sample_signal.emit(dimregion->pSample);
1476    }
1477    
1478    sigc::signal<void, gig::Sample*>& DimRegionEdit::signal_select_sample() {
1479        return select_sample_signal;
1480    }

Legend:
Removed from v.1623  
changed lines
  Added in v.2691

  ViewVC Help
Powered by ViewVC