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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1322 by schoenebeck, Tue Sep 4 11:04:56 2007 UTC revision 2325 by persson, Sun Mar 4 09:01:40 2012 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006, 2007 Andreas Persson   * Copyright (C) 2006-2011 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 17  Line 17 
17   * 02110-1301 USA.   * 02110-1301 USA.
18   */   */
19    
 #include <libintl.h>  
20  #include <iostream>  #include <iostream>
21    #include <cstring>
22    
23    #include <glibmm/convert.h>
24    #include <glibmm/dispatcher.h>
25    #include <glibmm/miscutils.h>
26    #include <glibmm/stringutils.h>
27    #include <gtkmm/aboutdialog.h>
28  #include <gtkmm/filechooserdialog.h>  #include <gtkmm/filechooserdialog.h>
29  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
30  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
31  #include <gtkmm/targetentry.h>  #include <gtkmm/targetentry.h>
32  #include <gtkmm/main.h>  #include <gtkmm/main.h>
33    #include <gtkmm/radiomenuitem.h>
34    #include <gtkmm/toggleaction.h>
35    #include "wrapLabel.hh"
36    
37  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  #include "global.h"
38  #define ABOUT_DIALOG  #include "compat.h"
 #include <gtkmm/aboutdialog.h>  
 #endif  
   
 #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2  
 namespace Glib {  
 Glib::ustring filename_display_basename(const std::string& filename)  
 {  
     gchar* gstr = g_path_get_basename(filename.c_str());  
     Glib::ustring str(gstr);  
     g_free(gstr);  
     return Glib::filename_to_utf8(str);  
 }  
 }  
 #endif  
39    
40  #include <stdio.h>  #include <stdio.h>
41  #include <sndfile.h>  #include <sndfile.h>
42    
43  #include "mainwindow.h"  #include "mainwindow.h"
44    
45  #define _(String) gettext(String)  #include "../../gfx/status_attached.xpm"
46    #include "../../gfx/status_detached.xpm"
47    
48  template<class T> inline std::string ToString(T o) {  template<class T> inline std::string ToString(T o) {
49      std::stringstream ss;      std::stringstream ss;
# Line 56  template<class T> inline std::string ToS Line 51  template<class T> inline std::string ToS
51      return ss.str();      return ss.str();
52  }  }
53    
54  MainWindow::MainWindow()  Table::Table(int x, int y) : Gtk::Table(x, y), rowno(0) {  }
55    
56    void Table::add(BoolEntry& boolentry)
57    {
58        attach(boolentry.widget, 0, 2, rowno, rowno + 1,
59               Gtk::FILL, Gtk::SHRINK);
60        rowno++;
61    }
62    
63    void Table::add(BoolEntryPlus6& boolentry)
64    {
65        attach(boolentry.widget, 0, 2, rowno, rowno + 1,
66               Gtk::FILL, Gtk::SHRINK);
67        rowno++;
68    }
69    
70    void Table::add(LabelWidget& prop)
71    {
72        attach(prop.label, 1, 2, rowno, rowno + 1,
73               Gtk::FILL, Gtk::SHRINK);
74        attach(prop.widget, 2, 3, rowno, rowno + 1,
75               Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
76        rowno++;
77    }
78    
79    MainWindow::MainWindow() :
80        dimreg_label(_("Changes apply to:")),
81        dimreg_all_regions(_("all regions")),
82        dimreg_all_dimregs(_("all dimension splits")),
83        dimreg_stereo(_("both channels"))
84  {  {
85  //    set_border_width(5);  //    set_border_width(5);
86  //    set_default_size(400, 200);  //    set_default_size(400, 200);
# Line 86  MainWindow::MainWindow() Line 110  MainWindow::MainWindow()
110      m_TreeViewNotebook.set_size_request(300);      m_TreeViewNotebook.set_size_request(300);
111    
112      m_HPaned.add1(m_TreeViewNotebook);      m_HPaned.add1(m_TreeViewNotebook);
113      m_HPaned.add2(dimreg_edit);      dimreg_hbox.add(dimreg_label);
114        dimreg_hbox.add(dimreg_all_regions);
115        dimreg_hbox.add(dimreg_all_dimregs);
116        dimreg_stereo.set_active();
117        dimreg_hbox.add(dimreg_stereo);
118        dimreg_vbox.add(dimreg_edit);
119        dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);
120        m_HPaned.add2(dimreg_vbox);
121    
122    
123      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, "Samples");      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
124      m_TreeViewNotebook.append_page(m_ScrolledWindow, "Instruments");      m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
125    
126    
127      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
# Line 127  MainWindow::MainWindow() Line 158  MainWindow::MainWindow()
158                           *this, &MainWindow::on_action_quit));                           *this, &MainWindow::on_action_quit));
159      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));      actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument")));
160    
161        actionGroup->add(Gtk::Action::create("MenuView", _("_View")));
162        Glib::RefPtr<Gtk::ToggleAction> toggle_action =
163            Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));
164        toggle_action->set_active(true);
165        actionGroup->add(toggle_action,
166                         sigc::mem_fun(
167                             *this, &MainWindow::on_action_view_status_bar));
168    
169      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
170      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
171                                           action->property_label()));                                           action->property_label()));
 #ifdef ABOUT_DIALOG  
172      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
173                       sigc::mem_fun(                       sigc::mem_fun(
174                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
 #endif  
175      actionGroup->add(      actionGroup->add(
176          Gtk::Action::create("AddInstrument", _("Add _Instrument")),          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
177          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
# Line 154  MainWindow::MainWindow() Line 191  MainWindow::MainWindow()
191          sigc::mem_fun(*this, &MainWindow::on_action_add_group)          sigc::mem_fun(*this, &MainWindow::on_action_add_group)
192      );      );
193      actionGroup->add(      actionGroup->add(
194          Gtk::Action::create("AddSample", _("Add _Sample(s)")),          Gtk::Action::create("AddSample", _("Add _Sample(s)...")),
195          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)          sigc::mem_fun(*this, &MainWindow::on_action_add_sample)
196      );      );
197      actionGroup->add(      actionGroup->add(
198          Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE),
199          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)          sigc::mem_fun(*this, &MainWindow::on_action_remove_sample)
200      );      );
201        actionGroup->add(
202            Gtk::Action::create("ReplaceAllSamplesInAllGroups",
203                                _("Replace All Samples in All Groups...")),
204            sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
205        );
206    
207      uiManager = Gtk::UIManager::create();      uiManager = Gtk::UIManager::create();
208      uiManager->insert_action_group(actionGroup);      uiManager->insert_action_group(actionGroup);
# Line 182  MainWindow::MainWindow() Line 224  MainWindow::MainWindow()
224          "    </menu>"          "    </menu>"
225          "    <menu action='MenuInstrument'>"          "    <menu action='MenuInstrument'>"
226          "    </menu>"          "    </menu>"
227  #ifdef ABOUT_DIALOG          "    <menu action='MenuView'>"
228            "      <menuitem action='Statusbar'/>"
229            "    </menu>"
230          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
231          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
232          "    </menu>"          "    </menu>"
 #endif  
