/[svn]/gigedit/trunk/src/gigedit/dimregionedit.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/dimregionedit.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2430 by persson, Sun Mar 3 17:26:11 2013 UTC revision 2841 by persson, Sun Aug 30 10:00:49 2015 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2013 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 94  bool CrossfadeCurve::on_draw(const Cairo Line 94  bool CrossfadeCurve::on_draw(const Cairo
94              }              }
95          }          }
96          int bitcount = 0;          int bitcount = 0;
         int layer_bit = 0;  
97          for (int dim = 0 ; dim < region->Dimensions ; dim++) {          for (int dim = 0 ; dim < region->Dimensions ; dim++) {
98              if (region->pDimensionDefinitions[dim].dimension ==              if (region->pDimensionDefinitions[dim].dimension ==
99                  gig::dimension_layer) {                  gig::dimension_layer) {
                 layer_bit = 1 << bitcount;  
   
100                  int mask =                  int mask =
101                      ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<                      ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<
102                        bitcount);                        bitcount);
# Line 154  DimRegionEdit::DimRegionEdit() : Line 151  DimRegionEdit::DimRegionEdit() :
151      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),      velocity_curve(&gig::DimensionRegion::GetVelocityAttenuation),
152      release_curve(&gig::DimensionRegion::GetVelocityRelease),      release_curve(&gig::DimensionRegion::GetVelocityRelease),
153      cutoff_curve(&gig::DimensionRegion::GetVelocityCutoff),      cutoff_curve(&gig::DimensionRegion::GetVelocityCutoff),
154      eEG1PreAttack(_("Pre-attack"), 0, 100, 2),      eEG1PreAttack(_("Pre-attack Level (%)"), 0, 100, 2),
155      eEG1Attack(_("Attack"), 0, 60, 3),      eEG1Attack(_("Attack Time (seconds)"), 0, 60, 3),
156      eEG1Decay1(_("Decay 1"), 0.005, 60, 3),      eEG1Decay1(_("Decay 1 Time (seconds)"), 0.005, 60, 3),
157      eEG1Decay2(_("Decay 2"), 0, 60, 3),      eEG1Decay2(_("Decay 2 Time (seconds)"), 0, 60, 3),
158      eEG1InfiniteSustain(_("Infinite sustain")),      eEG1InfiniteSustain(_("Infinite sustain")),
159      eEG1Sustain(_("Sustain"), 0, 100, 2),      eEG1Sustain(_("Sustain Level (%)"), 0, 100, 2),
160      eEG1Release(_("Release"), 0, 60, 3),      eEG1Release(_("Release Time (seconds)"), 0, 60, 3),
161      eEG1Hold(_("Hold")),      eEG1Hold(_("Hold Attack Stage until Loop End")),
162      eEG1Controller(_("Controller")),      eEG1Controller(_("Controller")),
163      eEG1ControllerInvert(_("Controller invert")),      eEG1ControllerInvert(_("Controller invert")),
164      eEG1ControllerAttackInfluence(_("Controller attack influence"), 0, 3),      eEG1ControllerAttackInfluence(_("Controller attack influence"), 0, 3),
# Line 173  DimRegionEdit::DimRegionEdit() : Line 170  DimRegionEdit::DimRegionEdit() :
170      eLFO1Controller(_("Controller")),      eLFO1Controller(_("Controller")),
171      eLFO1FlipPhase(_("Flip phase")),      eLFO1FlipPhase(_("Flip phase")),
172      eLFO1Sync(_("Sync")),      eLFO1Sync(_("Sync")),
173      eEG2PreAttack(_("Pre-attack"), 0, 100, 2),      eEG2PreAttack(_("Pre-attack Level (%)"), 0, 100, 2),
174      eEG2Attack(_("Attack"), 0, 60, 3),      eEG2Attack(_("Attack Time (seconds)"), 0, 60, 3),
175      eEG2Decay1(_("Decay 1"), 0.005, 60, 3),      eEG2Decay1(_("Decay 1 Time (seconds)"), 0.005, 60, 3),
176      eEG2Decay2(_("Decay 2"), 0, 60, 3),      eEG2Decay2(_("Decay 2 Time (seconds)"), 0, 60, 3),
177      eEG2InfiniteSustain(_("Infinite sustain")),      eEG2InfiniteSustain(_("Infinite sustain")),
178      eEG2Sustain(_("Sustain"), 0, 100, 2),      eEG2Sustain(_("Sustain Level (%)"), 0, 100, 2),
179      eEG2Release(_("Release"), 0, 60, 3),      eEG2Release(_("Release Time (seconds)"), 0, 60, 3),
180      eEG2Controller(_("Controller")),      eEG2Controller(_("Controller")),
181      eEG2ControllerInvert(_("Controller invert")),      eEG2ControllerInvert(_("Controller invert")),
182      eEG2ControllerAttackInfluence(_("Controller attack influence"), 0, 3),      eEG2ControllerAttackInfluence(_("Controller attack influence"), 0, 3),
# Line 224  DimRegionEdit::DimRegionEdit() : Line 221  DimRegionEdit::DimRegionEdit() :
221      ePitchTrack(_("Pitch track")),      ePitchTrack(_("Pitch track")),
222      eDimensionBypass(_("Dimension bypass")),      eDimensionBypass(_("Dimension bypass")),
223      ePan(_("Pan"), -64, 63),      ePan(_("Pan"), -64, 63),
224      eSelfMask(_("Self mask")),      eSelfMask(_("Kill lower velocity voices (a.k.a \"Self mask\")")),
225      eAttenuationController(_("Attenuation controller")),      eAttenuationController(_("Attenuation controller")),
226      eInvertAttenuationController(_("Invert attenuation controller")),      eInvertAttenuationController(_("Invert attenuation controller")),
227      eAttenuationControllerThreshold(_("Attenuation controller threshold")),      eAttenuationControllerThreshold(_("Attenuation controller threshold")),
228      eChannelOffset(_("Channel offset"), 0, 9),      eChannelOffset(_("Channel offset"), 0, 9),
229      eSustainDefeat(_("Sustain defeat")),      eSustainDefeat(_("Ignore Hold Pedal (a.k.a. \"Sustain defeat\")")),
230      eMSDecode(_("MS decode")),      eMSDecode(_("Decode Mid/Side Recordings")),
231      eSampleStartOffset(_("Sample start offset"), 0, 2000),      eSampleStartOffset(_("Sample start offset"), 0, 2000),
232      eUnityNote(_("Unity note")),      eUnityNote(_("Unity note")),
233        eSampleFormatInfo(_("Sample Format")),
234        eSampleID("Sample ID"),
235      eFineTune(_("Fine tune"), -49, 50),      eFineTune(_("Fine tune"), -49, 50),
236      eGain(_("Gain"), -96, 0, 2, -655360),      eGain(_("Gain"), -96, 0, 2, -655360),
237      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),
# Line 242  DimRegionEdit::DimRegionEdit() : Line 241  DimRegionEdit::DimRegionEdit() :
241      eSampleLoopType(_("Loop type")),      eSampleLoopType(_("Loop type")),
242      eSampleLoopInfinite(_("Infinite loop")),      eSampleLoopInfinite(_("Infinite loop")),
243      eSampleLoopPlayCount(_("Playback count"), 1),      eSampleLoopPlayCount(_("Playback count"), 1),
244        buttonSelectSample(UNICODE_LEFT_ARROW + "  " + _("Select Sample")),
245      update_model(0)      update_model(0)
246  {  {
247      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);
# Line 351  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 361  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 391  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, buttonNullSampleReference);
454        buttonNullSampleReference->set_label("X");
455        buttonNullSampleReference->set_tooltip_text(_("Remove current sample reference (NULL reference). This can be used to define a \"silent\" case where no sample shall be played."));
456        buttonNullSampleReference->signal_clicked().connect(
457            sigc::mem_fun(*this, &DimRegionEdit::nullOutSampleReference)
458        );
459      //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);
460  #ifdef OLD_TOOLTIPS  #ifdef OLD_TOOLTIPS
461      tooltips.set_tip(*wSample, _("Drop a sample here"));      tooltips.set_tip(*wSample, _("Drag & drop a sample here"));
462  #else  #else
463      wSample->set_tooltip_text(_("Drop a sample here"));      wSample->set_tooltip_text(_("Drag & drop a sample here"));
464  #endif  #endif
465      addProp(eUnityNote);      addProp(eUnityNote);
466        addProp(eSampleFormatInfo);
467        addProp(eSampleID);
468        addRightHandSide(buttonSelectSample);
469      addHeader(_("Optional Settings"));      addHeader(_("Optional Settings"));
470      addProp(eSampleStartOffset);      addProp(eSampleStartOffset);
471      addProp(eChannelOffset);      addProp(eChannelOffset);
# Line 434  DimRegionEdit::DimRegionEdit() : Line 495  DimRegionEdit::DimRegionEdit() :
495      addHeader(_("Amplitude Envelope (EG1)"));      addHeader(_("Amplitude Envelope (EG1)"));
496      addProp(eEG1PreAttack);      addProp(eEG1PreAttack);
497      addProp(eEG1Attack);      addProp(eEG1Attack);
498        addProp(eEG1Hold);
499      addProp(eEG1Decay1);      addProp(eEG1Decay1);
500      addProp(eEG1Decay2);      addProp(eEG1Decay2);
501      addProp(eEG1InfiniteSustain);      addProp(eEG1InfiniteSustain);
502      addProp(eEG1Sustain);      addProp(eEG1Sustain);
503      addProp(eEG1Release);      addProp(eEG1Release);
     addProp(eEG1Hold);  
504      addProp(eEG1Controller);      addProp(eEG1Controller);
505      addProp(eEG1ControllerInvert);      addProp(eEG1ControllerInvert);
506      addProp(eEG1ControllerAttackInfluence);      addProp(eEG1ControllerAttackInfluence);
# Line 639  DimRegionEdit::DimRegionEdit() : Line 700  DimRegionEdit::DimRegionEdit() :
700    
701      nextPage();      nextPage();
702    
703      addHeader(_("Velocity Reponse"));      addHeader(_("Velocity Response"));
704      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);
705      addProp(eVelocityResponseCurve);      addProp(eVelocityResponseCurve);
706      addProp(eVelocityResponseDepth);      addProp(eVelocityResponseDepth);
# Line 658  DimRegionEdit::DimRegionEdit() : Line 719  DimRegionEdit::DimRegionEdit() :
719                            Gtk::SHRINK, Gtk::SHRINK);                            Gtk::SHRINK, Gtk::SHRINK);
720      rowno++;      rowno++;
721    
722      addHeader(_("Release Velocity Reponse"));      addHeader(_("Release Velocity Response"));
723      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,
724                                                curve_type_values);                                                curve_type_values);
725      addProp(eReleaseVelocityResponseCurve);      addProp(eReleaseVelocityResponseCurve);
# Line 685  DimRegionEdit::DimRegionEdit() : Line 746  DimRegionEdit::DimRegionEdit() :
746          eDimensionBypass.set_choices(choices, values);          eDimensionBypass.set_choices(choices, values);
747      }      }
748      addProp(eDimensionBypass);      addProp(eDimensionBypass);
749        eSelfMask.widget.set_tooltip_text(_(
750            "If enabled: new notes with higher velocity value will stop older "
751            "notes with lower velocity values, that way you can save voices that "
752            "would barely be audible. This is also useful for certain drum sounds."
753        ));
754      addProp(eSelfMask);      addProp(eSelfMask);
755        eSustainDefeat.widget.set_tooltip_text(_(
756            "If enabled: sustain pedal will not hold a note. This way you can use "
757            "the sustain pedal for other purposes, for example to switch among "
758            "dimension regions."
759        ));
760      addProp(eSustainDefeat);      addProp(eSustainDefeat);
761        eMSDecode.widget.set_tooltip_text(_(
762            "Defines if Mid/Side Recordings should be decoded. Mid/Side Recordings "
763            "are an alternative way to record sounds in stereo. The sampler needs "
764            "to decode such samples to actually make use of them. Note: this "
765            "feature is currently not supported by LinuxSampler."
766        ));
767      addProp(eMSDecode);      addProp(eMSDecode);
768    
769      nextPage();      nextPage();
# Line 763  void DimRegionEdit::addString(const char Line 840  void DimRegionEdit::addString(const char
840      rowno++;      rowno++;
841  }  }
842    
843    void DimRegionEdit::addString(const char* labelText, Gtk::Label*& label,
844                                  Gtk::Entry*& widget, Gtk::Button*& button)
845    {
846        label = new Gtk::Label(Glib::ustring(labelText) + ":");
847        label->set_alignment(Gtk::ALIGN_START);
848    
849        table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,
850                              Gtk::FILL, Gtk::SHRINK);
851    
852        widget = new Gtk::Entry();
853        button = new Gtk::Button();
854    
855        Gtk::HBox* hbox = new Gtk::HBox;
856        hbox->pack_start(*widget);
857        hbox->pack_start(*button, Gtk::PACK_SHRINK);
858    
859        table[pageno]->attach(*hbox, 2, 3, rowno, rowno + 1,
860                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
861    
862        rowno++;
863    }
864    
865  Gtk::Label* DimRegionEdit::addHeader(const char* text)  Gtk::Label* DimRegionEdit::addHeader(const char* text)
866  {  {
867      if (firstRowInBlock < rowno - 1)      if (firstRowInBlock < rowno - 1)
# Line 820  void DimRegionEdit::addProp(LabelWidget& Line 919  void DimRegionEdit::addProp(LabelWidget&
919      rowno++;      rowno++;
920  }  }
921    
922    void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)
923    {
924        table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,
925                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
926        rowno++;
927    }
928    
929  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)
930  {  {
# Line 912  void DimRegionEdit::set_dim_region(gig:: Line 1017  void DimRegionEdit::set_dim_region(gig::
1017      eMSDecode.set_value(d->MSDecode);      eMSDecode.set_value(d->MSDecode);
1018      eSampleStartOffset.set_value(d->SampleStartOffset);      eSampleStartOffset.set_value(d->SampleStartOffset);
1019      eUnityNote.set_value(d->UnityNote);      eUnityNote.set_value(d->UnityNote);
1020        // assemble sample format info string
1021        {
1022            Glib::ustring s;
1023            if (d->pSample) {
1024                switch (d->pSample->Channels) {
1025                    case 1: s = _("Mono"); break;
1026                    case 2: s = _("Stereo"); break;
1027                    default:
1028                        s = ToString(d->pSample->Channels) + _(" audio channels");
1029                        break;
1030                }
1031                s += " " + ToString(d->pSample->BitDepth) + " Bits";
1032                s += " " + ToString(d->pSample->SamplesPerSecond/1000) + "."
1033                          + ToString((d->pSample->SamplesPerSecond%1000)/100) + " kHz";
1034            } else {
1035                s = _("No sample assigned to this dimension region.");
1036            }
1037            eSampleFormatInfo.text.set_text(s);
1038        }
1039        // generate sample's memory address pointer string
1040        {
1041            Glib::ustring s;
1042            if (d->pSample) {
1043                char buf[64] = {};
1044                snprintf(buf, sizeof(buf), "%p", d->pSample);
1045                s = buf;
1046            } else {
1047                s = "---";
1048            }
1049            eSampleID.text.set_text(s);
1050        }
1051        buttonSelectSample.set_sensitive(d && d->pSample);
1052      eFineTune.set_value(d->FineTune);      eFineTune.set_value(d->FineTune);
1053      eGain.set_value(d->Gain);      eGain.set_value(d->Gain);
1054      eGainPlus6.set_value(d->Gain);      eGainPlus6.set_value(d->Gain);
# Line 928  void DimRegionEdit::set_dim_region(gig:: Line 1065  void DimRegionEdit::set_dim_region(gig::
1065          d->pSample ? d->pSample->LoopPlayCount : 0);          d->pSample ? d->pSample->LoopPlayCount : 0);
1066      update_model--;      update_model--;
1067    
1068      wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : _("NULL"));      wSample->set_text(d->pSample ? gig_to_utf8(d->pSample->pInfo->Name) :
1069                          _("NULL"));
1070    
1071      update_loop_elements();      update_loop_elements();
1072      VCFEnabled_toggled();      VCFEnabled_toggled();
# Line 1150  void DimRegionEdit::loop_infinite_toggle Line 1288  void DimRegionEdit::loop_infinite_toggle
1288      update_model--;      update_model--;
1289  }  }
1290    
1291  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)
1292  {  {
1293      if (dimregion) {      if (dimregion) {
1294          //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 1194  bool DimRegionEdit::set_sample(gig::Samp Line 1332  bool DimRegionEdit::set_sample(gig::Samp
1332              d[i]->pSample = sample;              d[i]->pSample = sample;
1333    
1334              // copy sample information from Sample to DimensionRegion              // copy sample information from Sample to DimensionRegion
1335                if (copy_sample_unity)
1336              d[i]->UnityNote = sample->MIDIUnityNote;                  d[i]->UnityNote = sample->MIDIUnityNote;
1337              d[i]->FineTune = sample->FineTune;              if (copy_sample_tune)
1338                    d[i]->FineTune = sample->FineTune;
1339              int loops = sample->Loops ? 1 : 0;              if (copy_sample_loop) {
1340              while (d[i]->SampleLoops > loops) {                  int loops = sample->Loops ? 1 : 0;
1341                  d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);                  while (d[i]->SampleLoops > loops) {
1342              }                      d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);
1343              while (d[i]->SampleLoops < sample->Loops) {                  }
1344                  DLS::sample_loop_t loop;                  while (d[i]->SampleLoops < sample->Loops) {
1345                  d[i]->AddSampleLoop(&loop);                      DLS::sample_loop_t loop;
1346              }                      d[i]->AddSampleLoop(&loop);
1347              if (loops) {                  }
1348                  d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);                  if (loops) {
1349                  d[i]->pSampleLoops[0].LoopType = sample->LoopType;                      d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);
1350                  d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;                      d[i]->pSampleLoops[0].LoopType = sample->LoopType;
1351                  d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;                      d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;
1352                        d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;
1353                    }
1354              }              }
1355          }          }
1356    
1357          // update ui          // update ui
1358          update_model++;          update_model++;
1359          wSample->set_text(dimregion->pSample->pInfo->Name);          wSample->set_text(gig_to_utf8(dimregion->pSample->pInfo->Name));
1360          eUnityNote.set_value(dimregion->UnityNote);          eUnityNote.set_value(dimregion->UnityNote);
1361          eFineTune.set_value(dimregion->FineTune);          eFineTune.set_value(dimregion->FineTune);
1362          eSampleLoopEnabled.set_value(dimregion->SampleLoops);          eSampleLoopEnabled.set_value(dimregion->SampleLoops);
# Line 1355  void DimRegionEdit::set_LoopPlayCount(gi Line 1495  void DimRegionEdit::set_LoopPlayCount(gi
1495  {  {
1496      if (d->pSample) d->pSample->LoopPlayCount = value;      if (d->pSample) d->pSample->LoopPlayCount = value;
1497  }  }
1498    
1499    void DimRegionEdit::nullOutSampleReference() {
1500        if (!dimregion) return;
1501        gig::Sample* oldref = dimregion->pSample;
1502        if (!oldref) return;
1503    
1504        dimreg_to_be_changed_signal.emit(dimregion);
1505    
1506        // in case currently assigned sample is a stereo one, then remove both
1507        // references (expected to be due to a "stereo dimension")
1508        gig::DimensionRegion* d[2] = { dimregion, NULL };
1509        if (oldref->Channels == 2) {
1510            gig::Region* region = dimregion->GetParent();
1511            {
1512                int stereo_bit = 0;
1513                int bitcount = 0;
1514                for (int dim = 0 ; dim < region->Dimensions ; dim++) {
1515                    if (region->pDimensionDefinitions[dim].dimension == gig::dimension_samplechannel) {
1516                        stereo_bit = 1 << bitcount;
1517                        break;
1518                    }
1519                    bitcount += region->pDimensionDefinitions[dim].bits;
1520                }
1521    
1522                if (stereo_bit) {
1523                    int dimregno;
1524                    for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1525                        if (region->pDimensionRegions[dimregno] == dimregion) {
1526                            break;
1527                        }
1528                    }
1529                    d[0] = region->pDimensionRegions[dimregno & ~stereo_bit];
1530                    d[1] = region->pDimensionRegions[dimregno | stereo_bit];
1531                }
1532            }
1533        }
1534    
1535        if (d[0]) d[0]->pSample = NULL;
1536        if (d[1]) d[1]->pSample = NULL;
1537    
1538        // update UI elements
1539        set_dim_region(dimregion);
1540    
1541        sample_ref_changed_signal.emit(oldref, NULL);
1542        dimreg_changed_signal.emit(dimregion);
1543    }
1544    
1545    void DimRegionEdit::onButtonSelectSamplePressed() {
1546        if (!dimregion) return;
1547        if (!dimregion->pSample) return;
1548        select_sample_signal.emit(dimregion->pSample);
1549    }
1550    
1551    sigc::signal<void, gig::Sample*>& DimRegionEdit::signal_select_sample() {
1552        return select_sample_signal;
1553    }
Legend:
Removed from v.2430  
changed lines
  Added in v.2841
  ViewVC Help
Powered by ViewVC