--- gigedit/trunk/src/gigedit/dimregionedit.cpp 2007/06/10 10:56:11 1225 +++ gigedit/trunk/src/gigedit/dimregionedit.cpp 2007/09/10 19:56:26 1339 @@ -413,20 +413,20 @@ eVCFResonanceController.signal_changed().connect( sigc::mem_fun(*this, &DimRegionEdit::VCFResonanceController_changed) ); - eCrossfade_in_start.signal_value_changed().connect( + eCrossfade_in_start.signal_changed_by_user().connect( sigc::mem_fun(*this, &DimRegionEdit::crossfade1_changed)); - eCrossfade_in_end.signal_value_changed().connect( + eCrossfade_in_end.signal_changed_by_user().connect( sigc::mem_fun(*this, &DimRegionEdit::crossfade2_changed)); - eCrossfade_out_start.signal_value_changed().connect( + eCrossfade_out_start.signal_changed_by_user().connect( sigc::mem_fun(*this, &DimRegionEdit::crossfade3_changed)); - eCrossfade_out_end.signal_value_changed().connect( + eCrossfade_out_end.signal_changed_by_user().connect( sigc::mem_fun(*this, &DimRegionEdit::crossfade4_changed)); eSampleLoopEnabled.signal_toggled().connect( sigc::mem_fun(*this, &DimRegionEdit::loop_enabled_toggled)); - eSampleLoopStart.signal_value_changed().connect( + eSampleLoopStart.signal_changed_by_user().connect( sigc::mem_fun(*this, &DimRegionEdit::updateLoopElements)); - eSampleLoopLength.signal_value_changed().connect( + eSampleLoopLength.signal_changed_by_user().connect( sigc::mem_fun(*this, &DimRegionEdit::updateLoopElements)); eSampleLoopInfinite.signal_toggled().connect( sigc::mem_fun(*this, &DimRegionEdit::loop_infinite_toggled)); @@ -499,6 +499,19 @@ table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1, Gtk::FILL, Gtk::SHRINK); rowno++; + boolentry.signal_changed_by_user().connect( + sigc::bind(dimreg_changed_signal.make_slot(), sigc::ref(this->dimregion)) + ); +} + +void DimRegionEdit::addProp(BoolEntryPlus6& boolentry) +{ + table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1, + Gtk::FILL, Gtk::SHRINK); + rowno++; + boolentry.signal_changed_by_user().connect( + sigc::bind(dimreg_changed_signal.make_slot(), sigc::ref(this->dimregion)) + ); } void DimRegionEdit::addProp(LabelWidget& prop) @@ -508,6 +521,9 @@ table[pageno]->attach(prop.widget, 2, 3, rowno, rowno + 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK); rowno++; + prop.signal_changed_by_user().connect( + sigc::bind(dimreg_changed_signal.make_slot(), sigc::ref(this->dimregion)) + ); } @@ -518,7 +534,6 @@ set_sensitive(d); if (!d) return; - update_gui = false; wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : "NULL"); eEG1PreAttack.set_ptr(&d->EG1PreAttack); eEG1Attack.set_ptr(&d->EG1Attack); @@ -583,10 +598,16 @@ eReleaseVelocityResponseCurve.set_ptr(&d->ReleaseVelocityResponseCurve); eReleaseVelocityResponseDepth.set_ptr(&d->ReleaseVelocityResponseDepth); eReleaseTriggerDecay.set_ptr(&d->ReleaseTriggerDecay); + + eCrossfade_in_start.set_ptr(0); + eCrossfade_in_end.set_ptr(0); + eCrossfade_out_start.set_ptr(0); + eCrossfade_out_end.set_ptr(0); eCrossfade_in_start.set_ptr(&d->Crossfade.in_start); eCrossfade_in_end.set_ptr(&d->Crossfade.in_end); eCrossfade_out_start.set_ptr(&d->Crossfade.out_start); eCrossfade_out_end.set_ptr(&d->Crossfade.out_end); + ePitchTrack.set_ptr(&d->PitchTrack); eDimensionBypass.set_ptr(&d->DimensionBypass); ePan.set_ptr(&d->Pan); @@ -607,8 +628,6 @@ updateLoopElements(); VCFEnabled_toggled(); - - update_gui = true; } void DimRegionEdit::VCFEnabled_toggled() @@ -778,12 +797,19 @@ loop.LoopStart = 0; loop.LoopLength = (dimregion->pSample) ? dimregion->pSample->GetSize() : 0; + dimreg_to_be_changed_signal.emit(dimregion); dimregion->AddSampleLoop(&loop); + dimreg_changed_signal.emit(dimregion); } } else { - // delete ALL existing sample loops - while (dimregion->SampleLoops) - dimregion->DeleteSampleLoop(&dimregion->pSampleLoops[0]); + if (dimregion->SampleLoops) { + dimreg_to_be_changed_signal.emit(dimregion); + // delete ALL existing sample loops + while (dimregion->SampleLoops) { + dimregion->DeleteSampleLoop(&dimregion->pSampleLoops[0]); + } + dimreg_changed_signal.emit(dimregion); + } } updateLoopElements(); } @@ -794,42 +820,48 @@ eSampleLoopStart.set_sensitive(active); eSampleLoopLength.set_sensitive(active); eSampleLoopType.set_sensitive(active); - eSampleLoopInfinite.set_sensitive(active); + eSampleLoopInfinite.set_sensitive(active && dimregion && dimregion->pSample); + eSampleLoopStart.set_ptr(0); + eSampleLoopLength.set_ptr(0); + eSampleLoopPlayCount.set_ptr(0); + if (dimregion && dimregion->SampleLoops) { eSampleLoopStart.set_ptr(&dimregion->pSampleLoops[0].LoopStart); eSampleLoopLength.set_ptr(&dimregion->pSampleLoops[0].LoopLength); eSampleLoopType.set_ptr(&dimregion->pSampleLoops[0].LoopType); - eSampleLoopPlayCount.set_ptr( - (dimregion->pSample) ? &dimregion->pSample->LoopPlayCount : NULL - ); eSampleLoopInfinite.set_active( dimregion->pSample && !dimregion->pSample->LoopPlayCount ); + // updated enabled state of loop play count widget + loop_infinite_toggled(); + + eSampleLoopPlayCount.set_ptr( + (dimregion->pSample) ? &dimregion->pSample->LoopPlayCount : 0 + ); + // sample loop shall never be longer than the actual sample size eSampleLoopStart.set_upper( (dimregion->pSample) - ? dimregion->pSample->GetSize() - + ? dimregion->pSample->SamplesTotal - dimregion->pSampleLoops[0].LoopLength : 0 ); eSampleLoopLength.set_upper( (dimregion->pSample) - ? dimregion->pSample->GetSize() - + ? dimregion->pSample->SamplesTotal - dimregion->pSampleLoops[0].LoopStart : 0 ); } else { // no sample loop(s) - eSampleLoopStart.set_ptr(NULL); - eSampleLoopLength.set_ptr(NULL); - eSampleLoopType.set_ptr(NULL); - eSampleLoopPlayCount.set_ptr(NULL); + eSampleLoopType.set_ptr(0); + // updated enabled state of loop play count widget + loop_infinite_toggled(); } - // updated enabled state of loop play count widget - loop_infinite_toggled(); } void DimRegionEdit::loop_infinite_toggled() { eSampleLoopPlayCount.set_sensitive( + dimregion && dimregion->pSample && !eSampleLoopInfinite.get_active() && eSampleLoopEnabled.get_active() ); @@ -838,3 +870,61 @@ else if (!eSampleLoopPlayCount.get_value()) eSampleLoopPlayCount.set_value(1); } + +bool DimRegionEdit::set_sample(gig::Sample* sample) +{ + if (dimregion) { + //TODO: we should better move the code from MainWindow::on_sample_label_drop_drag_data_received() here + + // currently commented because we're sending a similar signal in MainWindow::on_sample_label_drop_drag_data_received() + //dimreg_to_be_changed_signal.emit(dimregion); + + gig::Sample* oldref = dimregion->pSample; + dimregion->pSample = sample; + + // copy sample information from Sample to DimensionRegion + + dimregion->UnityNote = sample->MIDIUnityNote; + dimregion->FineTune = sample->FineTune; + + int loops = sample->Loops ? 1 : 0; + while (dimregion->SampleLoops > loops) { + dimregion->DeleteSampleLoop(&dimregion->pSampleLoops[0]); + } + while (dimregion->SampleLoops < sample->Loops) { + DLS::sample_loop_t loop; + dimregion->AddSampleLoop(&loop); + } + if (loops) { + dimregion->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t); + dimregion->pSampleLoops[0].LoopType = sample->LoopType; + dimregion->pSampleLoops[0].LoopStart = sample->LoopStart; + dimregion->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1; + } + + // update ui + wSample->set_text(dimregion->pSample->pInfo->Name); + eUnityNote.set_ptr(&dimregion->UnityNote); + eFineTune.set_ptr(&dimregion->FineTune); + eSampleLoopEnabled.set_active(dimregion->SampleLoops); + updateLoopElements(); + + sample_ref_changed_signal.emit(oldref, sample); + // currently commented because we're sending a similar signal in MainWindow::on_sample_label_drop_drag_data_received() + //dimreg_changed_signal.emit(dimregion); + return true; + } + return false; +} + +sigc::signal& DimRegionEdit::signal_dimreg_to_be_changed() { + return dimreg_to_be_changed_signal; +} + +sigc::signal& DimRegionEdit::signal_dimreg_changed() { + return dimreg_changed_signal; +} + +sigc::signal& DimRegionEdit::signal_sample_ref_changed() { + return sample_ref_changed_signal; +}