/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 1261 by persson,
Thu Jul  5 17:12:20 2007 UTC
+revision 2445 by persson,
Sun Apr 28 06:07:22 2013 UTC
 Line 1
  /*
-  * Copyright (C) 2006, 2007 Andreas Persson
+  * Copyright (C) 2006-2013 Andreas Persson
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License as
 Line 17
   * 02110-1301 USA.
   */
- #include <libintl.h>
  #include <iostream>
+ #include <cstring>
+ #include <glibmm/convert.h>
+ #include <glibmm/dispatcher.h>
+ #include <glibmm/miscutils.h>
+ #include <glibmm/stringutils.h>
+ #include <gtkmm/aboutdialog.h>
  #include <gtkmm/filechooserdialog.h>
  #include <gtkmm/messagedialog.h>
  #include <gtkmm/stock.h>
  #include <gtkmm/targetentry.h>
  #include <gtkmm/main.h>
+ #include <gtkmm/toggleaction.h>
- #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2
+ #if GTKMM_MAJOR_VERSION < 3
- #define ABOUT_DIALOG
+ #include "wrapLabel.hh"
- #include <gtkmm/aboutdialog.h>
  #endif
+ #include "global.h"
+ #include "compat.h"
  #include <stdio.h>
  #include <sndfile.h>
  #include "mainwindow.h"
- #define _(String) gettext(String)
+ #include "../../gfx/status_attached.xpm"
+ #include "../../gfx/status_detached.xpm"
- template<class T> inline std::string ToString(T o) {
-     std::stringstream ss;
-     ss << o;
-     return ss.str();
- }
- MainWindow::MainWindow()
+ MainWindow::MainWindow() :
+     dimreg_label(_("Changes apply to:")),
+     dimreg_all_regions(_("all regions")),
+     dimreg_all_dimregs(_("all dimension splits")),
+     dimreg_stereo(_("both channels"))
  {
  //    set_border_width(5);
  //    set_default_size(400, 200);
-Line 53 
 MainWindow::MainWindow()
+Line 60 
 MainWindow::MainWindow()
      add(m_VBox);
      // Handle selection
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     m_TreeView.get_selection()->signal_changed().connect(
-     tree_sel_ref->signal_changed().connect(
          sigc::mem_fun(*this, &MainWindow::on_sel_change));
      // m_TreeView.set_reorderable();
-Line 74 
 MainWindow::MainWindow()
+Line 80 
 MainWindow::MainWindow()
      m_TreeViewNotebook.set_size_request(300);
      m_HPaned.add1(m_TreeViewNotebook);
-     m_HPaned.add2(dimreg_edit);
+     dimreg_hbox.add(dimreg_label);
+     dimreg_hbox.add(dimreg_all_regions);
+     dimreg_hbox.add(dimreg_all_dimregs);
+     dimreg_stereo.set_active();
+     dimreg_hbox.add(dimreg_stereo);
+     dimreg_vbox.add(dimreg_edit);
+     dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);
+     m_HPaned.add2(dimreg_vbox);
-     m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, "Samples");
+     m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
-     m_TreeViewNotebook.append_page(m_ScrolledWindow, "Instruments");
+     m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
      actionGroup = Gtk::ActionGroup::create();
-Line 115 
 MainWindow::MainWindow()
+Line 128 
 MainWindow::MainWindow()
                           *this, &MainWindow::on_action_quit));
      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));
+     actionGroup->add(Gtk::Action::create("MenuView", _("_View")));
+     Glib::RefPtr<Gtk::ToggleAction> toggle_action =
+         Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));
+     toggle_action->set_active(true);
+     actionGroup->add(toggle_action,
+                      sigc::mem_fun(
+                          *this, &MainWindow::on_action_view_status_bar));
      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
      actionGroup->add(Gtk::Action::create("MenuHelp",
                                           action->property_label()));
- #ifdef ABOUT_DIALOG
      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
                       sigc::mem_fun(
                           *this, &MainWindow::on_action_help_about));
- #endif
      actionGroup->add(
          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
      );
      actionGroup->add(
+         Gtk::Action::create("DupInstrument", _("_Duplicate Instrument")),
+         sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
+     );
+     actionGroup->add(
          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),
          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
      );
-Line 142 
 MainWindow::MainWindow()
+Line 165 
 MainWindow::MainWindow()
          sigc::mem_fun(*this, &MainWindow::on_action_add_group)
      );
      actionGroup->add(
-         Gtk::Action::create("AddSample", _("Add _Sample(s)")),
+         Gtk::Action::create("AddSample", _("Add _Sample(s)...")),
          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
      );
      actionGroup->add(
          Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE),
          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
      );
+     actionGroup->add(
+         Gtk::Action::create("ReplaceAllSamplesInAllGroups",
+                             _("Replace All Samples in All Groups...")),
+         sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
+     );
      uiManager = Gtk::UIManager::create();
      uiManager->insert_action_group(actionGroup);
-Line 170 
 MainWindow::MainWindow()
+Line 198 
 MainWindow::MainWindow()
          "    </menu>"
          "    <menu action='MenuInstrument'>"
          "    </menu>"
- #ifdef ABOUT_DIALOG
+         "    <menu action='MenuView'>"
+         "      <menuitem action='Statusbar'/>"
+         "    </menu>"
          "    <menu action='MenuHelp'>"
          "      <menuitem action='About'/>"
          "    </menu>"
- #endif
          "  </menubar>"
          "  <popup name='PopupMenu'>"
          "    <menuitem action='InstrProperties'/>"
          "    <menuitem action='AddInstrument'/>"
+         "    <menuitem action='DupInstrument'/>"
          "    <separator/>"
          "    <menuitem action='RemoveInstrument'/>"
          "  </popup>"
-Line 186 
 MainWindow::MainWindow()
+Line 216 
 MainWindow::MainWindow()
          "    <menuitem action='SampleProperties'/>"
          "    <menuitem action='AddGroup'/>"
          "    <menuitem action='AddSample'/>"
+         "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
          "    <separator/>"
          "    <menuitem action='RemoveSample'/>"
          "  </popup>"
-Line 194 
 MainWindow::MainWindow()
+Line 225 
 MainWindow::MainWindow()
      popup_menu = dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/PopupMenu"));
+     instrument_menu = static_cast<Gtk::MenuItem*>(
+         uiManager->get_widget("/MenuBar/MenuInstrument"))->get_submenu();
      Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar");
      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
      m_VBox.pack_start(m_HPaned);
      m_VBox.pack_start(m_RegionChooser, Gtk::PACK_SHRINK);
+     m_VBox.pack_start(m_RegionChooser.m_VirtKeybPropsBox, Gtk::PACK_SHRINK);
      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
+     m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
+     set_file_is_shared(false);
+     // Status Bar:
+     m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
+     m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
+     m_StatusBar.show();
      m_RegionChooser.signal_region_selected().connect(
          sigc::mem_fun(*this, &MainWindow::region_changed) );
-Line 209 
 MainWindow::MainWindow()
+Line 252 
 MainWindow::MainWindow()
      // Create the Tree model:
      m_refTreeModel = Gtk::ListStore::create(m_Columns);
      m_TreeView.set_model(m_refTreeModel);
-     m_refTreeModel->signal_row_changed().connect(
+     instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
      );
-Line 231 
 MainWindow::MainWindow()
+Line 274 
 MainWindow::MainWindow()
      );
      // establish drag&drop between samples tree view and dimension region 'Sample' text entry
-     std::list<Gtk::TargetEntry> drag_target_gig_sample;
+     std::vector<Gtk::TargetEntry> drag_target_gig_sample;
-     drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );
+     drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
+     m_TreeViewSamples.signal_drag_begin().connect(
+         sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)
+     );
      m_TreeViewSamples.signal_drag_data_get().connect(
          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_data_get)
      );
-Line 242 
 MainWindow::MainWindow()
+Line 288 
 MainWindow::MainWindow()
          sigc::mem_fun(*this, &MainWindow::on_sample_label_drop_drag_data_received)
      );
      dimreg_edit.signal_dimreg_changed().connect(
-         sigc::mem_fun(*this, &MainWindow::file_changed));
+         sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));
      m_RegionChooser.signal_instrument_changed().connect(
          sigc::mem_fun(*this, &MainWindow::file_changed));
      m_DimRegionChooser.signal_region_changed().connect(
          sigc::mem_fun(*this, &MainWindow::file_changed));
