--- gigedit/trunk/src/gigedit/dimregionedit.cpp	2007/08/26 09:29:52	1303
+++ gigedit/trunk/src/gigedit/dimregionedit.cpp	2007/09/30 18:30:52	1359
@@ -499,7 +499,9 @@
     table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1,
                           Gtk::FILL, Gtk::SHRINK);
     rowno++;
-    boolentry.signal_changed_by_user().connect(dimreg_changed_signal.make_slot());
+    boolentry.signal_changed_by_user().connect(
+        sigc::bind(dimreg_changed_signal.make_slot(), sigc::ref(this->dimregion))
+    );
 }
 
 void DimRegionEdit::addProp(BoolEntryPlus6& boolentry)
@@ -507,7 +509,9 @@
     table[pageno]->attach(boolentry.widget, 1, 3, rowno, rowno + 1,
                           Gtk::FILL, Gtk::SHRINK);
     rowno++;
-    boolentry.signal_changed_by_user().connect(dimreg_changed_signal.make_slot());
+    boolentry.signal_changed_by_user().connect(
+        sigc::bind(dimreg_changed_signal.make_slot(), sigc::ref(this->dimregion))
+    );
 }
 
 void DimRegionEdit::addProp(LabelWidget& prop)
@@ -517,7 +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(dimreg_changed_signal.make_slot());
+    prop.signal_changed_by_user().connect(
+        sigc::bind(dimreg_changed_signal.make_slot(), sigc::ref(this->dimregion))
+    );
 }
 
 
@@ -525,6 +531,18 @@
 {
     dimregion = d;
 
+    // disconnect connections to old dimregion, to avoid segfaults
+    connection_eVCFCutoffController.disconnect();
+    connection_eVCFVelocityCurve.disconnect();
+    connection_eVCFVelocityScale.disconnect();
+    connection_eVCFVelocityDynamicRange.disconnect();
+    connection_eVelocityResponseCurve.disconnect();
+    connection_eVelocityResponseDepth.disconnect();
+    connection_eVelocityResponseCurveScaling.disconnect();
+    connection_eReleaseVelocityResponseCurve.disconnect();
+    connection_eReleaseVelocityResponseDepth.disconnect();
+    connection_eGain.disconnect();
+
     set_sensitive(d);
     if (!d) return;
 
@@ -576,21 +594,57 @@
     eVCFEnabled.set_ptr(&d->VCFEnabled);
     eVCFType.set_ptr(&d->VCFType);
     eVCFCutoffController.set_ptr(&d->VCFCutoffController);
+    connection_eVCFCutoffController =
+        eVCFCutoffController.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVCFCutoffController)
+        );
     eVCFCutoffControllerInvert.set_ptr(&d->VCFCutoffControllerInvert);
     eVCFCutoff.set_ptr(&d->VCFCutoff);
     eVCFVelocityCurve.set_ptr(&d->VCFVelocityCurve);
+    connection_eVCFVelocityCurve =
+        eVCFVelocityCurve.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVCFVelocityCurve)
+        );
     eVCFVelocityScale.set_ptr(&d->VCFVelocityScale);
+    connection_eVCFVelocityScale =
+        eVCFVelocityScale.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVCFVelocityScale)
+        );
     eVCFVelocityDynamicRange.set_ptr(&d->VCFVelocityDynamicRange);
+    connection_eVCFVelocityDynamicRange =
+        eVCFVelocityDynamicRange.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVCFVelocityDynamicRange)
+        );
     eVCFResonance.set_ptr(&d->VCFResonance);
     eVCFResonanceDynamic.set_ptr(&d->VCFResonanceDynamic);
     eVCFResonanceController.set_ptr(&d->VCFResonanceController);
     eVCFKeyboardTracking.set_ptr(&d->VCFKeyboardTracking);
     eVCFKeyboardTrackingBreakpoint.set_ptr(&d->VCFKeyboardTrackingBreakpoint);
     eVelocityResponseCurve.set_ptr(&d->VelocityResponseCurve);
+    connection_eVelocityResponseCurve =
+        eVelocityResponseCurve.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVelocityResponseCurve)
+        );
     eVelocityResponseDepth.set_ptr(&d->VelocityResponseDepth);
+    connection_eVelocityResponseDepth =
+        eVelocityResponseDepth.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVelocityResponseDepth)
+        );
     eVelocityResponseCurveScaling.set_ptr(&d->VelocityResponseCurveScaling);
+    connection_eVelocityResponseCurveScaling =
+        eVelocityResponseCurveScaling.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetVelocityResponseCurveScaling)
+        );
     eReleaseVelocityResponseCurve.set_ptr(&d->ReleaseVelocityResponseCurve);
+    connection_eReleaseVelocityResponseCurve =
+        eReleaseVelocityResponseCurve.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetReleaseVelocityResponseCurve)
+        );
     eReleaseVelocityResponseDepth.set_ptr(&d->ReleaseVelocityResponseDepth);
+    connection_eReleaseVelocityResponseDepth =
+        eReleaseVelocityResponseDepth.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetReleaseVelocityResponseDepth)
+        );
     eReleaseTriggerDecay.set_ptr(&d->ReleaseTriggerDecay);
 
     eCrossfade_in_start.set_ptr(0);
@@ -616,6 +670,10 @@
     eUnityNote.set_ptr(&d->UnityNote);
     eFineTune.set_ptr(&d->FineTune);
     eGain.set_ptr(&d->Gain);
+    connection_eGain =
+        eGain.signal_value_changed().connect(
+            sigc::mem_fun(d, &gig::DimensionRegion::SetGain)
+        );
     eGainPlus6.set_ptr(&d->Gain);
 
     eSampleLoopEnabled.set_active(d->SampleLoops);
@@ -791,16 +849,18 @@
             loop.LoopStart  = 0;
             loop.LoopLength =
                 (dimregion->pSample) ? dimregion->pSample->GetSize() : 0;
+            dimreg_to_be_changed_signal.emit(dimregion);
             dimregion->AddSampleLoop(&loop);
-            dimreg_changed_signal();
+            dimreg_changed_signal.emit(dimregion);
         }
     } else {
         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();
+            dimreg_changed_signal.emit(dimregion);
         }
     }
     updateLoopElements();
@@ -866,6 +926,12 @@
 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
@@ -895,8 +961,22 @@
         eSampleLoopEnabled.set_active(dimregion->SampleLoops);
         updateLoopElements();
 
-        dimreg_changed_signal();
+        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<void, gig::DimensionRegion*>& DimRegionEdit::signal_dimreg_to_be_changed() {
+    return dimreg_to_be_changed_signal;
+}
+
+sigc::signal<void, gig::DimensionRegion*>& DimRegionEdit::signal_dimreg_changed() {
+    return dimreg_changed_signal;
+}
+
+sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& DimRegionEdit::signal_sample_ref_changed() {
+    return sample_ref_changed_signal;
+}