--- gigedit/trunk/src/gigedit/dimregionedit.cpp	2013/03/03 17:26:11	2430
+++ gigedit/trunk/src/gigedit/dimregionedit.cpp	2013/09/05 00:49:13	2464
@@ -928,7 +928,8 @@
         d->pSample ? d->pSample->LoopPlayCount : 0);
     update_model--;
 
-    wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : _("NULL"));
+    wSample->set_text(d->pSample ? gig_to_utf8(d->pSample->pInfo->Name) :
+                      _("NULL"));
 
     update_loop_elements();
     VCFEnabled_toggled();
@@ -1150,7 +1151,7 @@
     update_model--;
 }
 
-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)
 {
     if (dimregion) {
         //TODO: we should better move the code from MainWindow::on_sample_label_drop_drag_data_received() here
@@ -1194,29 +1195,31 @@
             d[i]->pSample = sample;
 
             // copy sample information from Sample to DimensionRegion
-
-            d[i]->UnityNote = sample->MIDIUnityNote;
-            d[i]->FineTune = sample->FineTune;
-
-            int loops = sample->Loops ? 1 : 0;
-            while (d[i]->SampleLoops > loops) {
-                d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);
-            }
-            while (d[i]->SampleLoops < sample->Loops) {
-                DLS::sample_loop_t loop;
-                d[i]->AddSampleLoop(&loop);
-            }
-            if (loops) {
-                d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);
-                d[i]->pSampleLoops[0].LoopType = sample->LoopType;
-                d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;
-                d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;
+            if (copy_sample_unity)
+                d[i]->UnityNote = sample->MIDIUnityNote;
+            if (copy_sample_tune)
+                d[i]->FineTune = sample->FineTune;
+            if (copy_sample_loop) {
+                int loops = sample->Loops ? 1 : 0;
+                while (d[i]->SampleLoops > loops) {
+                    d[i]->DeleteSampleLoop(&d[i]->pSampleLoops[0]);
+                }
+                while (d[i]->SampleLoops < sample->Loops) {
+                    DLS::sample_loop_t loop;
+                    d[i]->AddSampleLoop(&loop);
+                }
+                if (loops) {
+                    d[i]->pSampleLoops[0].Size = sizeof(DLS::sample_loop_t);
+                    d[i]->pSampleLoops[0].LoopType = sample->LoopType;
+                    d[i]->pSampleLoops[0].LoopStart = sample->LoopStart;
+                    d[i]->pSampleLoops[0].LoopLength = sample->LoopEnd - sample->LoopStart + 1;
+                }
             }
         }
 
         // update ui
         update_model++;
-        wSample->set_text(dimregion->pSample->pInfo->Name);
+        wSample->set_text(gig_to_utf8(dimregion->pSample->pInfo->Name));
         eUnityNote.set_value(dimregion->UnityNote);
         eFineTune.set_value(dimregion->FineTune);
         eSampleLoopEnabled.set_value(dimregion->SampleLoops);