233          "  </menubar>"          "  </menubar>"
234          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
235          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
# Line 198  MainWindow::MainWindow() Line 241  MainWindow::MainWindow()
241          "    <menuitem action='SampleProperties'/>"          "    <menuitem action='SampleProperties'/>"
242          "    <menuitem action='AddGroup'/>"          "    <menuitem action='AddGroup'/>"
243          "    <menuitem action='AddSample'/>"          "    <menuitem action='AddSample'/>"
244            "    <menuitem action='ReplaceAllSamplesInAllGroups' />"
245          "    <separator/>"          "    <separator/>"
246          "    <menuitem action='RemoveSample'/>"          "    <menuitem action='RemoveSample'/>"
247          "  </popup>"          "  </popup>"
# Line 210  MainWindow::MainWindow() Line 254  MainWindow::MainWindow()
254      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK);
255      m_VBox.pack_start(m_HPaned);      m_VBox.pack_start(m_HPaned);
256      m_VBox.pack_start(m_RegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_RegionChooser, Gtk::PACK_SHRINK);
257        m_VBox.pack_start(m_RegionChooser.m_VirtKeybPropsBox, Gtk::PACK_SHRINK);
258      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
259        m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
260    
261        set_file_is_shared(false);
262    
263        // Status Bar:
264        m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
265        m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
266        m_StatusBar.show();
267    
268      m_RegionChooser.signal_region_selected().connect(      m_RegionChooser.signal_region_selected().connect(
269          sigc::mem_fun(*this, &MainWindow::region_changed) );          sigc::mem_fun(*this, &MainWindow::region_changed) );
# Line 243  MainWindow::MainWindow() Line 296  MainWindow::MainWindow()
296      );      );
297    
298      // establish drag&drop between samples tree view and dimension region 'Sample' text entry      // establish drag&drop between samples tree view and dimension region 'Sample' text entry
299      std::list<Gtk::TargetEntry> drag_target_gig_sample;      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
300      drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
301      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
302      m_TreeViewSamples.signal_drag_begin().connect(      m_TreeViewSamples.signal_drag_begin().connect(
303          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)
# Line 264  MainWindow::MainWindow() Line 317  MainWindow::MainWindow()
317          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
318      instrumentProps.signal_instrument_changed().connect(      instrumentProps.signal_instrument_changed().connect(
319          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
320        propDialog.signal_info_changed().connect(
321            sigc::mem_fun(*this, &MainWindow::file_changed));
322    
323      dimreg_edit.signal_dimreg_to_be_changed().connect(      dimreg_edit.signal_dimreg_to_be_changed().connect(
324          dimreg_to_be_changed_signal.make_slot());          dimreg_to_be_changed_signal.make_slot());
# Line 293  MainWindow::MainWindow() Line 348  MainWindow::MainWindow()
348      m_RegionChooser.signal_region_changed_signal().connect(      m_RegionChooser.signal_region_changed_signal().connect(
349          region_changed_signal.make_slot());          region_changed_signal.make_slot());
350    
351        note_on_signal.connect(
352            sigc::mem_fun(m_RegionChooser, &RegionChooser::on_note_on_event));
353        note_off_signal.connect(
354            sigc::mem_fun(m_RegionChooser, &RegionChooser::on_note_off_event));
355    
356        dimreg_all_regions.signal_toggled().connect(
357            sigc::mem_fun(*this, &MainWindow::update_dimregs));
358        dimreg_all_dimregs.signal_toggled().connect(
359            sigc::mem_fun(*this, &MainWindow::dimreg_all_dimregs_toggled));
360        dimreg_stereo.signal_toggled().connect(
361            sigc::mem_fun(*this, &MainWindow::update_dimregs));
362    
363      file = 0;      file = 0;
364      file_is_changed = false;      file_is_changed = false;
365    
# Line 308  MainWindow::~MainWindow() Line 375  MainWindow::~MainWindow()
375    
376  bool MainWindow::on_delete_event(GdkEventAny* event)  bool MainWindow::on_delete_event(GdkEventAny* event)
377  {  {
378      return file_is_changed && !close_confirmation_dialog();      return !file_is_shared && file_is_changed && !close_confirmation_dialog();
379  }  }
380    
381  void MainWindow::on_action_quit()  void MainWindow::on_action_quit()
382  {  {
383      if (file_is_changed && !close_confirmation_dialog()) return;      if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
384      hide();      hide();
385  }  }
386    
# Line 322  void MainWindow::region_changed() Line 389  void MainWindow::region_changed()
389      m_DimRegionChooser.set_region(m_RegionChooser.get_region());      m_DimRegionChooser.set_region(m_RegionChooser.get_region());
390  }  }
391    
392  void MainWindow::dimreg_changed()  gig::Instrument* MainWindow::get_instrument()
 {  
     dimreg_edit.set_dim_region(m_DimRegionChooser.get_dimregion());  
 }  
   
 void MainWindow::on_sel_change()  
393  {  {
394        gig::Instrument* instrument = 0;
395      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();
396    
397      Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();      Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();
398      if (it) {      if (it) {
399          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
400          std::cout << row[m_Columns.m_col_name] << std::endl;          instrument = row[m_Columns.m_col_instr];
401        }
402        return instrument;
403    }
404    
405    void MainWindow::add_region_to_dimregs(gig::Region* region, bool stereo, bool all_dimregs)
406    {
407        if (all_dimregs) {
408            for (int i = 0 ; i < region->DimensionRegions ; i++) {
409                if (region->pDimensionRegions[i]) {
410                    dimreg_edit.dimregs.insert(region->pDimensionRegions[i]);
411                }
412            }
413        } else {
414            m_DimRegionChooser.get_dimregions(region, stereo, dimreg_edit.dimregs);
415        }
416    }
417    
418          m_RegionChooser.set_instrument(row[m_Columns.m_col_instr]);  void MainWindow::update_dimregs()
419    {
420        dimreg_edit.dimregs.clear();
421        bool all_regions = dimreg_all_regions.get_active();
422        bool stereo = dimreg_stereo.get_active();
423        bool all_dimregs = dimreg_all_dimregs.get_active();
424    
425        if (all_regions) {
426            gig::Instrument* instrument = get_instrument();
427            if (instrument) {
428                for (gig::Region* region = instrument->GetFirstRegion() ;
429                     region ;
430                     region = instrument->GetNextRegion()) {
431                    add_region_to_dimregs(region, stereo, all_dimregs);
432                }
433            }
434      } else {      } else {
435          m_RegionChooser.set_instrument(0);          gig::Region* region = m_RegionChooser.get_region();
436            if (region) {
437                add_region_to_dimregs(region, stereo, all_dimregs);
438            }
439      }      }
440  }  }
441    
442    void MainWindow::dimreg_all_dimregs_toggled()
443    {
444        dimreg_stereo.set_sensitive(!dimreg_all_dimregs.get_active());
445        update_dimregs();
446    }
447    
448    void MainWindow::dimreg_changed()
449    {
450        update_dimregs();
451        dimreg_edit.set_dim_region(m_DimRegionChooser.get_dimregion());
452    }
453    
454    void MainWindow::on_sel_change()
455    {
456        m_RegionChooser.set_instrument(get_instrument());
457    }
458    
459  void loader_progress_callback(gig::progress_t* progress)  void loader_progress_callback(gig::progress_t* progress)
460  {  {
461      Loader* loader = static_cast<Loader*>(progress->custom);      Loader* loader = static_cast<Loader*>(progress->custom);
# Line 351  void loader_progress_callback(gig::progr Line 465  void loader_progress_callback(gig::progr
465  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
466  {  {
467      {      {
468          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
469          progress = fraction;          progress = fraction;
470      }      }
471      progress_dispatcher();      progress_dispatcher();
# Line 359  void Loader::progress_callback(float fra Line 473  void Loader::progress_callback(float fra
473    
474  void Loader::thread_function()  void Loader::thread_function()
475  {  {
476      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
477      printf("Start %s\n", filename);      printf("Start %s\n", filename);
478      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
479      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 373  void Loader::thread_function() Line 487  void Loader::thread_function()
487  }  }
488    
489  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
490      : thread(0), filename(filename)      : filename(filename), thread(0)
491  {  {
492  }  }
493    
494  void Loader::launch()  void Loader::launch()
495  {  {
496      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
497      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
498  }  }
499    
# Line 387  float Loader::get_progress() Line 501  float Loader::get_progress()
501  {  {
502      float res;      float res;
503      {      {
504          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
505          res = progress;          res = progress;
506      }      }
507      return res;      return res;
# Line 417  void MainWindow::__clear() { Line 531  void MainWindow::__clear() {
531      Gtk::MenuItem* instrument_menu =      Gtk::MenuItem* instrument_menu =
532          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
533      instrument_menu->hide();      instrument_menu->hide();
534      for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {      Gtk::Menu* menu = instrument_menu->get_submenu();
535          delete &instrument_menu->get_submenu()->items()[i];      while (menu->get_children().size()) {
536            Gtk::Widget* child = *menu->get_children().begin();
537            menu->remove(*child);
538            delete child;
539      }      }
     instrument_menu->get_submenu()->items().clear();  
540      // forget all samples that ought to be imported      // forget all samples that ought to be imported
541      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
542      // clear the samples and instruments tree views      // clear the samples and instruments tree views
543      m_refTreeModel->clear();      m_refTreeModel->clear();
544      m_refSamplesTreeModel->clear();      m_refSamplesTreeModel->clear();
545      // free libgig's gig::File instance      // free libgig's gig::File instance
546      if (file) {      if (file && !file_is_shared) delete file;
547          delete file;      file = NULL;
548          file = NULL;      set_file_is_shared(false);
     }  
549  }  }
550    
551  void MainWindow::on_action_file_new()  void MainWindow::on_action_file_new()
552  {  {
553      if (file_is_changed && !close_confirmation_dialog()) return;      if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
554    
555        if (file_is_shared && !leaving_shared_mode_dialog()) return;
556    
557      // clear all GUI elements      // clear all GUI elements
558      __clear();      __clear();
# Line 443  void MainWindow::on_action_file_new() Line 560  void MainWindow::on_action_file_new()
560      gig::File* pFile = new gig::File;      gig::File* pFile = new gig::File;
561      // already add one new instrument by default      // already add one new instrument by default
562      gig::Instrument* pInstrument = pFile->AddInstrument();      gig::Instrument* pInstrument = pFile->AddInstrument();
563      pInstrument->pInfo->Name = "Unnamed Instrument";      pInstrument->pInfo->Name = _("Unnamed Instrument");
564      // update GUI with that new gig::File      // update GUI with that new gig::File
565      load_gig(pFile, 0 /*no file name yet*/);      load_gig(pFile, 0 /*no file name yet*/);
566  }  }
# Line 454  bool MainWindow::close_confirmation_dial Line 571  bool MainWindow::close_confirmation_dial
571                                   Glib::filename_display_basename(filename).c_str());                                   Glib::filename_display_basename(filename).c_str());
572      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
573      g_free(msg);      g_free(msg);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
574      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));      dialog.set_secondary_text(_("If you close without saving, your changes will be lost."));
 #endif  
575      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
576      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
577      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);      dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES);
# Line 467  bool MainWindow::close_confirmation_dial Line 582  bool MainWindow::close_confirmation_dial
582      return response != Gtk::RESPONSE_CANCEL;      return response != Gtk::RESPONSE_CANCEL;
583  }  }
584    
585    bool MainWindow::leaving_shared_mode_dialog() {
586        Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
587        Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
588        dialog.set_secondary_text(
589            _("If you proceed to work on another instrument file, it won't be "
590              "used by the sampler until you tell the sampler explicitly to "
591              "load it."));
592        dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
593        dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
594        dialog.set_default_response(Gtk::RESPONSE_CANCEL);
595        int response = dialog.run();
596        dialog.hide();
597        return response == Gtk::RESPONSE_YES;
598    }
599    
600  void MainWindow::on_action_file_open()  void MainWindow::on_action_file_open()
601  {  {
602      if (file_is_changed && !close_confirmation_dialog()) return;      if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return;
603    
604        if (file_is_shared && !leaving_shared_mode_dialog()) return;
605    
606      Gtk::FileChooserDialog dialog(*this, _("Open file"));      Gtk::FileChooserDialog dialog(*this, _("Open file"));
607      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
608      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
609      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
610    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
611      Gtk::FileFilter filter;      Gtk::FileFilter filter;
612      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
613    #else
614        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
615        filter->add_pattern("*.gig");
616    #endif
617      dialog.set_filter(filter);      dialog.set_filter(filter);
618      if (current_dir != "") {      if (current_gig_dir != "") {
619          dialog.set_current_folder(current_dir);          dialog.set_current_folder(current_gig_dir);
620      }      }
621      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
622          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
623          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
624          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
625          load_file(filename.c_str());          load_file(filename.c_str());
626          current_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
627      }      }
628  }  }
629    
630  void MainWindow::load_file(const char* name)  void MainWindow::load_file(const char* name)
631  {  {
632      __clear();      __clear();
633      load_dialog = new LoadDialog("Loading...", *this);      load_dialog = new LoadDialog(_("Loading..."), *this);
634      load_dialog->show_all();      load_dialog->show_all();
635      loader = new Loader(strdup(name));      loader = new Loader(strdup(name));
636      loader->signal_progress().connect(      loader->signal_progress().connect(
# Line 510  void MainWindow::load_instrument(gig::In Line 647  void MainWindow::load_instrument(gig::In
647          msg.run();          msg.run();
648          Gtk::Main::quit();          Gtk::Main::quit();
649      }      }
650        // clear all GUI elements
651        __clear();
652        // load the instrument
653      gig::File* pFile = (gig::File*) instr->GetParent();      gig::File* pFile = (gig::File*) instr->GetParent();
654      load_gig(pFile, 0 /*file name*/);      load_gig(pFile, 0 /*file name*/, true /*shared instrument*/);
655      //TODO: automatically select the given instrument      //TODO: automatically select the given instrument
656  }  }
657    
# Line 523  void MainWindow::on_loader_progress() Line 663  void MainWindow::on_loader_progress()
663  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
664  {  {
665      printf("Loader finished!\n");      printf("Loader finished!\n");
666      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
667      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
668      load_dialog->hide();      load_dialog->hide();
669  }  }
# Line 560  bool MainWindow::check_if_savable() Line 700  bool MainWindow::check_if_savable()
700  bool MainWindow::file_save()  bool MainWindow::file_save()
701  {  {
702      if (!check_if_savable()) return false;      if (!check_if_savable()) return false;
703      if (!file_has_name) return file_save_as();      if (!file_is_shared && !file_has_name) return file_save_as();
704    
705      std::cout << "Saving file\n" << std::flush;      std::cout << "Saving file\n" << std::flush;
706      file_structure_to_be_changed_signal.emit(this->file);      file_structure_to_be_changed_signal.emit(this->file);
# Line 572  bool MainWindow::file_save() Line 712  bool MainWindow::file_save()
712          }          }
713      } catch (RIFF::Exception e) {      } catch (RIFF::Exception e) {
714          file_structure_changed_signal.emit(this->file);          file_structure_changed_signal.emit(this->file);
715          Glib::ustring txt = "Could not save file: " + e.Message;          Glib::ustring txt = _("Could not save file: ") + e.Message;
716          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
717          msg.run();          msg.run();
718          return false;          return false;
# Line 595  bool MainWindow::file_save_as() Line 735  bool MainWindow::file_save_as()
735      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
736      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
737      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
   
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 8) || GTKMM_MAJOR_VERSION > 2  
738      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
739      // TODO: an overwrite dialog for gtkmm < 2.8  
740  #endif  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
741      Gtk::FileFilter filter;      Gtk::FileFilter filter;
742      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
743    #else
744        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
745        filter->add_pattern("*.gig");
746    #endif
747      dialog.set_filter(filter);      dialog.set_filter(filter);
748    
749      if (Glib::path_is_absolute(filename)) {      // set initial dir and filename of the Save As dialog
750          dialog.set_filename(filename);      // and prepare that initial filename as a copy of the gig
751      } else if (current_dir != "") {      {
752          dialog.set_current_folder(current_dir);          std::string basename = Glib::path_get_basename(filename);
753            std::string dir = Glib::path_get_dirname(filename);
754            basename = std::string(_("copy_of_")) + basename;
755            Glib::ustring copyFileName = Glib::build_filename(dir, basename);
756            if (Glib::path_is_absolute(filename)) {
757                dialog.set_filename(copyFileName);
758            } else {
759                if (current_gig_dir != "") dialog.set_current_folder(current_gig_dir);
760            }
761            dialog.set_current_name(Glib::filename_display_basename(copyFileName));
762      }      }
763      dialog.set_current_name(Glib::filename_display_basename(filename));  
764        // show warning in the dialog
765        Gtk::HBox descriptionArea;
766        descriptionArea.set_spacing(15);
767        Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
768        descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
769        view::WrapLabel description;
770        description.set_markup(
771            _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
772              "<span style=\"italic\">\"Save\"</span> dialog instead of "
773              "<span style=\"italic\">\"Save As...\"</span> if you want to save "
774              "to the same .gig file. Using "
775              "<span style=\"italic\">\"Save As...\"</span> for writing to the "
776              "same .gig file will end up in corrupted sample wave data!\n")
777        );
778        descriptionArea.pack_start(description);
779        dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK);
780        descriptionArea.show_all();
781    
782      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
783          file_structure_to_be_changed_signal.emit(this->file);          file_structure_to_be_changed_signal.emit(this->file);
# Line 621  bool MainWindow::file_save_as() Line 789  bool MainWindow::file_save_as()
789              printf("filename=%s\n", filename.c_str());              printf("filename=%s\n", filename.c_str());
790              file->Save(filename);              file->Save(filename);
791              this->filename = filename;              this->filename = filename;
792              current_dir = Glib::path_get_dirname(filename);              current_gig_dir = Glib::path_get_dirname(filename);
793              set_title(Glib::filename_display_basename(filename));              set_title(Glib::filename_display_basename(filename));
794              file_has_name = true;              file_has_name = true;
795              file_is_changed = false;              file_is_changed = false;
796          } catch (RIFF::Exception e) {          } catch (RIFF::Exception e) {
797              file_structure_changed_signal.emit(this->file);              file_structure_changed_signal.emit(this->file);
798              Glib::ustring txt = "Could not save file: " + e.Message;              Glib::ustring txt = _("Could not save file: ") + e.Message;
799              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
800              msg.run();              msg.run();
801              return false;              return false;
# Line 651  void MainWindow::__import_queued_samples Line 819  void MainWindow::__import_queued_samples
819          info.format = 0;          info.format = 0;
820          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
821          try {          try {
822              if (!hFile) throw std::string("could not open file");              if (!hFile) throw std::string(_("could not open file"));
823              // determine sample's bit depth              // determine sample's bit depth
824              int bitdepth;              int bitdepth;
825              switch (info.format & 0xff) {              switch (info.format & 0xff) {
# Line 668  void MainWindow::__import_queued_samples Line 836  void MainWindow::__import_queued_samples
836                      break;                      break;
837                  default:                  default:
838                      sf_close(hFile); // close sound file                      sf_close(hFile); // close sound file
839                      throw std::string("format not supported"); // unsupported subformat (yet?)                      throw std::string(_("format not supported")); // unsupported subformat (yet?)
840              }              }
841    
842              const int bufsize = 10000;              const int bufsize = 10000;
# Line 710  void MainWindow::__import_queued_samples Line 878  void MainWindow::__import_queued_samples
878              }              }
879              // cleanup              // cleanup
880              sf_close(hFile);              sf_close(hFile);
881                // let the sampler re-cache the sample if needed
882                sample_changed_signal.emit(iter->gig_sample);
883              // on success we remove the sample from the import queue,              // on success we remove the sample from the import queue,
884              // otherwise keep it, maybe it works the next time ?              // otherwise keep it, maybe it works the next time ?
885              std::list<SampleImportItem>::iterator cur = iter;              std::list<SampleImportItem>::iterator cur = iter;
# Line 724  void MainWindow::__import_queued_samples Line 894  void MainWindow::__import_queued_samples
894      }      }
895      // show error message box when some sample(s) could not be imported      // show error message box when some sample(s) could not be imported
896      if (error_files.size()) {      if (error_files.size()) {
897          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;
898          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);          Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
899          msg.run();          msg.run();
900      }      }
# Line 738  void MainWindow::on_action_file_properti Line 908  void MainWindow::on_action_file_properti
908    
909  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
910  {  {
 #ifdef ABOUT_DIALOG  
911      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
912    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
913        dialog.set_program_name("Gigedit");
914    #else
915        dialog.set_name("Gigedit");
916    #endif
917      dialog.set_version(VERSION);      dialog.set_version(VERSION);
918        dialog.set_copyright("Copyright (C) 2006-2011 Andreas Persson");
919        dialog.set_comments(_(
920            "Released under the GNU General Public License.\n"
921            "\n"
922            "Please notice that this is still a very young instrument editor. "
923            "So better backup your Gigasampler files before editing them with "
924            "this application.\n"
925            "\n"
926            "Please report bugs to: http://bugs.linuxsampler.org")
927        );
928        dialog.set_website("http://www.linuxsampler.org");
929        dialog.set_website_label("http://www.linuxsampler.org");
930      dialog.run();      dialog.run();
 #endif  
931  }  }
932    
933  PropDialog::PropDialog()  PropDialog::PropDialog()
934      : table(2,1)      : eName(_("Name")),
935          eCreationDate(_("Creation date")),
936          eComments(_("Comments")),
937          eProduct(_("Product")),
938          eCopyright(_("Copyright")),
939          eArtists(_("Artists")),
940          eGenre(_("Genre")),
941          eKeywords(_("Keywords")),
942          eEngineer(_("Engineer")),
943          eTechnician(_("Technician")),
944          eSoftware(_("Software")),
945          eMedium(_("Medium")),
946          eSource(_("Source")),
947          eSourceForm(_("Source form")),
948          eCommissioned(_("Commissioned")),
949          eSubject(_("Subject")),
950          quitButton(Gtk::Stock::CLOSE),
951          table(2, 1),
952          update_model(0)
953  {  {
954        set_title(_("File Properties"));
955        eName.set_width_chars(50);
956    
957        connect(eName, &DLS::Info::Name);
958        connect(eCreationDate, &DLS::Info::CreationDate);
959        connect(eComments, &DLS::Info::Comments);
960        connect(eProduct, &DLS::Info::Product);
961        connect(eCopyright, &DLS::Info::Copyright);
962        connect(eArtists, &DLS::Info::Artists);
963        connect(eGenre, &DLS::Info::Genre);
964        connect(eKeywords, &DLS::Info::Keywords);
965        connect(eEngineer, &DLS::Info::Engineer);
966        connect(eTechnician, &DLS::Info::Technician);
967        connect(eSoftware, &DLS::Info::Software);
968        connect(eMedium, &DLS::Info::Medium);
969        connect(eSource, &DLS::Info::Source);
970        connect(eSourceForm, &DLS::Info::SourceForm);
971        connect(eCommissioned, &DLS::Info::Commissioned);
972        connect(eSubject, &DLS::Info::Subject);
973    
974        table.add(eName);
975        table.add(eCreationDate);
976        table.add(eComments);
977        table.add(eProduct);
978        table.add(eCopyright);
979        table.add(eArtists);
980        table.add(eGenre);
981        table.add(eKeywords);
982        table.add(eEngineer);
983        table.add(eTechnician);
984        table.add(eSoftware);
985        table.add(eMedium);
986        table.add(eSource);
987        table.add(eSourceForm);
988        table.add(eCommissioned);
989        table.add(eSubject);
990    
991      table.set_col_spacings(5);      table.set_col_spacings(5);
992      const char* propLabels[] = {      add(vbox);
993          "Name:",      table.set_border_width(5);
994          "CreationDate:",      vbox.add(table);
995          "Comments:", // TODO: multiline      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
996          "Product:",      buttonBox.set_layout(Gtk::BUTTONBOX_END);
997          "Copyright:",      buttonBox.set_border_width(5);
998          "Artists:",      buttonBox.show();
999          "Genre:",      buttonBox.pack_start(quitButton);
1000          "Keywords:",      quitButton.set_can_default();
1001          "Engineer:",      quitButton.grab_focus();
1002          "Technician:",      quitButton.signal_clicked().connect(
1003          "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);  
     }  
1004    
1005      add(table);      quitButton.show();
1006      // add_button(Gtk::Stock::CANCEL, 0);      vbox.show();
     // add_button(Gtk::Stock::OK, 1);  
1007      show_all_children();      show_all_children();
1008  }  }
1009    
1010  void PropDialog::set_info(DLS::Info* info)  void PropDialog::set_info(DLS::Info* info)
1011  {  {
1012      entry[0].set_text(info->Name);      this->info = info;
1013      entry[1].set_text(info->CreationDate);      update_model++;
1014      entry[2].set_text(Glib::convert(info->Comments, "UTF-8", "ISO-8859-1"));      eName.set_value(info->Name);
1015      entry[3].set_text(info->Product);      eCreationDate.set_value(info->CreationDate);
1016      entry[4].set_text(info->Copyright);      eComments.set_value(info->Comments);
1017      entry[5].set_text(info->Artists);      eProduct.set_value(info->Product);
1018      entry[6].set_text(info->Genre);      eCopyright.set_value(info->Copyright);
1019      entry[7].set_text(info->Keywords);      eArtists.set_value(info->Artists);
1020      entry[8].set_text(info->Engineer);      eGenre.set_value(info->Genre);
1021      entry[9].set_text(info->Technician);      eKeywords.set_value(info->Keywords);
1022      entry[10].set_text(info->Software);      eEngineer.set_value(info->Engineer);
1023      entry[11].set_text(info->Medium);      eTechnician.set_value(info->Technician);
1024      entry[12].set_text(info->Source);      eSoftware.set_value(info->Software);
1025      entry[13].set_text(info->SourceForm);      eMedium.set_value(info->Medium);
1026      entry[14].set_text(info->Commissioned);      eSource.set_value(info->Source);
1027      entry[15].set_text(info->Subject);      eSourceForm.set_value(info->SourceForm);
1028        eCommissioned.set_value(info->Commissioned);
1029        eSubject.set_value(info->Subject);
1030        update_model--;
1031  }  }
1032    
1033  void InstrumentProps::add_prop(BoolEntry& boolentry)  sigc::signal<void>& PropDialog::signal_info_changed()
1034  {  {
1035      table.attach(boolentry.widget, 0, 2, rowno, rowno + 1,      return info_changed;
                  Gtk::FILL, Gtk::SHRINK);  
     rowno++;  
     boolentry.signal_changed_by_user().connect(instrument_changed.make_slot());  
1036  }  }
1037    
1038  void InstrumentProps::add_prop(BoolEntryPlus6& boolentry)  void InstrumentProps::set_IsDrum(bool value)
1039  {  {
1040      table.attach(boolentry.widget, 0, 2, rowno, rowno + 1,      instrument->IsDrum = value;
                  Gtk::FILL, Gtk::SHRINK);  
     rowno++;  
     boolentry.signal_changed_by_user().connect(instrument_changed.make_slot());  
1041  }  }
1042    
1043  void InstrumentProps::add_prop(LabelWidget& prop)  void InstrumentProps::set_MIDIBank(uint16_t value)
1044  {  {
1045      table.attach(prop.label, 0, 1, rowno, rowno + 1,      instrument->MIDIBank = value;
1046                   Gtk::FILL, Gtk::SHRINK);  }
1047      table.attach(prop.widget, 1, 2, rowno, rowno + 1,  
1048                   Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);  void InstrumentProps::set_MIDIProgram(uint32_t value)
1049      rowno++;  {
1050      prop.signal_changed_by_user().connect(instrument_changed.make_slot());      instrument->MIDIProgram = value;
1051    }
1052    
1053    void InstrumentProps::set_DimensionKeyRange_low(uint8_t value)
1054    {
1055        instrument->DimensionKeyRange.low = value;
1056        if (value > instrument->DimensionKeyRange.high) {
1057            eDimensionKeyRangeHigh.set_value(value);
1058        }
1059    }
1060    
1061    void InstrumentProps::set_DimensionKeyRange_high(uint8_t value)
1062    {
1063        instrument->DimensionKeyRange.high = value;
1064        if (value < instrument->DimensionKeyRange.low) {
1065            eDimensionKeyRangeLow.set_value(value);
1066        }
1067  }  }
1068    
1069  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1070      : table(2,1),      : update_model(0),
1071        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1072        eName("Name"),        table(2,1),
1073        eIsDrum("Is drum"),        eName(_("Name")),
1074        eMIDIBank("MIDI bank", 0, 16383),        eIsDrum(_("Is drum")),
1075        eMIDIProgram("MIDI program"),        eMIDIBank(_("MIDI bank"), 0, 16383),
1076        eAttenuation("Attenuation", 0, 96, 0, 1),        eMIDIProgram(_("MIDI program")),
1077        eGainPlus6("Gain +6dB", eAttenuation, -6),        eAttenuation(_("Attenuation"), 0, 96, 0, 1),
1078        eEffectSend("Effect send", 0, 65535),        eGainPlus6(_("Gain +6dB"), eAttenuation, -6),
1079        eFineTune("Fine tune", -8400, 8400),        eEffectSend(_("Effect send"), 0, 65535),
1080        ePitchbendRange("Pitchbend range", 0, 12),        eFineTune(_("Fine tune"), -8400, 8400),
1081        ePianoReleaseMode("Piano release mode"),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1082        eDimensionKeyRangeLow("Dimension key range low"),        ePianoReleaseMode(_("Piano release mode")),
1083        eDimensionKeyRangeHigh("Dimension key range high")        eDimensionKeyRangeLow(_("Keyswitching range low")),
1084  {        eDimensionKeyRangeHigh(_("Keyswitching range high"))
1085      set_title("Instrument properties");  {
1086        set_title(_("Instrument Properties"));
1087    
1088        eDimensionKeyRangeLow.set_tip(
1089            _("start of the keyboard area which should switch the "
1090              "\"keyswitching\" dimension")
1091        );
1092        eDimensionKeyRangeHigh.set_tip(
1093            _("end of the keyboard area which should switch the "
1094              "\"keyswitching\" dimension")
1095        );
1096    
1097        connect(eIsDrum, &InstrumentProps::set_IsDrum);
1098        connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
1099        connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
1100        connect(eAttenuation, &gig::Instrument::Attenuation);
1101        connect(eGainPlus6, &gig::Instrument::Attenuation);
1102        connect(eEffectSend, &gig::Instrument::EffectSend);
1103        connect(eFineTune, &gig::Instrument::FineTune);
1104        connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
1105        connect(ePianoReleaseMode, &gig::Instrument::PianoReleaseMode);
1106        connect(eDimensionKeyRangeLow,
1107                &InstrumentProps::set_DimensionKeyRange_low);
1108        connect(eDimensionKeyRangeHigh,
1109                &InstrumentProps::set_DimensionKeyRange_high);
1110    
     rowno = 0;  
1111      table.set_col_spacings(5);      table.set_col_spacings(5);
1112    
1113      add_prop(eName);      table.add(eName);
1114      add_prop(eIsDrum);      table.add(eIsDrum);
1115      add_prop(eMIDIBank);      table.add(eMIDIBank);
1116      add_prop(eMIDIProgram);      table.add(eMIDIProgram);
1117      add_prop(eAttenuation);      table.add(eAttenuation);
1118      add_prop(eGainPlus6);      table.add(eGainPlus6);
1119      add_prop(eEffectSend);      table.add(eEffectSend);
1120      add_prop(eFineTune);      table.add(eFineTune);
1121      add_prop(ePitchbendRange);      table.add(ePitchbendRange);
1122      add_prop(ePianoReleaseMode);      table.add(ePianoReleaseMode);
1123      add_prop(eDimensionKeyRangeLow);      table.add(eDimensionKeyRangeLow);
1124      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));  
1125    
1126      add(vbox);      add(vbox);
1127      table.set_border_width(5);      table.set_border_width(5);
# Line 875  InstrumentProps::InstrumentProps() Line 1132  InstrumentProps::InstrumentProps()
1132      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1133      buttonBox.show();      buttonBox.show();
1134      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1135      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1136      quitButton.grab_focus();      quitButton.grab_focus();
1137    
1138      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
# Line 888  InstrumentProps::InstrumentProps() Line 1145  InstrumentProps::InstrumentProps()
1145    
1146  void InstrumentProps::set_instrument(gig::Instrument* instrument)  void InstrumentProps::set_instrument(gig::Instrument* instrument)
1147  {  {
1148      eName.set_ptr(&instrument->pInfo->Name);      this->instrument = 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);  
 }  
1149    
1150  void InstrumentProps::key_range_low_changed()      update_model++;
1151  {      eName.set_value(instrument->pInfo->Name);
1152      double l = eDimensionKeyRangeLow.get_value();      eIsDrum.set_value(instrument->IsDrum);
1153      double h = eDimensionKeyRangeHigh.get_value();      eMIDIBank.set_value(instrument->MIDIBank);
1154      if (h < l) eDimensionKeyRangeHigh.set_value(l);      eMIDIProgram.set_value(instrument->MIDIProgram);
1155        eAttenuation.set_value(instrument->Attenuation);
1156        eGainPlus6.set_value(instrument->Attenuation);
1157        eEffectSend.set_value(instrument->EffectSend);
1158        eFineTune.set_value(instrument->FineTune);
1159        ePitchbendRange.set_value(instrument->PitchbendRange);
1160        ePianoReleaseMode.set_value(instrument->PianoReleaseMode);
1161        eDimensionKeyRangeLow.set_value(instrument->DimensionKeyRange.low);
1162        eDimensionKeyRangeHigh.set_value(instrument->DimensionKeyRange.high);
1163        update_model--;
1164  }  }
1165    
1166  void InstrumentProps::key_range_high_changed()  sigc::signal<void>& InstrumentProps::signal_instrument_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()  
1167  {  {
1168      return instrument_changed;      return instrument_changed;
1169  }  }
# Line 931  void MainWindow::file_changed() Line 1176  void MainWindow::file_changed()
1176      }      }
1177  }  }
1178    
1179  void MainWindow::load_gig(gig::File* gig, const char* filename)  void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)
1180  {  {
1181      file = 0;      file = 0;
1182        set_file_is_shared(isSharedInstrument);
1183    
1184      this->filename = filename ? filename : _("Unsaved Gig File");      this->filename = filename ? filename : _("Unsaved Gig File");
1185      set_title(Glib::filename_display_basename(this->filename));      set_title(Glib::filename_display_basename(this->filename));
# Line 996  void MainWindow::load_gig(gig::File* gig Line 1242  void MainWindow::load_gig(gig::File* gig
1242    
1243  void MainWindow::show_instr_props()  void MainWindow::show_instr_props()
1244  {  {
1245      Glib::RefPtr<Gtk::TreeSelection> tree_sel_ref = m_TreeView.get_selection();      gig::Instrument* instrument = get_instrument();
1246      Gtk::TreeModel::iterator it = tree_sel_ref->get_selected();      if (instrument)
     if (it)  
1247      {      {
1248          Gtk::TreeModel::Row row = *it;          instrumentProps.set_instrument(instrument);
1249          if (row[m_Columns.m_col_instr])          instrumentProps.show();
1250          {          instrumentProps.deiconify();
             instrumentProps.set_instrument(row[m_Columns.m_col_instr]);  
             instrumentProps.show();  
             instrumentProps.deiconify();  
         }  
1251      }      }
1252  }  }
1253    
1254    void MainWindow::on_action_view_status_bar() {
1255        Gtk::CheckMenuItem* item =
1256            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
1257        if (!item) {
1258            std::cerr << "/MenuBar/MenuView/Statusbar == NULL\n";
1259            return;
1260        }
1261        if (item->get_active()) m_StatusBar.show();
1262        else                    m_StatusBar.hide();
1263    }
1264    
1265  void MainWindow::on_button_release(GdkEventButton* button)  void MainWindow::on_button_release(GdkEventButton* button)
1266  {  {
1267      if (button->type == GDK_2BUTTON_PRESS) {      if (button->type == GDK_2BUTTON_PRESS) {
# Line 1056  void MainWindow::on_action_add_instrumen Line 1308  void MainWindow::on_action_add_instrumen
1308      gig::Instrument* instrument = file->AddInstrument();      gig::Instrument* instrument = file->AddInstrument();
1309      __instrument_indexer++;      __instrument_indexer++;
1310      instrument->pInfo->Name =      instrument->pInfo->Name =
1311          "Unnamed Instrument " + ToString(__instrument_indexer);          _("Unnamed Instrument ") + ToString(__instrument_indexer);
1312      // update instrument tree view      // update instrument tree view
1313      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1314      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
# Line 1067  void MainWindow::on_action_add_instrumen Line 1319  void MainWindow::on_action_add_instrumen
1319    
1320  void MainWindow::on_action_remove_instrument() {  void MainWindow::on_action_remove_instrument() {
1321      if (!file) return;      if (!file) return;
1322        if (file_is_shared) {
1323            Gtk::MessageDialog msg(
1324                *this,
1325                 _("You cannot delete an instrument from this file, since it's "
1326                   "currently used by the sampler."),
1327                 false, Gtk::MESSAGE_INFO
1328            );
1329            msg.run();
1330            return;
1331        }
1332    
1333      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
1334      Gtk::TreeModel::iterator it = sel->get_selected();      Gtk::TreeModel::iterator it = sel->get_selected();
1335      if (it) {      if (it) {
# Line 1088  void MainWindow::on_action_remove_instru Line 1351  void MainWindow::on_action_remove_instru
1351  void MainWindow::on_action_sample_properties() {  void MainWindow::on_action_sample_properties() {
1352      //TODO: show a dialog where the selected sample's properties can be edited      //TODO: show a dialog where the selected sample's properties can be edited
1353      Gtk::MessageDialog msg(      Gtk::MessageDialog msg(
1354          *this, "Sorry, yet to be implemented!", false, Gtk::MESSAGE_INFO          *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO
1355      );      );
1356      msg.run();      msg.run();
1357  }  }
# Line 1097  void MainWindow::on_action_add_group() { Line 1360  void MainWindow::on_action_add_group() {
1360      static int __sample_indexer = 0;      static int __sample_indexer = 0;
1361      if (!file) return;      if (!file) return;
1362      gig::Group* group = file->AddGroup();      gig::Group* group = file->AddGroup();
1363      group->Name = "Unnamed Group";      group->Name = _("Unnamed Group");
1364      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);      if (__sample_indexer) group->Name += " " + ToString(__sample_indexer);
1365      __sample_indexer++;      __sample_indexer++;
1366      // update sample tree view      // update sample tree view
# Line 1131  void MainWindow::on_action_add_sample() Line 1394  void MainWindow::on_action_add_sample()
1394      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1395      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1396      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1397      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile  
1398        // matches all file types supported by libsndfile
1399    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1400        Gtk::FileFilter soundfilter;
1401    #else
1402        Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
1403    #endif
1404      const char* const supportedFileTypes[] = {      const char* const supportedFileTypes[] = {
1405          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1406          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
# Line 1139  void MainWindow::on_action_add_sample() Line 1408  void MainWindow::on_action_add_sample()
1408          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1409          "*.caf", "*.CAF", NULL          "*.caf", "*.CAF", NULL
1410      };      };
1411        const char* soundfiles = _("Sound Files");
1412        const char* allfiles = _("All Files");
1413    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1414      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1415          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1416      soundfilter.set_name("Sound Files");      soundfilter.set_name(soundfiles);
1417      Gtk::FileFilter allpassfilter; // matches every file  
1418        // matches every file
1419        Gtk::FileFilter allpassfilter;
1420      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1421      allpassfilter.set_name("All Files");      allpassfilter.set_name(allfiles);
1422    #else
1423        for (int i = 0; supportedFileTypes[i]; i++)
1424            soundfilter->add_pattern(supportedFileTypes[i]);
1425        soundfilter->set_name(soundfiles);
1426    
1427        // matches every file
1428        Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
1429        allpassfilter->add_pattern("*.*");
1430        allpassfilter->set_name(allfiles);
1431    #endif
1432      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1433      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1434        if (current_sample_dir != "") {
1435            dialog.set_current_folder(current_sample_dir);
1436        }
1437      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1438            current_sample_dir = dialog.get_current_folder();
1439          Glib::ustring error_files;          Glib::ustring error_files;
1440          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
1441          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (std::vector<std::string>::iterator iter = filenames.begin();
1442               iter != filenames.end(); ++iter) {               iter != filenames.end(); ++iter) {
1443              printf("Adding sample %s\n",(*iter).c_str());              printf("Adding sample %s\n",(*iter).c_str());
1444              // use libsndfile to retrieve file informations              // use libsndfile to retrieve file informations
# Line 1158  void MainWindow::on_action_add_sample() Line 1446  void MainWindow::on_action_add_sample()
1446              info.format = 0;              info.format = 0;
1447              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);              SNDFILE* hFile = sf_open((*iter).c_str(), SFM_READ, &info);
1448              try {              try {
1449                  if (!hFile) throw std::string("could not open file");                  if (!hFile) throw std::string(_("could not open file"));
1450                  int bitdepth;                  int bitdepth;
1451                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
1452                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
# Line 1174  void MainWindow::on_action_add_sample() Line 1462  void MainWindow::on_action_add_sample()
1462                          break;                          break;
1463                      default:                      default:
1464                          sf_close(hFile); // close sound file                          sf_close(hFile); // close sound file
1465                          throw std::string("format not supported"); // unsupported subformat (yet?)                          throw std::string(_("format not supported")); // unsupported subformat (yet?)
1466                  }                  }
1467                  // add a new sample to the .gig file                  // add a new sample to the .gig file
1468                  gig::Sample* sample = file->AddSample();                  gig::Sample* sample = file->AddSample();
# Line 1253  void MainWindow::on_action_add_sample() Line 1541  void MainWindow::on_action_add_sample()
1541          }          }
1542          // show error message box when some file(s) could not be opened / added          // show error message box when some file(s) could not be opened / added
1543          if (error_files.size()) {          if (error_files.size()) {
1544              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;
1545                Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1546                msg.run();
1547            }
1548        }
1549    }
1550    
1551    void MainWindow::on_action_replace_all_samples_in_all_groups()
1552    {
1553        if (!file) return;
1554        Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1555                                      Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1556        view::WrapLabel description(
1557            _("This is a very specific function. It tries to replace all samples "
1558              "in the current gig file by samples located in the chosen "
1559              "directory.\n\n"
1560              "It works like this: For each sample in the gig file, it tries to "
1561              "find a sample file in the selected directory with the same name as "
1562              "the sample in the gig file. Optionally, you can add a filename "
1563              "extension below, which will be added to the filename expected to be "
1564              "found. That is, assume you have a gig file with a sample called "
1565              "'Snare', if you enter '.wav' below (like it's done by default), it "
1566              "expects to find a sample file called 'Snare.wav' and will replace "
1567              "the sample in the gig file accordingly. If you don't need an "
1568              "extension, blank the field below. Any gig sample where no "
1569              "appropriate sample file could be found will be reported and left "
1570              "untouched.\n")
1571        );
1572        Gtk::HBox entryArea;
1573        Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1574        Gtk::Entry postfixEntryBox;
1575        postfixEntryBox.set_text(".wav");
1576        entryArea.pack_start(entryLabel);
1577        entryArea.pack_start(postfixEntryBox);
1578        dialog.get_vbox()->pack_start(description, Gtk::PACK_SHRINK);
1579        dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK);
1580        description.show();
1581        entryArea.show_all();
1582        dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1583        dialog.add_button(_("Select"), Gtk::RESPONSE_OK);
1584        dialog.set_select_multiple(false);
1585        if (current_sample_dir != "") {
1586            dialog.set_current_folder(current_sample_dir);
1587        }
1588        if (dialog.run() == Gtk::RESPONSE_OK)
1589        {
1590            current_sample_dir = dialog.get_current_folder();
1591            Glib::ustring error_files;
1592            std::string folder = dialog.get_filename();
1593            for (gig::Sample* sample = file->GetFirstSample();
1594                 sample; sample = file->GetNextSample())
1595            {
1596                std::string filename =
1597                    folder + G_DIR_SEPARATOR_S + sample->pInfo->Name +
1598                    postfixEntryBox.get_text().raw();
1599                SF_INFO info;
1600                info.format = 0;
1601                SNDFILE* hFile = sf_open(filename.c_str(), SFM_READ, &info);
1602                try
1603                {
1604                    if (!hFile) throw std::string(_("could not open file"));
1605                    int bitdepth;
1606                    switch (info.format & 0xff) {
1607                        case SF_FORMAT_PCM_S8:
1608                        case SF_FORMAT_PCM_16:
1609                        case SF_FORMAT_PCM_U8:
1610                            bitdepth = 16;
1611                            break;
1612                        case SF_FORMAT_PCM_24:
1613                        case SF_FORMAT_PCM_32:
1614                        case SF_FORMAT_FLOAT:
1615                        case SF_FORMAT_DOUBLE:
1616                            bitdepth = 24;
1617                            break;
1618                        default:
1619                            sf_close(hFile);
1620                            throw std::string(_("format not supported"));
1621                    }
1622                    SampleImportItem sched_item;
1623                    sched_item.gig_sample  = sample;
1624                    sched_item.sample_path = filename;
1625                    m_SampleImportQueue.push_back(sched_item);
1626                    sf_close(hFile);
1627                    file_changed();
1628                }
1629                catch (std::string what)
1630                {
1631                    if (error_files.size()) error_files += "\n";
1632                        error_files += filename += " (" + what + ")";
1633                }
1634            }
1635            // show error message box when some file(s) could not be opened / added
1636            if (error_files.size()) {
1637                Glib::ustring txt =
1638                    _("Could not replace the following sample(s):\n") + error_files;
1639              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);              Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1640              msg.run();              msg.run();
1641          }          }
# Line 1426  void MainWindow::on_sample_label_drop_dr Line 1808  void MainWindow::on_sample_label_drop_dr
1808          // notify we're done with altering          // notify we're done with altering
1809          region_changed_signal.emit(region);          region_changed_signal.emit(region);
1810    
1811            file_changed();
1812    
1813          return;          return;
1814      }      }
1815      // drop failed      // drop failed
# Line 1466  void MainWindow::instrument_name_changed Line 1850  void MainWindow::instrument_name_changed
1850      }      }
1851  }  }
1852    
1853  sigc::signal<void, gig::File*> MainWindow::signal_file_structure_to_be_changed() {  void MainWindow::set_file_is_shared(bool b) {
1854        this->file_is_shared = b;
1855    
1856        if (file_is_shared) {
1857            m_AttachedStateLabel.set_label(_("live-mode"));
1858            m_AttachedStateImage.set(
1859                Gdk::Pixbuf::create_from_xpm_data(status_attached_xpm)
1860            );
1861        } else {
1862            m_AttachedStateLabel.set_label(_("stand-alone"));
1863            m_AttachedStateImage.set(
1864                Gdk::Pixbuf::create_from_xpm_data(status_detached_xpm)
1865            );
1866        }
1867    }
1868    
1869    sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {
1870      return file_structure_to_be_changed_signal;      return file_structure_to_be_changed_signal;
1871  }  }
1872    
1873  sigc::signal<void, gig::File*> MainWindow::signal_file_structure_changed() {  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_changed() {
1874      return file_structure_changed_signal;      return file_structure_changed_signal;
1875  }  }
1876    
1877  sigc::signal<void, std::list<gig::Sample*> > MainWindow::signal_samples_to_be_removed() {  sigc::signal<void, std::list<gig::Sample*> >& MainWindow::signal_samples_to_be_removed() {
1878      return samples_to_be_removed_signal;      return samples_to_be_removed_signal;
1879  }  }
1880    
1881  sigc::signal<void> MainWindow::signal_samples_removed() {  sigc::signal<void>& MainWindow::signal_samples_removed() {
1882      return samples_removed_signal;      return samples_removed_signal;
1883  }  }
1884    
1885  sigc::signal<void, gig::Region*> MainWindow::signal_region_to_be_changed() {  sigc::signal<void, gig::Region*>& MainWindow::signal_region_to_be_changed() {
1886      return region_to_be_changed_signal;      return region_to_be_changed_signal;
1887  }  }
1888    
1889  sigc::signal<void, gig::Region*> MainWindow::signal_region_changed() {  sigc::signal<void, gig::Region*>& MainWindow::signal_region_changed() {
1890      return region_changed_signal;      return region_changed_signal;
1891  }  }
1892    
1893  sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/> MainWindow::signal_sample_ref_changed() {  sigc::signal<void, gig::Sample*>& MainWindow::signal_sample_changed() {
1894        return sample_changed_signal;
1895    }
1896    
1897    sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& MainWindow::signal_sample_ref_changed() {
1898      return sample_ref_changed_signal;      return sample_ref_changed_signal;
1899  }  }
1900    
1901  sigc::signal<void, gig::DimensionRegion*> MainWindow::signal_dimreg_to_be_changed() {  sigc::signal<void, gig::DimensionRegion*>& MainWindow::signal_dimreg_to_be_changed() {
1902      return dimreg_to_be_changed_signal;      return dimreg_to_be_changed_signal;
1903  }  }
1904    
1905  sigc::signal<void, gig::DimensionRegion*> MainWindow::signal_dimreg_changed() {  sigc::signal<void, gig::DimensionRegion*>& MainWindow::signal_dimreg_changed() {
1906      return dimreg_changed_signal;      return dimreg_changed_signal;
1907  }  }
1908    
1909    sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_note_on() {
1910        return note_on_signal;
1911    }
1912    
1913    sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_note_off() {
1914        return note_off_signal;
1915    }
1916    
1917    sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_keyboard_key_hit() {
1918        return m_RegionChooser.signal_keyboard_key_hit();
1919    }
1920    
1921    sigc::signal<void, int/*key*/, int/*velocity*/>& MainWindow::signal_keyboard_key_released() {
1922        return m_RegionChooser.signal_keyboard_key_released();
1923    }
Legend:
Removed from v.1322  
changed lines
  Added in v.2325
  ViewVC Help
Powered by ViewVC