-     instrumentProps.signal_instrument_changed().connect(
+     instrumentProps.signal_changed().connect(
+         sigc::mem_fun(*this, &MainWindow::file_changed));
+     propDialog.signal_changed().connect(
          sigc::mem_fun(*this, &MainWindow::file_changed));
+     dimreg_edit.signal_dimreg_to_be_changed().connect(
+         dimreg_to_be_changed_signal.make_slot());
+     dimreg_edit.signal_dimreg_changed().connect(
+         dimreg_changed_signal.make_slot());
+     dimreg_edit.signal_sample_ref_changed().connect(
+         sample_ref_changed_signal.make_slot());
+     m_RegionChooser.signal_instrument_struct_to_be_changed().connect(
+         sigc::hide(
+             sigc::bind(
+                 file_structure_to_be_changed_signal.make_slot(),
+                 sigc::ref(this->file)
+             )
+         )
+     );
+     m_RegionChooser.signal_instrument_struct_changed().connect(
+         sigc::hide(
+             sigc::bind(
+                 file_structure_changed_signal.make_slot(),
+                 sigc::ref(this->file)
+             )
+         )
+     );
+     m_RegionChooser.signal_region_to_be_changed().connect(
+         region_to_be_changed_signal.make_slot());
+     m_RegionChooser.signal_region_changed_signal().connect(
+         region_changed_signal.make_slot());
+     note_on_signal.connect(
+         sigc::mem_fun(m_RegionChooser, &RegionChooser::on_note_on_event));
+     note_off_signal.connect(
+         sigc::mem_fun(m_RegionChooser, &RegionChooser::on_note_off_event));
+     dimreg_all_regions.signal_toggled().connect(
+         sigc::mem_fun(*this, &MainWindow::update_dimregs));
+     dimreg_all_dimregs.signal_toggled().connect(
+         sigc::mem_fun(*this, &MainWindow::dimreg_all_dimregs_toggled));
+     dimreg_stereo.signal_toggled().connect(
+         sigc::mem_fun(*this, &MainWindow::update_dimregs));
      file = 0;
      file_is_changed = false;
      show_all_children();
+     // start with a new gig file by default
+     on_action_file_new();
  }
  MainWindow::~MainWindow()
-Line 261 
 MainWindow::~MainWindow()
+Line 353 
 MainWindow::~MainWindow()
  bool MainWindow::on_delete_event(GdkEventAny* event)
  {
-     return file_is_changed && !close_confirmation_dialog();
+     return !file_is_shared && file_is_changed && !close_confirmation_dialog();
  }
  void MainWindow::on_action_quit()
  {
-     if (file_is_changed && !close_confirmation_dialog()) return;
+     if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
      hide();
  }
-Line 275 
 void MainWindow::region_changed()
+Line 367 
 void MainWindow::region_changed()
      m_DimRegionChooser.set_region(m_RegionChooser.get_region());
  }
+ gig::Instrument* MainWindow::get_instrument()
+ {
+     gig::Instrument* instrument = 0;
+     Gtk::TreeModel::const_iterator it =
+         m_TreeView.get_selection()->get_selected();
+     if (it) {
+         Gtk::TreeModel::Row row = *it;
+         instrument = row[m_Columns.m_col_instr];
+     }
+     return instrument;
+ }
+ void MainWindow::add_region_to_dimregs(gig::Region* region, bool stereo, bool all_dimregs)
+ {
+     if (all_dimregs) {
+         for (int i = 0 ; i < region->DimensionRegions ; i++) {
+             if (region->pDimensionRegions[i]) {
+                 dimreg_edit.dimregs.insert(region->pDimensionRegions[i]);
+             }
+         }
+     } else {
+         m_DimRegionChooser.get_dimregions(region, stereo, dimreg_edit.dimregs);
+     }
+ }
+ void MainWindow::update_dimregs()
+ {
+     dimreg_edit.dimregs.clear();
+     bool all_regions = dimreg_all_regions.get_active();
+     bool stereo = dimreg_stereo.get_active();
+     bool all_dimregs = dimreg_all_dimregs.get_active();
+     if (all_regions) {
+         gig::Instrument* instrument = get_instrument();
+         if (instrument) {
+             for (gig::Region* region = instrument->GetFirstRegion() ;
+                  region ;
+                  region = instrument->GetNextRegion()) {
+                 add_region_to_dimregs(region, stereo, all_dimregs);
+             }
+         }
+     } else {
+         gig::Region* region = m_RegionChooser.get_region();
+         if (region) {
+             add_region_to_dimregs(region, stereo, all_dimregs);
+         }
+     }
+ }
+ void MainWindow::dimreg_all_dimregs_toggled()
+ {
+     dimreg_stereo.set_sensitive(!dimreg_all_dimregs.get_active());
+     update_dimregs();
+ }
  void MainWindow::dimreg_changed()
  {
+     update_dimregs();
      dimreg_edit.set_dim_region(m_DimRegionChooser.get_dimregion());
  }
  void MainWindow::on_sel_change()
  {
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     // select item in instrument menu
+     Gtk::TreeModel::iterator it = m_TreeView.get_selection()->get_selected();
-     Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();
      if (it) {
-         Gtk::TreeModel::Row row = *it;
+         Gtk::TreePath path(it);
-         std::cout << row[m_Columns.m_col_name] << std::endl;
+         int index = path[0];
+         const std::vector<Gtk::Widget*> children =
-         m_RegionChooser.set_instrument(row[m_Columns.m_col_instr]);
+             instrument_menu->get_children();
-     } else {
+         static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
-         m_RegionChooser.set_instrument(0);
      }
+     m_RegionChooser.set_instrument(get_instrument());
  }
  void loader_progress_callback(gig::progress_t* progress)
