--- gigedit/trunk/src/gigedit/dimregionedit.cpp	2007/07/22 15:07:08	1262
+++ gigedit/trunk/src/gigedit/dimregionedit.cpp	2007/09/04 11:04:56	1322
@@ -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))
+    );
 }
 
 
@@ -791,16 +797,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();
@@ -812,7 +820,7 @@
     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);
@@ -834,13 +842,13 @@
         // 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
         );
@@ -853,6 +861,7 @@
 
 void DimRegionEdit::loop_infinite_toggled() {
     eSampleLoopPlayCount.set_sensitive(
+        dimregion && dimregion->pSample &&
         !eSampleLoopInfinite.get_active() &&
          eSampleLoopEnabled.get_active()
     );
@@ -861,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<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;
+}