/[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 2536 by schoenebeck, Mon Apr 21 17:49:17 2014 UTC revision 3070 by schoenebeck, Mon Jan 2 22:30:03 2017 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2014 Andreas Persson   * Copyright (C) 2006-2017 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 151  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 170  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 221  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(_("One note/voice per key (a.k.a \"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(_("Ignore Hold Pedal (a.k.a. \"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        eSampleGroup(_("Sample Group")),
234        eSampleFormatInfo(_("Sample Format")),
235        eSampleID("Sample ID"),
236        eChecksum("Wave Data CRC-32"),
237      eFineTune(_("Fine tune"), -49, 50),      eFineTune(_("Fine tune"), -49, 50),
238      eGain(_("Gain"), -96, 0, 2, -655360),      eGain(_("Gain"), -96, 0, 2, -655360),
239      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),
# Line 239  DimRegionEdit::DimRegionEdit() : Line 243  DimRegionEdit::DimRegionEdit() :
243      eSampleLoopType(_("Loop type")),      eSampleLoopType(_("Loop type")),
244      eSampleLoopInfinite(_("Infinite loop")),      eSampleLoopInfinite(_("Infinite loop")),
245      eSampleLoopPlayCount(_("Playback count"), 1),      eSampleLoopPlayCount(_("Playback count"), 1),
246        buttonSelectSample(UNICODE_LEFT_ARROW + "  " + _("Select Sample")),
247      update_model(0)      update_model(0)
248  {  {
249        // make synthesis parameter page tabs scrollable
250        // (workaround for GTK3: default theme uses huge tabs which breaks layout)
251        set_scrollable();
252    
253      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);      connect(eEG1PreAttack, &gig::DimensionRegion::EG1PreAttack);
254      connect(eEG1Attack, &gig::DimensionRegion::EG1Attack);      connect(eEG1Attack, &gig::DimensionRegion::EG1Attack);
255      connect(eEG1Decay1, &gig::DimensionRegion::EG1Decay1);      connect(eEG1Decay1, &gig::DimensionRegion::EG1Decay1);
# Line 348  DimRegionEdit::DimRegionEdit() : Line 357  DimRegionEdit::DimRegionEdit() :
357      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);      connect(eSampleLoopLength, &DimRegionEdit::set_LoopLength);
358      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);      connect(eSampleLoopInfinite, &DimRegionEdit::set_LoopInfinite);
359      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);      connect(eSampleLoopPlayCount, &DimRegionEdit::set_LoopPlayCount);
360        buttonSelectSample.signal_clicked().connect(
361            sigc::mem_fun(*this, &DimRegionEdit::onButtonSelectSamplePressed)
362        );
363    
364      for (int i = 0 ; i < 7 ; i++) {      for (int i = 0 ; i < 7 ; i++) {
365          table[i] = new Gtk::Table(3, 1);          table[i] = new Gtk::Table(3, 1);
# Line 358  DimRegionEdit::DimRegionEdit() : Line 370  DimRegionEdit::DimRegionEdit() :
370      eUnityNote.set_tip(      eUnityNote.set_tip(
371          _("Note this sample is associated with (a.k.a. 'root note')")          _("Note this sample is associated with (a.k.a. 'root note')")
372      );      );
373        buttonSelectSample.set_tooltip_text(
374            _("Selects the sample of this dimension region on the left hand side's sample tree view.")
375        );
376      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));      eSampleStartOffset.set_tip(_("Sample position at which playback should be started"));
377      ePan.set_tip(_("Stereo balance (left/right)"));      ePan.set_tip(_("Stereo balance (left/right)"));
378      eChannelOffset.set_tip(      eChannelOffset.set_tip(
# Line 388  DimRegionEdit::DimRegionEdit() : Line 403  DimRegionEdit::DimRegionEdit() :
403            "Caution: this setting is stored on Sample side, thus is shared "            "Caution: this setting is stored on Sample side, thus is shared "
404            "among all dimension regions that use this sample!")            "among all dimension regions that use this sample!")
405      );      );
406        
407        eEG1PreAttack.set_tip(
408            "Very first level this EG starts with. It rises then in Attack Time "
409            "seconds from this initial level to 100%."
410        );
411        eEG1Attack.set_tip(
412            "Duration of the EG's Attack stage, which raises its level from "
413            "Pre-Attack Level to 100%."
414        );
415        eEG1Hold.set_tip(
416           "On looped sounds, enabling this will cause the Decay 1 stage not to "
417           "enter before the loop has been passed one time."
418        );
419        eAttenuationController.set_tip(_(
420            "If you are not using the 'Layer' dimension, then this controller "
421            "simply alters the volume. If you are using the 'Layer' dimension, "
422            "then this controller is controlling the crossfade between Layers in "
423            "real-time."
424        ));
425    
426        eLFO1Sync.set_tip(
427            "If not checked, every voice will use its own LFO instance, which "
428            "causes voices triggered at different points in time to have different "
429            "LFO levels. By enabling 'Sync' here the voices will instead use and "
430            "share one single LFO, causing all voices to have the same LFO level, "
431            "no matter when the individual notes have been triggered."
432        );
433        eLFO2Sync.set_tip(
434            "If not checked, every voice will use its own LFO instance, which "
435            "causes voices triggered at different points in time to have different "
436            "LFO levels. By enabling 'Sync' here the voices will instead use and "
437            "share one single LFO, causing all voices to have the same LFO level, "
438            "no matter when the individual notes have been triggered."
439        );
440        eLFO3Sync.set_tip(
441            "If not checked, every voice will use its own LFO instance, which "
442            "causes voices triggered at different points in time to have different "
443            "LFO levels. By enabling 'Sync' here the voices will instead use and "
444            "share one single LFO, causing all voices to have the same LFO level, "
445            "no matter when the individual notes have been triggered."
446        );
447        eLFO1FlipPhase.set_tip(
448           "Inverts the LFO's generated wave vertically."
449        );
450        eLFO2FlipPhase.set_tip(
451           "Inverts the LFO's generated wave vertically."
452        );
453    
454      pageno = 0;      pageno = 0;
455      rowno = 0;      rowno = 0;
456      firstRowInBlock = 0;      firstRowInBlock = 0;
457    
458      addHeader(_("Mandatory Settings"));      addHeader(_("Mandatory Settings"));
459      addString(_("Sample"), lSample, wSample);      addString(_("Sample"), lSample, wSample, buttonNullSampleReference);
460        buttonNullSampleReference->set_label("X");
461        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."));
462        buttonNullSampleReference->signal_clicked().connect(
463            sigc::mem_fun(*this, &DimRegionEdit::nullOutSampleReference)
464        );
465      //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);
466  #ifdef OLD_TOOLTIPS  #ifdef OLD_TOOLTIPS
467      tooltips.set_tip(*wSample, _("Drag & drop a sample here"));      tooltips.set_tip(*wSample, _("Drag & drop a sample here"));
# Line 402  DimRegionEdit::DimRegionEdit() : Line 469  DimRegionEdit::DimRegionEdit() :
469      wSample->set_tooltip_text(_("Drag & drop a sample here"));      wSample->set_tooltip_text(_("Drag & drop a sample here"));
470  #endif  #endif
471      addProp(eUnityNote);      addProp(eUnityNote);
472        addProp(eSampleGroup);
473        addProp(eSampleFormatInfo);
474        addProp(eSampleID);
475        addProp(eChecksum);
476        addRightHandSide(buttonSelectSample);
477      addHeader(_("Optional Settings"));      addHeader(_("Optional Settings"));
478      addProp(eSampleStartOffset);      addProp(eSampleStartOffset);
479      addProp(eChannelOffset);      addProp(eChannelOffset);
# Line 431  DimRegionEdit::DimRegionEdit() : Line 503  DimRegionEdit::DimRegionEdit() :
503      addHeader(_("Amplitude Envelope (EG1)"));      addHeader(_("Amplitude Envelope (EG1)"));
504      addProp(eEG1PreAttack);      addProp(eEG1PreAttack);
505      addProp(eEG1Attack);      addProp(eEG1Attack);
506        addProp(eEG1Hold);
507      addProp(eEG1Decay1);      addProp(eEG1Decay1);
508      addProp(eEG1Decay2);      addProp(eEG1Decay2);
509      addProp(eEG1InfiniteSustain);      addProp(eEG1InfiniteSustain);
510      addProp(eEG1Sustain);      addProp(eEG1Sustain);
511      addProp(eEG1Release);      addProp(eEG1Release);
     addProp(eEG1Hold);  