-Line 304 
 void loader_progress_callback(gig::progr
+Line 452 
 void loader_progress_callback(gig::progr
  void Loader::progress_callback(float fraction)
  {
      {
-         Glib::Mutex::Lock lock(progressMutex);
+         Glib::Threads::Mutex::Lock lock(progressMutex);
          progress = fraction;
      }
      progress_dispatcher();
-Line 312 
 void Loader::progress_callback(float fra
+Line 460 
 void Loader::progress_callback(float fra
  void Loader::thread_function()
  {
-     printf("thread_function self=%x\n", Glib::Thread::self());
+     printf("thread_function self=%x\n", Glib::Threads::Thread::self());
      printf("Start %s\n", filename);
      RIFF::File* riff = new RIFF::File(filename);
      gig = new gig::File(riff);
-Line 326 
 void Loader::thread_function()
+Line 474 
 void Loader::thread_function()
  }
  Loader::Loader(const char* filename)
-     : thread(0), filename(filename)
+     : filename(filename), thread(0)
  {
  }
  void Loader::launch()
  {
+ #ifdef OLD_THREADS
      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
+ #else
+     thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
+ #endif
      printf("launch thread=%x\n", thread);
  }
-Line 340 
 float Loader::get_progress()
+Line 492 
 float Loader::get_progress()
  {
      float res;
      {
-         Glib::Mutex::Lock lock(progressMutex);
+         Glib::Threads::Mutex::Lock lock(progressMutex);
          res = progress;
      }
      return res;
-Line 366 
 LoadDialog::LoadDialog(const Glib::ustri
+Line 518 
 LoadDialog::LoadDialog(const Glib::ustri
  // Clear all GUI elements / controls. This method is typically called
  // before a new .gig file is to be created or to be loaded.
  void MainWindow::__clear() {
-     // remove all entries from "Instrument" menu
-     Gtk::MenuItem* instrument_menu =
-         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
-     instrument_menu->hide();
-     for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {
-         delete &instrument_menu->get_submenu()->items()[i];
-     }
-     instrument_menu->get_submenu()->items().clear();
      // forget all samples that ought to be imported
      m_SampleImportQueue.clear();
      // clear the samples and instruments tree views
      m_refTreeModel->clear();
      m_refSamplesTreeModel->clear();
-     // free libgig's gig::File instance
+     // remove all entries from "Instrument" menu
-     if (file) {
+     while (!instrument_menu->get_children().empty()) {
-         delete file;
+         remove_instrument_from_menu(0);
-         file = NULL;
      }
+     // free libgig's gig::File instance
+     if (file && !file_is_shared) delete file;
+     file = NULL;
+     set_file_is_shared(false);
  }
  void MainWindow::on_action_file_new()
  {
-     if (file_is_changed && !close_confirmation_dialog()) return;
+     if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
+     if (file_is_shared && !leaving_shared_mode_dialog()) return;
      // clear all GUI elements
      __clear();
-Line 396 
 void MainWindow::on_action_file_new()
+Line 545 
 void MainWindow::on_action_file_new()
      gig::File* pFile = new gig::File;
      // already add one new instrument by default
      gig::Instrument* pInstrument = pFile->AddInstrument();
-     pInstrument->pInfo->Name = "Unnamed Instrument";
+     pInstrument->pInfo->Name = _("Unnamed Instrument");
      // update GUI with that new gig::File
      load_gig(pFile, 0 /*no file name yet*/);
  }
-Line 413 
 bool MainWindow::close_confirmation_dial
+Line 562 
 bool MainWindow::close_confirmation_dial
      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);
      dialog.set_default_response(Gtk::RESPONSE_YES);
      int response = dialog.run();
+     dialog.hide();
      if (response == Gtk::RESPONSE_YES) return file_save();
      return response != Gtk::RESPONSE_CANCEL;
  }
+ bool MainWindow::leaving_shared_mode_dialog() {
+     Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
+     Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
+     dialog.set_secondary_text(
+         _("If you proceed to work on another instrument file, it won't be "
+           "used by the sampler until you tell the sampler explicitly to "
+           "load it."));
+     dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
+     dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+     dialog.set_default_response(Gtk::RESPONSE_CANCEL);
+     int response = dialog.run();
+     dialog.hide();
+     return response == Gtk::RESPONSE_YES;
+ }
  void MainWindow::on_action_file_open()
  {
-     if (file_is_changed && !close_confirmation_dialog()) return;
+     if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
+     if (file_is_shared && !leaving_shared_mode_dialog()) return;
      Gtk::FileChooserDialog dialog(*this, _("Open file"));
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
      dialog.set_default_response(Gtk::RESPONSE_OK);
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
      Gtk::FileFilter filter;
      filter.add_pattern("*.gig");
+ #else
+     Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
+     filter->add_pattern("*.gig");
+ #endif
      dialog.set_filter(filter);
-     if (current_dir != "") {
+     if (current_gig_dir != "") {
-         dialog.set_current_folder(current_dir);
+         dialog.set_current_folder(current_gig_dir);
      }
      if (dialog.run() == Gtk::RESPONSE_OK) {
          std::string filename = dialog.get_filename();
          printf("filename=%s\n", filename.c_str());
-         __clear();
+         printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
-         printf("on_action_file_open self=%x\n", Glib::Thread::self());
          load_file(filename.c_str());
-         current_dir = Glib::path_get_dirname(filename);
+         current_gig_dir = Glib::path_get_dirname(filename);
      }
  }
  void MainWindow::load_file(const char* name)
  {
-     load_dialog = new LoadDialog("Loading...", *this);
+     __clear();
+     load_dialog = new LoadDialog(_("Loading..."), *this);
      load_dialog->show_all();
      loader = new Loader(strdup(name));
      loader->signal_progress().connect(
-Line 460 
 void MainWindow::load_instrument(gig::In
+Line 632 
 void MainWindow::load_instrument(gig::In
          msg.run();
          Gtk::Main::quit();
      }
+     // clear all GUI elements
+     __clear();
+     // load the instrument
      gig::File* pFile = (gig::File*) instr->GetParent();
-     load_gig(pFile, 0 /*file name*/);
+     load_gig(pFile, 0 /*file name*/, true /*shared instrument*/);
      //TODO: automatically select the given instrument
  }
-Line 473 
 void MainWindow::on_loader_progress()
+Line 648 
 void MainWindow::on_loader_progress()
  void MainWindow::on_loader_finished()
  {
      printf("Loader finished!\n");
-     printf("on_loader_finished self=%x\n", Glib::Thread::self());
+     printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
      load_gig(loader->gig, loader->filename);
      load_dialog->hide();
  }
-Line 483 
 void MainWindow::on_action_file_save()
+Line 658 
 void MainWindow::on_action_file_save()
      file_save();
  }
- bool MainWindow::file_save()
+ bool MainWindow::check_if_savable()
  {
      if (!file) return false;
-     if (!file_has_name) return file_save_as();
+     if (!file->GetFirstSample()) {
+         Gtk::MessageDialog(*this, _("The file could not be saved "
+                                     "because it contains no samples"),
+                            false, Gtk::MESSAGE_ERROR).run();
+         return false;
+     }
+     for (gig::Instrument* instrument = file->GetFirstInstrument() ; instrument ;
+          instrument = file->GetNextInstrument()) {
+         if (!instrument->GetFirstRegion()) {
+             Gtk::MessageDialog(*this, _("The file could not be saved "
+                                         "because there are instruments "
+                                         "that have no regions"),
+                                false, Gtk::MESSAGE_ERROR).run();
+             return false;
+         }
+     }
+     return true;
+ }
+ bool MainWindow::file_save()
+ {
+     if (!check_if_savable()) return false;
+     if (!file_is_shared && !file_has_name) return file_save_as();
      std::cout << "Saving file\n" << std::flush;
+     file_structure_to_be_changed_signal.emit(this->file);
      try {
          file->Save();
          if (file_is_changed) {
-Line 496 
 bool MainWindow::file_save()
+Line 696 
 bool MainWindow::file_save()
              file_is_changed = false;
          }
      } catch (RIFF::Exception e) {
-         Glib::ustring txt = "Could not save file: " + e.Message;
+         file_structure_changed_signal.emit(this->file);
+         Glib::ustring txt = _("Could not save file: ") + e.Message;
          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
          msg.run();
          return false;
      }
      std::cout << "Saving file done\n" << std::flush;
      __import_queued_samples();
+     file_structure_changed_signal.emit(this->file);
      return true;
  }
  void MainWindow::on_action_file_save_as()
  {
+     if (!check_if_savable()) return;
      file_save_as();
  }
  bool MainWindow::file_save_as()
  {
-     if (!file) return false;
      Gtk::FileChooserDialog dialog(*this, _("Save as"), Gtk::FILE_CHOOSER_ACTION_SAVE);
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
      dialog.set_default_response(Gtk::RESPONSE_OK);
- #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 8) || GTKMM_MAJOR_VERSION > 2
      dialog.set_do_overwrite_confirmation();
-     // TODO: an overwrite dialog for gtkmm < 2.8
- #endif
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
      Gtk::FileFilter filter;
      filter.add_pattern("*.gig");
+ #else
+     Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
+     filter->add_pattern("*.gig");
+ #endif
      dialog.set_filter(filter);
-     if (Glib::path_is_absolute(filename)) {
+     // set initial dir and filename of the Save As dialog
-         dialog.set_filename(filename);
+     // and prepare that initial filename as a copy of the gig
-     } else if (current_dir != "") {
+     {
-         dialog.set_current_folder(current_dir);
+         std::string basename = Glib::path_get_basename(filename);
+         std::string dir = Glib::path_get_dirname(filename);
+         basename = std::string(_("copy_of_")) + basename;
+         Glib::ustring copyFileName = Glib::build_filename(dir, basename);
+         if (Glib::path_is_absolute(filename)) {
+             dialog.set_filename(copyFileName);
+         } else {
+             if (current_gig_dir != "") dialog.set_current_folder(current_gig_dir);
+         }
+         dialog.set_current_name(Glib::filename_display_basename(copyFileName));
      }
-     dialog.set_current_name(Glib::filename_display_basename(filename));
+     // show warning in the dialog
+     Gtk::HBox descriptionArea;
+     descriptionArea.set_spacing(15);
+     Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
+     descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
+ #if GTKMM_MAJOR_VERSION < 3
+     view::WrapLabel description;
+ #else
+     Gtk::Label description;
+     description.set_line_wrap();
+ #endif
+     description.set_markup(
+         _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
+           "<span style=\"italic\">\"Save\"</span> dialog instead of "
+           "<span style=\"italic\">\"Save As...\"</span> if you want to save "
+           "to the same .gig file. Using "
+           "<span style=\"italic\">\"Save As...\"</span> for writing to the "
+           "same .gig file will end up in corrupted sample wave data!\n")
+     );
+     descriptionArea.pack_start(description);
+     dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
+     descriptionArea.show_all();
      if (dialog.run() == Gtk::RESPONSE_OK) {
+         file_structure_to_be_changed_signal.emit(this->file);
          try {
              std::string filename = dialog.get_filename();
              if (!Glib::str_has_suffix(filename, ".gig")) {
-Line 543 
 bool MainWindow::file_save_as()
+Line 779 
 bool MainWindow::file_save_as()
              printf("filename=%s\n", filename.c_str());
              file->Save(filename);
              this->filename = filename;
-             current_dir = Glib::path_get_dirname(filename);
+             current_gig_dir = Glib::path_get_dirname(filename);
              set_title(Glib::filename_display_basename(filename));
              file_has_name = true;
              file_is_changed = false;
          } catch (RIFF::Exception e) {
-             Glib::ustring txt = "Could not save file: " + e.Message;
+             file_structure_changed_signal.emit(this->file);
+             Glib::ustring txt = _("Could not save file: ") + e.Message;
              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
              msg.run();
              return false;
          }
          __import_queued_samples();
+         file_structure_changed_signal.emit(this->file);
          return true;
      }
      return false;
-Line 570 
 void MainWindow::__import_queued_samples
+Line 808 
 void MainWindow::__import_queued_samples
          SF_INFO info;
          info.format = 0;
          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
+         sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);
          try {
-             if (!hFile) throw std::string("could not open file");
+             if (!hFile) throw std::string(_("could not open file"));
              // determine sample's bit depth
              int bitdepth;
              switch (info.format & 0xff) {
                  case SF_FORMAT_PCM_S8:
-                     bitdepth = 16; // we simply convert to 16 bit for now
-                     break;
                  case SF_FORMAT_PCM_16:
+                 case SF_FORMAT_PCM_U8:
                      bitdepth = 16;
                      break;
                  case SF_FORMAT_PCM_24:
-                     bitdepth = 32; // we simply convert to 32 bit for now
-                     break;
                  case SF_FORMAT_PCM_32:
-                     bitdepth = 32;
-                     break;
-                 case SF_FORMAT_PCM_U8:
-                     bitdepth = 16; // we simply convert to 16 bit for now
-                     break;
                  case SF_FORMAT_FLOAT:
-                     bitdepth = 32;
-                     break;
                  case SF_FORMAT_DOUBLE:
-                     bitdepth = 32; // I guess we will always truncate this to 32 bit
+                     bitdepth = 24;
                      break;
                  default:
                      sf_close(hFile); // close sound file
-                     throw std::string("format not supported"); // unsupported subformat (yet?)
+                     throw std::string(_("format not supported")); // unsupported subformat (yet?)
              }
-             // allocate appropriate copy buffer (TODO: for now we copy
-             // it in one piece, might be tough for very long samples)
+             const int bufsize = 10000;
-             // and copy sample data into buffer
-             int8_t* buffer = NULL;
              switch (bitdepth) {
-                 case 16:
+                 case 16: {
-                     buffer = new int8_t[2 * info.channels * info.frames];
+                     short* buffer = new short[bufsize * info.channels];
-                     // libsndfile does the conversion for us (if needed)
+                     sf_count_t cnt = info.frames;
-                     sf_readf_short(hFile, (short*) buffer, info.frames);
+                     while (cnt) {
+                         // libsndfile does the conversion for us (if needed)
+                         int n = sf_readf_short(hFile, buffer, bufsize);
+                         // write from buffer directly (physically) into .gig file
+                         iter->gig_sample->Write(buffer, n);
+                         cnt -= n;
+                     }
+                     delete[] buffer;
                      break;
-                 case 32:
+                 }
-                     buffer = new int8_t[4 * info.channels * info.frames];
+                 case 24: {
-                     // libsndfile does the conversion for us (if needed)
+                     int* srcbuf = new int[bufsize * info.channels];
-                     sf_readf_int(hFile, (int*) buffer, info.frames);
+                     uint8_t* dstbuf = new uint8_t[bufsize * 3 * info.channels];
+                     sf_count_t cnt = info.frames;
+                     while (cnt) {
+                         // libsndfile returns 32 bits, convert to 24
+                         int n = sf_readf_int(hFile, srcbuf, bufsize);
+                         int j = 0;
+                         for (int i = 0 ; i < n * info.channels ; i++) {
+                             dstbuf[j++] = srcbuf[i] >> 8;
+                             dstbuf[j++] = srcbuf[i] >> 16;
+                             dstbuf[j++] = srcbuf[i] >> 24;
+                         }
+                         // write from buffer directly (physically) into .gig file
+                         iter->gig_sample->Write(dstbuf, n);
+                         cnt -= n;
+                     }
+                     delete[] srcbuf;
+                     delete[] dstbuf;
                      break;
+                 }
              }
-             // write from buffer directly (physically) into .gig file
-             (*iter).gig_sample->Write(buffer, info.frames);
              // cleanup
              sf_close(hFile);
-             delete[] buffer;
+             // let the sampler re-cache the sample if needed
+             sample_changed_signal.emit(iter->gig_sample);
              // on success we remove the sample from the import queue,
              // otherwise keep it, maybe it works the next time ?
              std::list<SampleImportItem>::iterator cur = iter;
-Line 628 
 void MainWindow::__import_queued_samples
+Line 878 
 void MainWindow::__import_queued_samples
              m_SampleImportQueue.erase(cur);
          } catch (std::string what) {
              // remember the files that made trouble (and their cause)
-             if (error_files.size()) error_files += "\n";
+             if (!error_files.empty()) error_files += "\n";
              error_files += (*iter).sample_path += " (" + what + ")";
              ++iter;
          }
      }
      // show error message box when some sample(s) could not be imported
-     if (error_files.size()) {
+     if (!error_files.empty()) {
-         Glib::ustring txt = "Could not import the following sample(s):\n" + error_files;
+         Glib::ustring txt = _("Could not import the following sample(s):\n") + error_files;
          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
          msg.run();
      }
-Line 649 
 void MainWindow::on_action_file_properti
+Line 899 
 void MainWindow::on_action_file_properti
  void MainWindow::on_action_help_about()
  {
- #ifdef ABOUT_DIALOG
      Gtk::AboutDialog dialog;
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
+     dialog.set_program_name("Gigedit");
+ #else
+     dialog.set_name("Gigedit");
+ #endif
      dialog.set_version(VERSION);
+     dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson");
+     dialog.set_comments(_(
+         "Released under the GNU General Public License.\n"
+         "\n"
+         "Please notice that this is still a very young instrument editor. "
+         "So better backup your Gigasampler files before editing them with "
+         "this application.\n"
+         "\n"
+         "Please report bugs to: http://bugs.linuxsampler.org")
+     );
+     dialog.set_website("http://www.linuxsampler.org");
+     dialog.set_website_label("http://www.linuxsampler.org");
      dialog.run();
- #endif
  }
  PropDialog::PropDialog()
-     : table(2,1)
+     : eName(_("Name")),
+       eCreationDate(_("Creation date")),
+       eComments(_("Comments")),
+       eProduct(_("Product")),
+       eCopyright(_("Copyright")),
+       eArtists(_("Artists")),
+       eGenre(_("Genre")),
+       eKeywords(_("Keywords")),
+       eEngineer(_("Engineer")),
+       eTechnician(_("Technician")),
+       eSoftware(_("Software")),
+       eMedium(_("Medium")),
+       eSource(_("Source")),
+       eSourceForm(_("Source form")),
+       eCommissioned(_("Commissioned")),
+       eSubject(_("Subject")),
+       quitButton(Gtk::Stock::CLOSE),
+       table(2, 1)
  {
+     set_title(_("File Properties"));
+     eName.set_width_chars(50);
+     connect(eName, &DLS::Info::Name);
+     connect(eCreationDate, &DLS::Info::CreationDate);
+     connect(eComments, &DLS::Info::Comments);
+     connect(eProduct, &DLS::Info::Product);
+     connect(eCopyright, &DLS::Info::Copyright);
+     connect(eArtists, &DLS::Info::Artists);
+     connect(eGenre, &DLS::Info::Genre);
+     connect(eKeywords, &DLS::Info::Keywords);
+     connect(eEngineer, &DLS::Info::Engineer);
+     connect(eTechnician, &DLS::Info::Technician);
+     connect(eSoftware, &DLS::Info::Software);
+     connect(eMedium, &DLS::Info::Medium);
+     connect(eSource, &DLS::Info::Source);
+     connect(eSourceForm, &DLS::Info::SourceForm);
+     connect(eCommissioned, &DLS::Info::Commissioned);
+     connect(eSubject, &DLS::Info::Subject);
+     table.add(eName);
+     table.add(eCreationDate);
+     table.add(eComments);
+     table.add(eProduct);
+     table.add(eCopyright);
+     table.add(eArtists);
+     table.add(eGenre);
+     table.add(eKeywords);
+     table.add(eEngineer);
+     table.add(eTechnician);
+     table.add(eSoftware);
+     table.add(eMedium);
+     table.add(eSource);
+     table.add(eSourceForm);
+     table.add(eCommissioned);
+     table.add(eSubject);
      table.set_col_spacings(5);
-     const char* propLabels[] = {
+     add(vbox);
-         "Name:",
+     table.set_border_width(5);
-         "CreationDate:",
+     vbox.add(table);
-         "Comments:", // TODO: multiline
+     vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
-         "Product:",
+     buttonBox.set_layout(Gtk::BUTTONBOX_END);
-         "Copyright:",
+     buttonBox.set_border_width(5);
-         "Artists:",
+     buttonBox.show();
-         "Genre:",
+     buttonBox.pack_start(quitButton);
-         "Keywords:",
+     quitButton.set_can_default();
-         "Engineer:",
+     quitButton.grab_focus();
-         "Technician:",
+     quitButton.signal_clicked().connect(
-         "Software:", // TODO: readonly
+         sigc::mem_fun(*this, &PropDialog::hide));
-         "Medium:",
-         "Source:",
-         "SourceForm:",
-         "Commissioned:",
-         "Subject:"
-     };
-     for (int i = 0 ; i < sizeof(propLabels) / sizeof(char*) ; i++) {
-         label[i].set_text(propLabels[i]);
-         label[i].set_alignment(Gtk::ALIGN_LEFT);
-         table.attach(label[i], 0, 1, i, i + 1, Gtk::FILL, Gtk::SHRINK);
-         table.attach(entry[i], 1, 2, i, i + 1, Gtk::FILL | Gtk::EXPAND,
-                      Gtk::SHRINK);
-     }
-     add(table);
+     quitButton.show();
-     // add_button(Gtk::Stock::CANCEL, 0);
+     vbox.show();
-     // add_button(Gtk::Stock::OK, 1);
      show_all_children();
  }
  void PropDialog::set_info(DLS::Info* info)
  {
-     entry[0].set_text(info->Name);
+     update(info);
-     entry[1].set_text(info->CreationDate);
-     entry[2].set_text(Glib::convert(info->Comments, "UTF-8", "ISO-8859-1"));
-     entry[3].set_text(info->Product);
-     entry[4].set_text(info->Copyright);
-     entry[5].set_text(info->Artists);
-     entry[6].set_text(info->Genre);
-     entry[7].set_text(info->Keywords);
-     entry[8].set_text(info->Engineer);
-     entry[9].set_text(info->Technician);
-     entry[10].set_text(info->Software);
-     entry[11].set_text(info->Medium);
-     entry[12].set_text(info->Source);
-     entry[13].set_text(info->SourceForm);
-     entry[14].set_text(info->Commissioned);
-     entry[15].set_text(info->Subject);
- }
- void InstrumentProps::add_prop(LabelWidget& prop)
- {
-     table.attach(prop.label, 0, 1, rowno, rowno + 1,
-                  Gtk::FILL, Gtk::SHRINK);
-     table.attach(prop.widget, 1, 2, rowno, rowno + 1,
-                  Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
-     rowno++;
-     prop.signal_changed_by_user().connect(instrument_changed.make_slot());
  }
- InstrumentProps::InstrumentProps()
-     : table(2,1),
+ void InstrumentProps::set_Name(const gig::String& name)
-       quitButton(Gtk::Stock::CLOSE),
-       eName("Name"),
-       eIsDrum("IsDrum"),
-       eMIDIBank("MIDIBank", 0, 16383),
-       eMIDIProgram("MIDIProgram"),
-       eAttenuation("Attenuation", 0, 96, 0, 1),
-       eGainPlus6("Gain +6dB", eAttenuation, -6),
-       eEffectSend("EffectSend", 0, 65535),
-       eFineTune("FineTune", -8400, 8400),
-       ePitchbendRange("PitchbendRange", 0, 12),
-       ePianoReleaseMode("PianoReleaseMode"),
-       eDimensionKeyRangeLow("DimensionKeyRangeLow"),
-       eDimensionKeyRangeHigh("DimensionKeyRangeHigh")
  {
-     set_title("Instrument properties");
+     m->pInfo->Name = name;
+ }
+ void InstrumentProps::update_name()
+ {
+     update_model++;
+     eName.set_value(m->pInfo->Name);
+     update_model--;
+ }
+ void InstrumentProps::set_IsDrum(bool value)
+ {
+     m->IsDrum = value;
+ }
+ void InstrumentProps::set_MIDIBank(uint16_t value)
+ {
+     m->MIDIBank = value;
+ }
+ void InstrumentProps::set_MIDIProgram(uint32_t value)
+ {
+     m->MIDIProgram = value;
+ }
+ InstrumentProps::InstrumentProps() :
+     quitButton(Gtk::Stock::CLOSE),
+     table(2,1),
+     eName(_("Name")),
+     eIsDrum(_("Is drum")),
+     eMIDIBank(_("MIDI bank"), 0, 16383),
+     eMIDIProgram(_("MIDI program")),
+     eAttenuation(_("Attenuation"), 0, 96, 0, 1),
+     eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
+     eEffectSend(_("Effect send"), 0, 65535),
+     eFineTune(_("Fine tune"), -8400, 8400),
+     ePitchbendRange(_("Pitchbend range"), 0, 12),
+     ePianoReleaseMode(_("Piano release mode")),
+     eDimensionKeyRangeLow(_("Keyswitching range low")),
+     eDimensionKeyRangeHigh(_("Keyswitching range high"))
+ {
+     set_title(_("Instrument Properties"));
+     eDimensionKeyRangeLow.set_tip(
+         _("start of the keyboard area which should switch the "
+           "\"keyswitching\" dimension")
+     );
+     eDimensionKeyRangeHigh.set_tip(
+         _("end of the keyboard area which should switch the "
+           "\"keyswitching\" dimension")
+     );
+     connect(eName, &InstrumentProps::set_Name);
+     connect(eIsDrum, &InstrumentProps::set_IsDrum);
+     connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
+     connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
+     connect(eAttenuation, &gig::Instrument::Attenuation);
+     connect(eGainPlus6, &gig::Instrument::Attenuation);
+     connect(eEffectSend, &gig::Instrument::EffectSend);
+     connect(eFineTune, &gig::Instrument::FineTune);
+     connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
+     connect(ePianoReleaseMode, &gig::Instrument::PianoReleaseMode);
+     connect(eDimensionKeyRangeLow, eDimensionKeyRangeHigh,
+             &gig::Instrument::DimensionKeyRange);
+     eName.signal_value_changed().connect(sig_name_changed.make_slot());
-     rowno = 0;
      table.set_col_spacings(5);
-     add_prop(eName);
+     table.add(eName);
-     add_prop(eIsDrum);
+     table.add(eIsDrum);
-     add_prop(eMIDIBank);
+     table.add(eMIDIBank);
-     add_prop(eMIDIProgram);
+     table.add(eMIDIProgram);
-     add_prop(eAttenuation);
+     table.add(eAttenuation);
-     add_prop(eGainPlus6);
+     table.add(eGainPlus6);
-     add_prop(eEffectSend);
+     table.add(eEffectSend);
-     add_prop(eFineTune);
+     table.add(eFineTune);
-     add_prop(ePitchbendRange);
+     table.add(ePitchbendRange);
-     add_prop(ePianoReleaseMode);
+     table.add(ePianoReleaseMode);
-     add_prop(eDimensionKeyRangeLow);
+     table.add(eDimensionKeyRangeLow);
-     add_prop(eDimensionKeyRangeHigh);
+     table.add(eDimensionKeyRangeHigh);
-     eDimensionKeyRangeLow.signal_changed_by_user().connect(
-         sigc::mem_fun(*this, &InstrumentProps::key_range_low_changed));
-     eDimensionKeyRangeHigh.signal_changed_by_user().connect(
-         sigc::mem_fun(*this, &InstrumentProps::key_range_high_changed));
      add(vbox);
      table.set_border_width(5);
-Line 770 
 InstrumentProps::InstrumentProps()
+Line 1096 
 InstrumentProps::InstrumentProps()
      buttonBox.set_border_width(5);
      buttonBox.show();
      buttonBox.pack_start(quitButton);
-     quitButton.set_flags(Gtk::CAN_DEFAULT);
+     quitButton.set_can_default();
      quitButton.grab_focus();
      quitButton.signal_clicked().connect(
-Line 783 
 InstrumentProps::InstrumentProps()
+Line 1109 
 InstrumentProps::InstrumentProps()
  void InstrumentProps::set_instrument(gig::Instrument* instrument)
  {
-     eName.set_ptr(&instrument->pInfo->Name);
+     update(instrument);
-     eIsDrum.set_ptr(&instrument->IsDrum);
-     eMIDIBank.set_ptr(&instrument->MIDIBank);
-     eMIDIProgram.set_ptr(&instrument->MIDIProgram);
-     eAttenuation.set_ptr(&instrument->Attenuation);
-     eGainPlus6.set_ptr(&instrument->Attenuation);
-     eEffectSend.set_ptr(&instrument->EffectSend);
-     eFineTune.set_ptr(&instrument->FineTune);
-     ePitchbendRange.set_ptr(&instrument->PitchbendRange);
-     ePianoReleaseMode.set_ptr(&instrument->PianoReleaseMode);
-     eDimensionKeyRangeLow.set_ptr(0);
-     eDimensionKeyRangeHigh.set_ptr(0);
-     eDimensionKeyRangeLow.set_ptr(&instrument->DimensionKeyRange.low);
-     eDimensionKeyRangeHigh.set_ptr(&instrument->DimensionKeyRange.high);
- }
- void InstrumentProps::key_range_low_changed()
+     update_model++;
- {
+     eName.set_value(instrument->pInfo->Name);
-     double l = eDimensionKeyRangeLow.get_value();
+     eIsDrum.set_value(instrument->IsDrum);
-     double h = eDimensionKeyRangeHigh.get_value();
+     eMIDIBank.set_value(instrument->MIDIBank);
-     if (h < l) eDimensionKeyRangeHigh.set_value(l);
+     eMIDIProgram.set_value(instrument->MIDIProgram);
+     update_model--;
  }
- void InstrumentProps::key_range_high_changed()
- {
-     double l = eDimensionKeyRangeLow.get_value();
-     double h = eDimensionKeyRangeHigh.get_value();
-     if (h < l) eDimensionKeyRangeLow.set_value(h);
- }
- sigc::signal<void> InstrumentProps::signal_instrument_changed()
- {
-     return instrument_changed;
- }
  void MainWindow::file_changed()
  {
-Line 826 
 void MainWindow::file_changed()
+Line 1128 
 void MainWindow::file_changed()
      }
  }
- void MainWindow::load_gig(gig::File* gig, const char* filename)
+ void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)
  {
      file = 0;
+     set_file_is_shared(isSharedInstrument);
      this->filename = filename ? filename : _("Unsaved Gig File");
      set_title(Glib::filename_display_basename(this->filename));
-Line 837 
 void MainWindow::load_gig(gig::File* gig
+Line 1140 
 void MainWindow::load_gig(gig::File* gig
      propDialog.set_info(gig->pInfo);
-     Gtk::MenuItem* instrument_menu =
+     instrument_name_connection.block();
-         dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
-     int instrument_index = 0;
-     Gtk::RadioMenuItem::Group instrument_group;
      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
           instrument = gig->GetNextInstrument()) {
+         Glib::ustring name(instrument->pInfo->Name);
          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
          Gtk::TreeModel::Row row = *iter;
-         row[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();
+         row[m_Columns.m_col_name] = name;
          row[m_Columns.m_col_instr] = instrument;
-         // create a menu item for this instrument
-         Gtk::RadioMenuItem* item =
+         add_instrument_to_menu(name);
-             new Gtk::RadioMenuItem(instrument_group, instrument->pInfo->Name.c_str());
-         instrument_menu->get_submenu()->append(*item);
-         item->signal_activate().connect(
-             sigc::bind(
-                 sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),
-                 instrument_index
-             )
-         );
-         instrument_index++;
      }
-     instrument_menu->show();
+     instrument_name_connection.unblock();
-     instrument_menu->get_submenu()->show_all_children();
+     uiManager->get_widget("/MenuBar/MenuInstrument")->show();
      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
          if (group->Name != "") {
-Line 885 
 void MainWindow::load_gig(gig::File* gig
+Line 1177 
 void MainWindow::load_gig(gig::File* gig
      file = gig;
      // select the first instrument
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     m_TreeView.get_selection()->select(Gtk::TreePath("0"));
-     tree_sel_ref->select(Gtk::TreePath("0"));
+     instr_props_set_instrument();
  }
- void MainWindow::show_instr_props()
+ bool MainWindow::instr_props_set_instrument()
  {
-     Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
+     instrumentProps.signal_name_changed().clear();
-     Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();
-     if (it)
+     Gtk::TreeModel::const_iterator it =
-     {
+         m_TreeView.get_selection()->get_selected();
+     if (it) {
          Gtk::TreeModel::Row row = *it;
-         if (row[m_Columns.m_col_instr])
+         gig::Instrument* instrument = row[m_Columns.m_col_instr];
-         {
-             instrumentProps.set_instrument(row[m_Columns.m_col_instr]);
+         instrumentProps.set_instrument(instrument);
-             instrumentProps.show();
-             instrumentProps.deiconify();
+         // make sure instrument tree is updated when user changes the
-         }
+         // instrument name in instrument properties window
+         instrumentProps.signal_name_changed().connect(
+             sigc::bind(
+                 sigc::mem_fun(*this,
+                               &MainWindow::instr_name_changed_by_instr_props),
+                 it));
+     } else {
+         instrumentProps.hide();
+     }
+     return it;
+ }
+ void MainWindow::show_instr_props()
+ {
+     if (instr_props_set_instrument()) {
+         instrumentProps.show();
+         instrumentProps.deiconify();
+     }
+ }
+ void MainWindow::instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it)
+ {
+     Gtk::TreeModel::Row row = *it;
+     Glib::ustring name = row[m_Columns.m_col_name];
+     gig::Instrument* instrument = row[m_Columns.m_col_instr];
+     if (instrument->pInfo->Name != name) {
+         row[m_Columns.m_col_name] = instrument->pInfo->Name;
      }
  }
+ void MainWindow::on_action_view_status_bar() {
+     Gtk::CheckMenuItem* item =
+         dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
+     if (!item) {
+         std::cerr << "/MenuBar/MenuView/Statusbar == NULL\n";
+         return;
+     }
+     if (item->get_active()) m_StatusBar.show();
+     else                    m_StatusBar.hide();
+ }
  void MainWindow::on_button_release(GdkEventButton* button)
  {
      if (button->type == GDK_2BUTTON_PRESS) {
-Line 914 
 void MainWindow::on_button_release(GdkEv
+Line 1246 
 void MainWindow::on_button_release(GdkEv
      }
  }
- void MainWindow::on_instrument_selection_change(int index) {
+ void MainWindow::on_instrument_selection_change(Gtk::RadioMenuItem* item) {
-     m_RegionChooser.set_instrument(file->GetInstrument(index));
+     if (item->get_active()) {
+         const std::vector<Gtk::Widget*> children =
+             instrument_menu->get_children();
+         std::vector<Gtk::Widget*>::const_iterator it =
+             find(children.begin(), children.end(), item);
+         if (it != children.end()) {
+             int index = it - children.begin();
+             m_TreeView.get_selection()->select(Gtk::TreePath(ToString(index)));
+             m_RegionChooser.set_instrument(file->GetInstrument(index));
+         }
+     }
  }
  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
-Line 945 
 void MainWindow::on_sample_treeview_butt
+Line 1288 
 void MainWindow::on_sample_treeview_butt
      }
  }
+ Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
+     const Glib::ustring& name, int position) {
+     Gtk::RadioMenuItem::Group instrument_group;
+     const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
+     if (!children.empty()) {
+         instrument_group =
+             static_cast<Gtk::RadioMenuItem*>(children[0])->get_group();
+     }
+     Gtk::RadioMenuItem* item =
+         new Gtk::RadioMenuItem(instrument_group, name);
+     if (position < 0) {
+         instrument_menu->append(*item);
+     } else {
+         instrument_menu->insert(*item, position);
+     }
+     item->show();
+     item->signal_activate().connect(
+         sigc::bind(
+             sigc::mem_fun(*this, &MainWindow::on_instrument_selection_change),
+             item));
+     return item;
+ }
+ void MainWindow::remove_instrument_from_menu(int index) {
+     const std::vector<Gtk::Widget*> children =
+         instrument_menu->get_children();
+     Gtk::Widget* child = children[index];
+     instrument_menu->remove(*child);
+     delete child;
+ }
+ void MainWindow::add_instrument(gig::Instrument* instrument) {
+     const char* name = instrument->pInfo->Name.c_str();
+     // update instrument tree view
+     instrument_name_connection.block();
+     Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
+     Gtk::TreeModel::Row rowInstr = *iterInstr;
+     rowInstr[m_Columns.m_col_name] = name;
+     rowInstr[m_Columns.m_col_instr] = instrument;
+     instrument_name_connection.unblock();
+     add_instrument_to_menu(name);
+     m_TreeView.get_selection()->select(iterInstr);
+     file_changed();
+ }
  void MainWindow::on_action_add_instrument() {
      static int __instrument_indexer = 0;
      if (!file) return;
      gig::Instrument* instrument = file->AddInstrument();
      __instrument_indexer++;
      instrument->pInfo->Name =
-         "Unnamed Instrument " + ToString(__instrument_indexer);
+         _("Unnamed Instrument ") + ToString(__instrument_indexer);
-     // update instrument tree view
-     Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
+     add_instrument(instrument);
-     Gtk::TreeModel::Row rowInstr = *iterInstr;
+ }
-     rowInstr[m_Columns.m_col_name] = instrument->pInfo->Name.c_str();
-     rowInstr[m_Columns.m_col_instr] = instrument;
+ void MainWindow::on_action_duplicate_instrument() {
-     file_changed();
+     if (!file) return;
+     // retrieve the currently selected instrument
+     // (being the original instrument to be duplicated)
+     Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
+     Gtk::TreeModel::iterator itSelection = sel->get_selected();
+     if (!itSelection) return;
+     Gtk::TreeModel::Row row = *itSelection;
+     gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
+     if (!instrOrig) return;
+     // duplicate the orginal instrument
+     gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
+     instrNew->pInfo->Name =
+         instrOrig->pInfo->Name + " (" + _("Copy") + ")";
+     add_instrument(instrNew);
  }
  void MainWindow::on_action_remove_instrument() {
      if (!file) return;
+     if (file_is_shared) {
+         Gtk::MessageDialog msg(
+             *this,
+              _("You cannot delete an instrument from this file, since it's "
+                "currently used by the sampler."),
+              false, Gtk::MESSAGE_INFO
+         );
+         msg.run();
+         return;
+     }
      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
      Gtk::TreeModel::iterator it = sel->get_selected();
      if (it) {
          Gtk::TreeModel::Row row = *it;
          gig::Instrument* instr = row[m_Columns.m_col_instr];
          try {
+             Gtk::TreePath path(it);
+             int index = path[0];
              // remove instrument from the gig file
              if (instr) file->DeleteInstrument(instr);
-             // remove respective row from instruments tree view
-             m_refTreeModel->erase(it);
              file_changed();
+             remove_instrument_from_menu(index);
+             // remove row from instruments tree view
+             m_refTreeModel->erase(it);
+ #if GTKMM_MAJOR_VERSION < 3
+             // select another instrument (in gtk3 this is done
+             // automatically)
+             if (!m_refTreeModel->children().empty()) {
+                 if (index == m_refTreeModel->children().size()) {
+                     index--;
+                 }
+                 m_TreeView.get_selection()->select(
+                     Gtk::TreePath(ToString(index)));
+             }
+ #endif
+             instr_props_set_instrument();
          } catch (RIFF::Exception e) {
              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
              msg.run();
-Line 983 
 void MainWindow::on_action_remove_instru
+Line 1423 
 void MainWindow::on_action_remove_instru
  void MainWindow::on_action_sample_properties() {
      //TODO: show a dialog where the selected sample's properties can be edited
      Gtk::MessageDialog msg(
-         *this, "Sorry, yet to be implemented!", false, Gtk::MESSAGE_INFO
+         *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO
      );
      msg.run();
  }
-Line 992 
 void MainWindow::on_action_add_group() {
+Line 1432 
 void MainWindow::on_action_add_group() {
      static int __sample_indexer = 0;
      if (!file) return;
      gig::Group* group = file->AddGroup();
-     group->Name = "Unnamed Group";
+     group->Name = _("Unnamed Group");
      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
      __sample_indexer++;
      // update sample tree view
-Line 1026 
 void MainWindow::on_action_add_sample()
+Line 1466 
 void MainWindow::on_action_add_sample()
      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
      dialog.set_select_multiple(true);
-     Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile
-     const char* supportedFileTypes[] = {
+     // matches all file types supported by libsndfile
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
+     Gtk::FileFilter soundfilter;
+ #else
+     Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
+ #endif
+     const char* const supportedFileTypes[] = {
          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
          "*.svx", "*.SVX", "*.sf", "*.SF", "*.voc", "*.VOC", "*.w64",
          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
          "*.caf", "*.CAF", NULL
      };
+     const char* soundfiles = _("Sound Files");
+     const char* allfiles = _("All Files");
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
      for (int i = 0; supportedFileTypes[i]; i++)
          soundfilter.add_pattern(supportedFileTypes[i]);
-     soundfilter.set_name("Sound Files");
+     soundfilter.set_name(soundfiles);
-     Gtk::FileFilter allpassfilter; // matches every file
+     // matches every file
+     Gtk::FileFilter allpassfilter;
      allpassfilter.add_pattern("*.*");
-     allpassfilter.set_name("All Files");
+     allpassfilter.set_name(allfiles);
+ #else
+     for (int i = 0; supportedFileTypes[i]; i++)
+         soundfilter->add_pattern(supportedFileTypes[i]);
+     soundfilter->set_name(soundfiles);
+     // matches every file
+     Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
+     allpassfilter->add_pattern("*.*");
+     allpassfilter->set_name(allfiles);
+ #endif
      dialog.add_filter(soundfilter);
      dialog.add_filter(allpassfilter);
+     if (current_sample_dir != "") {
+         dialog.set_current_folder(current_sample_dir);
+     }
      if (dialog.run() == Gtk::RESPONSE_OK) {
+         current_sample_dir = dialog.get_current_folder();
          Glib::ustring error_files;
-         Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();
+         std::vector<std::string> filenames = dialog.get_filenames();
-         for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();
+         for (std::vector<std::string>::iterator iter = filenames.begin();
               iter != filenames.end(); ++iter) {
              printf("Adding sample %s\n",(*iter).c_str());
              // use libsndfile to retrieve file informations
-Line 1053 
 void MainWindow::on_action_add_sample()
+Line 1518 
 void MainWindow::on_action_add_sample()
              info.format = 0;
              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
              try {
-                 if (!hFile) throw std::string("could not open file");
+                 if (!hFile) throw std::string(_("could not open file"));
                  int bitdepth;
                  switch (info.format & 0xff) {
                      case SF_FORMAT_PCM_S8:
-                         bitdepth = 16; // we simply convert to 16 bit for now
-                         break;
                      case SF_FORMAT_PCM_16:
+                     case SF_FORMAT_PCM_U8:
                          bitdepth = 16;
                          break;
                      case SF_FORMAT_PCM_24:
-                         bitdepth = 32; // we simply convert to 32 bit for now
-                         break;
                      case SF_FORMAT_PCM_32:
-                         bitdepth = 32;
-                         break;
-                     case SF_FORMAT_PCM_U8:
-                         bitdepth = 16; // we simply convert to 16 bit for now
-                         break;
                      case SF_FORMAT_FLOAT:
-                         bitdepth = 32;
-                         break;
                      case SF_FORMAT_DOUBLE:
-                         bitdepth = 32; // I guess we will always truncate this to 32 bit
+                         bitdepth = 24;
                          break;
                      default:
                          sf_close(hFile); // close sound file
-                         throw std::string("format not supported"); // unsupported subformat (yet?)
+                         throw std::string(_("format not supported")); // unsupported subformat (yet?)
                  }
                  // add a new sample to the .gig file
                  gig::Sample* sample = file->AddSample();
                  // file name without path
-                 sample->pInfo->Name = (*iter).substr((*iter).rfind('/') + 1).raw();
+                 Glib::ustring filename = Glib::filename_display_basename(*iter);
+                 // remove file extension if there is one
+                 for (int i = 0; supportedFileTypes[i]; i++) {
+                     if (Glib::str_has_suffix(filename, supportedFileTypes[i] + 1)) {
+                         filename.erase(filename.length() - strlen(supportedFileTypes[i] + 1));
+                         break;
+                     }
+                 }
+                 sample->pInfo->Name = filename;
                  sample->Channels = info.channels;
                  sample->BitDepth = bitdepth;
                  sample->FrameSize = bitdepth / 8/*1 byte are 8 bits*/ * info.channels;
                  sample->SamplesPerSecond = info.samplerate;
+                 sample->AverageBytesPerSecond = sample->FrameSize * sample->SamplesPerSecond;
+                 sample->BlockAlign = sample->FrameSize;
+                 sample->SamplesTotal = info.frames;
+                 SF_INSTRUMENT instrument;
+                 if (sf_command(hFile, SFC_GET_INSTRUMENT,
+                                &instrument, sizeof(instrument)) != SF_FALSE)
+                 {
+                     sample->MIDIUnityNote = instrument.basenote;
+                     if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {
+                         sample->Loops = 1;
+                         switch (instrument.loops[0].mode) {
+                         case SF_LOOP_FORWARD:
+                             sample->LoopType = gig::loop_type_normal;
+                             break;
+                         case SF_LOOP_BACKWARD:
+                             sample->LoopType = gig::loop_type_backward;
+                             break;
+                         case SF_LOOP_ALTERNATING:
+                             sample->LoopType = gig::loop_type_bidirectional;
+                             break;
+                         }
+                         sample->LoopStart = instrument.loops[0].start;
+                         sample->LoopEnd = instrument.loops[0].end;
+                         sample->LoopPlayCount = instrument.loops[0].count;
+                         sample->LoopSize = sample->LoopEnd - sample->LoopStart + 1;
+                     }
+                 }
                  // schedule resizing the sample (which will be done
                  // physically when File::Save() is called)
                  sample->Resize(info.frames);
-Line 1104 
 void MainWindow::on_action_add_sample()
+Line 1598 
 void MainWindow::on_action_add_sample()
                  Gtk::TreeModel::iterator iterSample =
                      m_refSamplesTreeModel->append(row.children());
                  Gtk::TreeModel::Row rowSample = *iterSample;
-                 rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();
+                 rowSample[m_SamplesModel.m_col_name]   = filename;
                  rowSample[m_SamplesModel.m_col_sample] = sample;
                  rowSample[m_SamplesModel.m_col_group]  = NULL;
                  // close sound file
                  sf_close(hFile);
                  file_changed();
              } catch (std::string what) { // remember the files that made trouble (and their cause)
-                 if (error_files.size()) error_files += "\n";
+                 if (!error_files.empty()) error_files += "\n";
                  error_files += *iter += " (" + what + ")";
              }
          }
          // show error message box when some file(s) could not be opened / added
-         if (error_files.size()) {
+         if (!error_files.empty()) {
-             Glib::ustring txt = "Could not add the following sample(s):\n" + error_files;
+             Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files;
+             Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
+             msg.run();
+         }
+     }
+ }
+ void MainWindow::on_action_replace_all_samples_in_all_groups()
+ {
+     if (!file) return;
+     Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
+                                   Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
+     const char* str =
+         _("This is a very specific function. It tries to replace all samples "
+           "in the current gig file by samples located in the chosen "
+           "directory.\n\n"
+           "It works like this: For each sample in the gig file, it tries to "
+           "find a sample file in the selected directory with the same name as "
+           "the sample in the gig file. Optionally, you can add a filename "
+           "extension below, which will be added to the filename expected to be "
+           "found. That is, assume you have a gig file with a sample called "
+           "'Snare', if you enter '.wav' below (like it's done by default), it "
+           "expects to find a sample file called 'Snare.wav' and will replace "
+           "the sample in the gig file accordingly. If you don't need an "
+           "extension, blank the field below. Any gig sample where no "
+           "appropriate sample file could be found will be reported and left "
+           "untouched.\n");
+ #if GTKMM_MAJOR_VERSION < 3
+     view::WrapLabel description(str);
+ #else
+     Gtk::Label description(str);
+     description.set_line_wrap();
+ #endif
+     Gtk::HBox entryArea;
+     Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
+     Gtk::Entry postfixEntryBox;
+     postfixEntryBox.set_text(".wav");
+     entryArea.pack_start(entryLabel);
+     entryArea.pack_start(postfixEntryBox);
+     dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
+     dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
+     description.show();
+     entryArea.show_all();
+     dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+     dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
+     dialog.set_select_multiple(false);
+     if (current_sample_dir != "") {
+         dialog.set_current_folder(current_sample_dir);
+     }
+     if (dialog.run() == Gtk::RESPONSE_OK)
+     {
+         current_sample_dir = dialog.get_current_folder();
+         Glib::ustring error_files;
+         std::string folder = dialog.get_filename();
+         for (gig::Sample* sample = file->GetFirstSample();
+              sample; sample = file->GetNextSample())
+         {
+             std::string filename =
+                 folder + G_DIR_SEPARATOR_S + sample->pInfo->Name +
+                 postfixEntryBox.get_text().raw();
+             SF_INFO info;
+             info.format = 0;
+             SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
+             try
+             {
+                 if (!hFile) throw std::string(_("could not open file"));
+                 int bitdepth;
+                 switch (info.format & 0xff) {
+                     case SF_FORMAT_PCM_S8:
+                     case SF_FORMAT_PCM_16:
+                     case SF_FORMAT_PCM_U8:
+                         bitdepth = 16;
+                         break;
+                     case SF_FORMAT_PCM_24:
+                     case SF_FORMAT_PCM_32:
+                     case SF_FORMAT_FLOAT:
+                     case SF_FORMAT_DOUBLE:
+                         bitdepth = 24;
+                         break;
+                     default:
+                         sf_close(hFile);
+                         throw std::string(_("format not supported"));
+                 }
+                 SampleImportItem sched_item;
+                 sched_item.gig_sample  = sample;
+                 sched_item.sample_path = filename;
+                 m_SampleImportQueue.push_back(sched_item);
+                 sf_close(hFile);
+                 file_changed();
+             }
+             catch (std::string what)
+             {
+                 if (!error_files.empty()) error_files += "\n";
+                     error_files += filename += " (" + what + ")";
+             }
+         }
+         // show error message box when some file(s) could not be opened / added
+         if (!error_files.empty()) {
+             Glib::ustring txt =
+                 _("Could not replace the following sample(s):\n") + error_files;
              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
              msg.run();
          }
-Line 1143 
 void MainWindow::on_action_remove_sample
+Line 1736 
 void MainWindow::on_action_remove_sample
                       pSample; pSample = group->GetNextSample()) {
                      members.push_back(pSample);
                  }
+                 // notify everybody that we're going to remove these samples
+                 samples_to_be_removed_signal.emit(members);
                  // delete the group in the .gig file including the
                  // samples that belong to the group
                  file->DeleteGroup(group);
+                 // notify that we're done with removal
+                 samples_removed_signal.emit();
                  // if sample(s) were just previously added, remove
                  // them from the import queue
                  for (std::list<gig::Sample*>::iterator member = members.begin();
-Line 1162 
 void MainWindow::on_action_remove_sample
+Line 1759 
 void MainWindow::on_action_remove_sample
                  }
                  file_changed();
              } else if (sample) {
+                 // notify everybody that we're going to remove this sample
+                 std::list<gig::Sample*> lsamples;
+                 lsamples.push_back(sample);
+                 samples_to_be_removed_signal.emit(lsamples);
                  // remove sample from the .gig file
                  file->DeleteSample(sample);
+                 // notify that we're done with removal
+                 samples_removed_signal.emit();
                  // if sample was just previously added, remove it from
                  // the import queue
                  for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
-Line 1175 
 void MainWindow::on_action_remove_sample
+Line 1778 
 void MainWindow::on_action_remove_sample
                          break;
                      }
                  }
+                 dimreg_changed();
                  file_changed();
              }
              // remove respective row(s) from samples tree view
              m_refSamplesTreeModel->erase(it);
          } catch (RIFF::Exception e) {
+             // pretend we're done with removal (i.e. to avoid dead locks)
+             samples_removed_signal.emit();
+             // show error message
              Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
              msg.run();
          }
      }
  }
+ // For some reason drag_data_get gets called two times for each
+ // drag'n'drop (at least when target is an Entry). This work-around
+ // makes sure the code in drag_data_get and drop_drag_data_received is
+ // only executed once, as drag_begin only gets called once.
+ void MainWindow::on_sample_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+ {
+     first_call_to_drag_data_get = true;
+ }
  void MainWindow::on_sample_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
                                                    Gtk::SelectionData& selection_data, guint, guint)
  {
+     if (!first_call_to_drag_data_get) return;
+     first_call_to_drag_data_get = false;
      // get selected sample
      gig::Sample* sample = NULL;
      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
-Line 1206 
 void MainWindow::on_sample_label_drop_dr
+Line 1825 
 void MainWindow::on_sample_label_drop_dr
      const Glib::RefPtr<Gdk::DragContext>& context, int, int,
      const Gtk::SelectionData& selection_data, guint, guint time)
  {
-     gig::DimensionRegion* dimregion = m_DimRegionChooser.get_dimregion();
      gig::Sample* sample = *((gig::Sample**) selection_data.get_data());
-     if (sample && dimregion && selection_data.get_length() == sizeof(gig::Sample*)) {
+     if (sample && selection_data.get_length() == sizeof(gig::Sample*)) {
-         if (sample != dimregion->pSample) {
+         std::cout << "Drop received sample \"" <<
-             dimregion->pSample = sample;
+             sample->pInfo->Name << "\"" << std::endl;
-             dimreg_edit.wSample->set_text(dimregion->pSample->pInfo->Name.c_str());
+         // drop success
-             std::cout << "Drop received sample \"" <<
+         context->drop_reply(true, time);
-                 dimregion->pSample->pInfo->Name.c_str() << "\"" << std::endl;
-             // drop success
+         //TODO: we should better move most of the following code to DimRegionEdit::set_sample()
-             context->drop_reply(true, time);
-             file_changed();
+         // notify everybody that we're going to alter the region
-             return;
+         gig::Region* region = m_RegionChooser.get_region();
+         region_to_be_changed_signal.emit(region);
+         // find the samplechannel dimension
+         gig::dimension_def_t* stereo_dimension = 0;
+         for (int i = 0 ; i < region->Dimensions ; i++) {
+             if (region->pDimensionDefinitions[i].dimension ==
+                 gig::dimension_samplechannel) {
+                 stereo_dimension = &region->pDimensionDefinitions[i];
+                 break;
+             }
+         }
+         bool channels_changed = false;
+         if (sample->Channels == 1 && stereo_dimension) {
+             // remove the samplechannel dimension
+             region->DeleteDimension(stereo_dimension);
+             channels_changed = true;
+             region_changed();
          }
+         dimreg_edit.set_sample(sample);
+         if (sample->Channels == 2 && !stereo_dimension) {
+             // add samplechannel dimension
+             gig::dimension_def_t dim;
+             dim.dimension = gig::dimension_samplechannel;
+             dim.bits = 1;
+             dim.zones = 2;
+             region->AddDimension(&dim);
+             channels_changed = true;
+             region_changed();
+         }
+         if (channels_changed) {
+             // unmap all samples with wrong number of channels
+             // TODO: maybe there should be a warning dialog for this
+             for (int i = 0 ; i < region->DimensionRegions ; i++) {
+                 gig::DimensionRegion* d = region->pDimensionRegions[i];
+                 if (d->pSample && d->pSample->Channels != sample->Channels) {
+                     gig::Sample* oldref = d->pSample;
+                     d->pSample = NULL;
+                     sample_ref_changed_signal.emit(oldref, NULL);
+                 }
+             }
+         }
+         // notify we're done with altering
+         region_changed_signal.emit(region);
+         file_changed();
+         return;
      }
      // drop failed
      context->drop_reply(false, time);
-Line 1252 
 void MainWindow::instrument_name_changed
+Line 1918 
 void MainWindow::instrument_name_changed
      if (!iter) return;
      Gtk::TreeModel::Row row = *iter;
      Glib::ustring name = row[m_Columns.m_col_name];
+     // change name in instrument menu
+     int index = path[0];
+     const std::vector<Gtk::Widget*> children = instrument_menu->get_children();
+     if (index < children.size()) {
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 16) || GTKMM_MAJOR_VERSION > 2
+         static_cast<Gtk::RadioMenuItem*>(children[index])->set_label(name);
+ #else
+         remove_instrument_from_menu(index);
+         Gtk::RadioMenuItem* item = add_instrument_to_menu(name, index);
+         item->set_active();
+ #endif
+     }
+     // change name in gig
      gig::Instrument* instrument = row[m_Columns.m_col_instr];
      if (instrument && instrument->pInfo->Name != name.raw()) {
          instrument->pInfo->Name = name.raw();
+         // change name in the instrument properties window
+         if (instrumentProps.get_instrument() == instrument) {
+             instrumentProps.update_name();
+         }
          file_changed();
      }
  }
+ void MainWindow::set_file_is_shared(bool b) {
+     this->file_is_shared = b;
+     if (file_is_shared) {
+         m_AttachedStateLabel.set_label(_("live-mode"));
+         m_AttachedStateImage.set(
+             Gdk::Pixbuf::create_from_xpm_data(status_attached_xpm)
+         );
+     } else {
+         m_AttachedStateLabel.set_label(_("stand-alone"));
+         m_AttachedStateImage.set(
+             Gdk::Pixbuf::create_from_xpm_data(status_detached_xpm)
+         );
+     }
+ }
+ sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {
+     return file_structure_to_be_changed_signal;
+ }
+ sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_changed() {
+     return file_structure_changed_signal;
+ }
+ sigc::signal<void, std::list<gig::Sample*> >& MainWindow::signal_samples_to_be_removed() {
+     return samples_to_be_removed_signal;
+ }
+ sigc::signal<void>& MainWindow::signal_samples_removed() {
+     return samples_removed_signal;
+ }
+ sigc::signal<void, gig::Region*>& MainWindow::signal_region_to_be_changed() {
+     return region_to_be_changed_signal;
+ }
+ sigc::signal<void, gig::Region*>& MainWindow::signal_region_changed() {
+     return region_changed_signal;
+ }
+ sigc::signal<void, gig::Sample*>& MainWindow::signal_sample_changed() {
+     return sample_changed_signal;
+ }
+ sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& MainWindow::signal_sample_ref_changed() {
+     return sample_ref_changed_signal;
+ }
+ sigc::signal<void, gig::DimensionRegion*>& MainWindow::signal_dimreg_to_be_changed() {
+     return dimreg_to_be_changed_signal;
+ }
+ sigc::signal<void, gig::DimensionRegion*>& MainWindow::signal_dimreg_changed() {
+     return dimreg_changed_signal;
+ }
+ sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_note_on() {
+     return note_on_signal;
+ }
+ sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_note_off() {
+     return note_off_signal;
+ }
+ sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_keyboard_key_hit() {
+     return m_RegionChooser.signal_keyboard_key_hit();
+ }
+ sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_keyboard_key_released() {
+     return m_RegionChooser.signal_keyboard_key_released();
+ }

 Legend:



Removed from v.1261
 


changed lines


 
Added in v.2445
 Legend:



Removed from v.1261
 


changed lines


 
Added in v.2445
-Removed from v.1261
+Added in v.2445

	ViewVC Help
Powered by ViewVC