512      addProp(eEG1Controller);      addProp(eEG1Controller);
513      addProp(eEG1ControllerInvert);      addProp(eEG1ControllerInvert);
514      addProp(eEG1ControllerAttackInfluence);      addProp(eEG1ControllerAttackInfluence);
# Line 636  DimRegionEdit::DimRegionEdit() : Line 708  DimRegionEdit::DimRegionEdit() :
708    
709      nextPage();      nextPage();
710    
711      addHeader(_("Velocity Reponse"));      addHeader(_("Velocity Response"));
712      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);      eVelocityResponseCurve.set_choices(curve_type_texts, curve_type_values);
713      addProp(eVelocityResponseCurve);      addProp(eVelocityResponseCurve);
714      addProp(eVelocityResponseDepth);      addProp(eVelocityResponseDepth);
# Line 655  DimRegionEdit::DimRegionEdit() : Line 727  DimRegionEdit::DimRegionEdit() :
727                            Gtk::SHRINK, Gtk::SHRINK);                            Gtk::SHRINK, Gtk::SHRINK);
728      rowno++;      rowno++;
729    
730      addHeader(_("Release Velocity Reponse"));      addHeader(_("Release Velocity Response"));
731      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,      eReleaseVelocityResponseCurve.set_choices(curve_type_texts,
732                                                curve_type_values);                                                curve_type_values);
733      addProp(eReleaseVelocityResponseCurve);      addProp(eReleaseVelocityResponseCurve);
# Line 682  DimRegionEdit::DimRegionEdit() : Line 754  DimRegionEdit::DimRegionEdit() :
754          eDimensionBypass.set_choices(choices, values);          eDimensionBypass.set_choices(choices, values);
755      }      }
756      addProp(eDimensionBypass);      addProp(eDimensionBypass);
757      eSelfMask.widget.set_tooltip_text(_("If enabled: high velocity notes will stop low velocity notes at the same note, that way you can save voices that wouldn't be audible anyway."));      eSelfMask.widget.set_tooltip_text(_(
758            "If enabled: new notes with higher velocity value will stop older "
759            "notes with lower velocity values, that way you can save voices that "
760            "would barely be audible. This is also useful for certain drum sounds."
761        ));
762      addProp(eSelfMask);      addProp(eSelfMask);
763      eSustainDefeat.widget.set_tooltip_text(_("If enabled: sustain pedal will not hold a note."));      eSustainDefeat.widget.set_tooltip_text(_(
764            "If enabled: sustain pedal will not hold a note. This way you can use "
765            "the sustain pedal for other purposes, for example to switch among "
766            "dimension regions."
767        ));
768      addProp(eSustainDefeat);      addProp(eSustainDefeat);
769      eMSDecode.widget.set_tooltip_text(_("Gigastudio specific flag: defines if Mid Side Recordings should be decoded."));      eMSDecode.widget.set_tooltip_text(_(
770            "Defines if Mid/Side Recordings should be decoded. Mid/Side Recordings "
771            "are an alternative way to record sounds in stereo. The sampler needs "
772            "to decode such samples to actually make use of them. Note: this "
773            "feature is currently not supported by LinuxSampler."
774        ));
775      addProp(eMSDecode);      addProp(eMSDecode);
776    
777      nextPage();      nextPage();
# Line 763  void DimRegionEdit::addString(const char Line 848  void DimRegionEdit::addString(const char
848      rowno++;      rowno++;
849  }  }
850    
851    void DimRegionEdit::addString(const char* labelText, Gtk::Label*& label,
852                                  Gtk::Entry*& widget, Gtk::Button*& button)
853    {
854        label = new Gtk::Label(Glib::ustring(labelText) + ":");
855        label->set_alignment(Gtk::ALIGN_START);
856    
857        table[pageno]->attach(*label, 1, 2, rowno, rowno + 1,
858                              Gtk::FILL, Gtk::SHRINK);
859    
860        widget = new Gtk::Entry();
861        button = new Gtk::Button();
862    
863        Gtk::HBox* hbox = new Gtk::HBox;
864        hbox->pack_start(*widget);
865        hbox->pack_start(*button, Gtk::PACK_SHRINK);
866    
867        table[pageno]->attach(*hbox, 2, 3, rowno, rowno + 1,
868                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
869    
870        rowno++;
871    }
872    
873  Gtk::Label* DimRegionEdit::addHeader(const char* text)  Gtk::Label* DimRegionEdit::addHeader(const char* text)
874  {  {
875      if (firstRowInBlock < rowno - 1)      if (firstRowInBlock < rowno - 1)
# Line 820  void DimRegionEdit::addProp(LabelWidget& Line 927  void DimRegionEdit::addProp(LabelWidget&
927      rowno++;      rowno++;
928  }  }
929    
930    void DimRegionEdit::addRightHandSide(Gtk::Widget& widget)
931    {
932        table[pageno]->attach(widget, 2, 3, rowno, rowno + 1,
933                              Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
934        rowno++;
935    }
936    
937  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)  void DimRegionEdit::set_dim_region(gig::DimensionRegion* d)
938  {  {
# Line 912  void DimRegionEdit::set_dim_region(gig:: Line 1025  void DimRegionEdit::set_dim_region(gig::
1025      eMSDecode.set_value(d->MSDecode);      eMSDecode.set_value(d->MSDecode);
1026      eSampleStartOffset.set_value(d->SampleStartOffset);      eSampleStartOffset.set_value(d->SampleStartOffset);
1027      eUnityNote.set_value(d->UnityNote);      eUnityNote.set_value(d->UnityNote);
1028        // show sample group name
1029        {
1030            Glib::ustring s = "---";
1031            if (d->pSample && d->pSample->GetGroup())
1032                s = d->pSample->GetGroup()->Name;
1033            eSampleGroup.text.set_text(s);
1034        }
1035        // assemble sample format info string
1036        {
1037            Glib::ustring s;
1038            if (d->pSample) {
1039                switch (d->pSample->Channels) {
1040                    case 1: s = _("Mono"); break;
1041                    case 2: s = _("Stereo"); break;
1042                    default:
1043                        s = ToString(d->pSample->Channels) + _(" audio channels");
1044                        break;
1045                }
1046                s += " " + ToString(d->pSample->BitDepth) + " Bits";
1047                s += " " + ToString(d->pSample->SamplesPerSecond/1000) + "."
1048                          + ToString((d->pSample->SamplesPerSecond%1000)/100) + " kHz";
1049            } else {
1050                s = _("No sample assigned to this dimension region.");
1051            }
1052            eSampleFormatInfo.text.set_text(s);
1053        }
1054        // generate sample's memory address pointer string
1055        {
1056            Glib::ustring s;
1057            if (d->pSample) {
1058                char buf[64] = {};
1059                snprintf(buf, sizeof(buf), "%p", d->pSample);
1060                s = buf;
1061            } else {
1062                s = "---";
1063            }
1064            eSampleID.text.set_text(s);
1065        }
1066        // generate raw wave form data CRC-32 checksum string
1067        {
1068            Glib::ustring s = "---";
1069            if (d->pSample) {
1070                char buf[64] = {};
1071                snprintf(buf, sizeof(buf), "%x", d->pSample->GetWaveDataCRC32Checksum());
1072                s = buf;
1073            }
1074            eChecksum.text.set_text(s);
1075        }
1076        buttonSelectSample.set_sensitive(d && d->pSample);
1077      eFineTune.set_value(d->FineTune);      eFineTune.set_value(d->FineTune);
1078      eGain.set_value(d->Gain);      eGain.set_value(d->Gain);
1079      eGainPlus6.set_value(d->Gain);      eGainPlus6.set_value(d->Gain);
# Line 1153  void DimRegionEdit::loop_infinite_toggle Line 1315  void DimRegionEdit::loop_infinite_toggle
1315    
1316  bool DimRegionEdit::set_sample(gig::Sample* sample, bool copy_sample_unity, bool copy_sample_tune, bool copy_sample_loop)  bool DimRegionEdit::set_sample(gig::Sample* sample, bool copy_sample_unity, bool copy_sample_tune, bool copy_sample_loop)
1317  {  {
1318      if (dimregion) {      bool result = false;
1319        for (std::set<gig::DimensionRegion*>::iterator itDimReg = dimregs.begin();
1320             itDimReg != dimregs.end(); ++itDimReg)
1321        {
1322            result |= set_sample(*itDimReg, sample, copy_sample_unity, copy_sample_tune, copy_sample_loop);
1323        }
1324        return result;
1325    }
1326    
1327    bool DimRegionEdit::set_sample(gig::DimensionRegion* dimreg, gig::Sample* sample, bool copy_sample_unity, bool copy_sample_tune, bool copy_sample_loop)
1328    {
1329        if (dimreg) {
1330          //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
1331    
1332          // 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()
# Line 1162  bool DimRegionEdit::set_sample(gig::Samp Line 1335  bool DimRegionEdit::set_sample(gig::Samp
1335          // make sure stereo samples always are the same in both          // make sure stereo samples always are the same in both
1336          // dimregs in the samplechannel dimension          // dimregs in the samplechannel dimension
1337          int nbDimregs = 1;          int nbDimregs = 1;
1338          gig::DimensionRegion* d[2] = { dimregion, 0 };          gig::DimensionRegion* d[2] = { dimreg, 0 };
1339          if (sample->Channels == 2) {          if (sample->Channels == 2) {
1340              gig::Region* region = dimregion->GetParent();              gig::Region* region = dimreg->GetParent();
1341    
1342              int bitcount = 0;              int bitcount = 0;
1343              int stereo_bit = 0;              int stereo_bit = 0;
# Line 1179  bool DimRegionEdit::set_sample(gig::Samp Line 1352  bool DimRegionEdit::set_sample(gig::Samp
1352              if (stereo_bit) {              if (stereo_bit) {
1353                  int dimregno;                  int dimregno;
1354                  for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {                  for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1355                      if (region->pDimensionRegions[dimregno] == dimregion) {                      if (region->pDimensionRegions[dimregno] == dimreg) {
1356                          break;                          break;
1357                      }                      }
1358                  }                  }
# Line 1189  bool DimRegionEdit::set_sample(gig::Samp Line 1362  bool DimRegionEdit::set_sample(gig::Samp
1362              }              }
1363          }          }
1364    
1365          gig::Sample* oldref = dimregion->pSample;          gig::Sample* oldref = dimreg->pSample;
1366    
1367          for (int i = 0 ; i < nbDimregs ; i++) {          for (int i = 0 ; i < nbDimregs ; i++) {
1368              d[i]->pSample = sample;              d[i]->pSample = sample;
# Line 1219  bool DimRegionEdit::set_sample(gig::Samp Line 1392  bool DimRegionEdit::set_sample(gig::Samp
1392    
1393          // update ui          // update ui
1394          update_model++;          update_model++;
1395          wSample->set_text(gig_to_utf8(dimregion->pSample->pInfo->Name));          wSample->set_text(gig_to_utf8(dimreg->pSample->pInfo->Name));
1396          eUnityNote.set_value(dimregion->UnityNote);          eUnityNote.set_value(dimreg->UnityNote);
1397          eFineTune.set_value(dimregion->FineTune);          eFineTune.set_value(dimreg->FineTune);
1398          eSampleLoopEnabled.set_value(dimregion->SampleLoops);          eSampleLoopEnabled.set_value(dimreg->SampleLoops);
1399          update_loop_elements();          update_loop_elements();
1400          update_model--;          update_model--;
1401    
1402          sample_ref_changed_signal.emit(oldref, sample);          sample_ref_changed_signal.emit(oldref, sample);
1403          // 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()
1404          //dimreg_changed_signal.emit(dimregion);          //dimreg_changed_signal.emit(dimreg);
1405          return true;          return true;
1406      }      }
1407      return false;      return false;
# Line 1358  void DimRegionEdit::set_LoopPlayCount(gi Line 1531  void DimRegionEdit::set_LoopPlayCount(gi
1531  {  {
1532      if (d->pSample) d->pSample->LoopPlayCount = value;      if (d->pSample) d->pSample->LoopPlayCount = value;
1533  }  }
1534    
1535    void DimRegionEdit::nullOutSampleReference() {
1536        if (!dimregion) return;
1537        gig::Sample* oldref = dimregion->pSample;
1538        if (!oldref) return;
1539    
1540        dimreg_to_be_changed_signal.emit(dimregion);
1541    
1542        // in case currently assigned sample is a stereo one, then remove both
1543        // references (expected to be due to a "stereo dimension")
1544        gig::DimensionRegion* d[2] = { dimregion, NULL };
1545        if (oldref->Channels == 2) {
1546            gig::Region* region = dimregion->GetParent();
1547            {
1548                int stereo_bit = 0;
1549                int bitcount = 0;
1550                for (int dim = 0 ; dim < region->Dimensions ; dim++) {
1551                    if (region->pDimensionDefinitions[dim].dimension == gig::dimension_samplechannel) {
1552                        stereo_bit = 1 << bitcount;
1553                        break;
1554                    }
1555                    bitcount += region->pDimensionDefinitions[dim].bits;
1556                }
1557    
1558                if (stereo_bit) {
1559                    int dimregno;
1560                    for (dimregno = 0 ; dimregno < region->DimensionRegions ; dimregno++) {
1561                        if (region->pDimensionRegions[dimregno] == dimregion) {
1562                            break;
1563                        }
1564                    }
1565                    d[0] = region->pDimensionRegions[dimregno & ~stereo_bit];
1566                    d[1] = region->pDimensionRegions[dimregno | stereo_bit];
1567                }
1568            }
1569        }
1570    
1571        if (d[0]) d[0]->pSample = NULL;
1572        if (d[1]) d[1]->pSample = NULL;
1573    
1574        // update UI elements
1575        set_dim_region(dimregion);
1576    
1577        sample_ref_changed_signal.emit(oldref, NULL);
1578        dimreg_changed_signal.emit(dimregion);
1579    }
1580    
1581    void DimRegionEdit::onButtonSelectSamplePressed() {
1582        if (!dimregion) return;
1583        if (!dimregion->pSample) return;
1584        select_sample_signal.emit(dimregion->pSample);
1585    }
1586    
1587    sigc::signal<void, gig::Sample*>& DimRegionEdit::signal_select_sample() {
1588        return select_sample_signal;
1589    }

Legend:
Removed from v.2536  
changed lines
  Added in v.3070

  ViewVC Help
Powered by ViewVC