/[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 1959 by persson, Fri Jul 31 10:15:27 2009 UTC revision 2398 by persson, Sun Jan 13 09:14:29 2013 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2009 Andreas Persson   * Copyright (C) 2006-2013 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 20  Line 20 
20  #include <iostream>  #include <iostream>
21  #include <cstring>  #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>  #include <gtkmm/toggleaction.h>
35    #if GTKMM_MAJOR_VERSION < 3
36  #include "wrapLabel.hh"  #include "wrapLabel.hh"
   
 #include "global.h"  
   
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
 #define ABOUT_DIALOG  
 #include <gtkmm/aboutdialog.h>  
37  #endif  #endif
38    
39  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION < 6) || GLIBMM_MAJOR_VERSION < 2  #include "global.h"
40  namespace Glib {  #include "compat.h"
 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  
41    
42  #include <stdio.h>  #include <stdio.h>
43  #include <sndfile.h>  #include <sndfile.h>
# Line 179  MainWindow::MainWindow() : Line 171  MainWindow::MainWindow() :
171      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);      action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP);
172      actionGroup->add(Gtk::Action::create("MenuHelp",      actionGroup->add(Gtk::Action::create("MenuHelp",
173                                           action->property_label()));                                           action->property_label()));
 #ifdef ABOUT_DIALOG  
174      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),      actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT),
175                       sigc::mem_fun(                       sigc::mem_fun(
176                           *this, &MainWindow::on_action_help_about));                           *this, &MainWindow::on_action_help_about));
 #endif  
177      actionGroup->add(      actionGroup->add(
178          Gtk::Action::create("AddInstrument", _("Add _Instrument")),          Gtk::Action::create("AddInstrument", _("Add _Instrument")),
179          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_add_instrument)
180      );      );
181      actionGroup->add(      actionGroup->add(
182            Gtk::Action::create("DupInstrument", _("_Duplicate Instrument")),
183            sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
184        );
185        actionGroup->add(
186          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),          Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE),
187          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument)
188      );      );
# Line 239  MainWindow::MainWindow() : Line 233  MainWindow::MainWindow() :
233          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
234          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
235          "    </menu>"          "    </menu>"
 #ifdef ABOUT_DIALOG  
236          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
237          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
238          "    </menu>"          "    </menu>"
 #endif  
239          "  </menubar>"          "  </menubar>"
240          "  <popup name='PopupMenu'>"          "  <popup name='PopupMenu'>"
241          "    <menuitem action='InstrProperties'/>"          "    <menuitem action='InstrProperties'/>"
242          "    <menuitem action='AddInstrument'/>"          "    <menuitem action='AddInstrument'/>"
243            "    <menuitem action='DupInstrument'/>"
244          "    <separator/>"          "    <separator/>"
245          "    <menuitem action='RemoveInstrument'/>"          "    <menuitem action='RemoveInstrument'/>"
246          "  </popup>"          "  </popup>"
# Line 272  MainWindow::MainWindow() : Line 265  MainWindow::MainWindow() :
265      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_DimRegionChooser, Gtk::PACK_SHRINK);
266      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);      m_VBox.pack_start(m_StatusBar, Gtk::PACK_SHRINK);
267    
268        set_file_is_shared(false);
269    
270      // Status Bar:      // Status Bar:
271      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateLabel, Gtk::PACK_SHRINK);
272      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);      m_StatusBar.pack_start(m_AttachedStateImage, Gtk::PACK_SHRINK);
# Line 308  MainWindow::MainWindow() : Line 303  MainWindow::MainWindow() :
303      );      );
304    
305      // 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
306      std::list<Gtk::TargetEntry> drag_target_gig_sample;      std::vector<Gtk::TargetEntry> drag_target_gig_sample;
307      drag_target_gig_sample.push_back( Gtk::TargetEntry("gig::Sample") );      drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
308      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);      m_TreeViewSamples.drag_source_set(drag_target_gig_sample);
309      m_TreeViewSamples.signal_drag_begin().connect(      m_TreeViewSamples.signal_drag_begin().connect(
310          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)          sigc::mem_fun(*this, &MainWindow::on_sample_treeview_drag_begin)
# Line 374  MainWindow::MainWindow() : Line 369  MainWindow::MainWindow() :
369    
370      file = 0;      file = 0;
371      file_is_changed = false;      file_is_changed = false;
     set_file_is_shared(false);  
372    
373      show_all_children();      show_all_children();
374    
# Line 478  void loader_progress_callback(gig::progr Line 472  void loader_progress_callback(gig::progr
472  void Loader::progress_callback(float fraction)  void Loader::progress_callback(float fraction)
473  {  {
474      {      {
475          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
476          progress = fraction;          progress = fraction;
477      }      }
478      progress_dispatcher();      progress_dispatcher();
# Line 486  void Loader::progress_callback(float fra Line 480  void Loader::progress_callback(float fra
480    
481  void Loader::thread_function()  void Loader::thread_function()
482  {  {
483      printf("thread_function self=%x\n", Glib::Thread::self());      printf("thread_function self=%x\n", Glib::Threads::Thread::self());
484      printf("Start %s\n", filename);      printf("Start %s\n", filename);
485      RIFF::File* riff = new RIFF::File(filename);      RIFF::File* riff = new RIFF::File(filename);
486      gig = new gig::File(riff);      gig = new gig::File(riff);
# Line 500  void Loader::thread_function() Line 494  void Loader::thread_function()
494  }  }
495    
496  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
497      : thread(0), filename(filename)      : filename(filename), thread(0)
498  {  {
499  }  }
500    
501  void Loader::launch()  void Loader::launch()
502  {  {
503    #ifdef OLD_THREADS
504      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);      thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
505    #else
506        thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
507    #endif
508      printf("launch thread=%x\n", thread);      printf("launch thread=%x\n", thread);
509  }  }
510    
# Line 514  float Loader::get_progress() Line 512  float Loader::get_progress()
512  {  {
513      float res;      float res;
514      {      {
515          Glib::Mutex::Lock lock(progressMutex);          Glib::Threads::Mutex::Lock lock(progressMutex);
516          res = progress;          res = progress;
517      }      }
518      return res;      return res;
# Line 544  void MainWindow::__clear() { Line 542  void MainWindow::__clear() {
542      Gtk::MenuItem* instrument_menu =      Gtk::MenuItem* instrument_menu =
543          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuInstrument"));
544      instrument_menu->hide();      instrument_menu->hide();
545      for (int i = 0; i < instrument_menu->get_submenu()->items().size(); i++) {      Gtk::Menu* menu = instrument_menu->get_submenu();
546          delete &instrument_menu->get_submenu()->items()[i];      while (menu->get_children().size()) {
547            Gtk::Widget* child = *menu->get_children().begin();
548            menu->remove(*child);
549            delete child;
550      }      }
     instrument_menu->get_submenu()->items().clear();  
551      // forget all samples that ought to be imported      // forget all samples that ought to be imported
552      m_SampleImportQueue.clear();      m_SampleImportQueue.clear();
553      // clear the samples and instruments tree views      // clear the samples and instruments tree views
# Line 582  bool MainWindow::close_confirmation_dial Line 582  bool MainWindow::close_confirmation_dial
582                                   Glib::filename_display_basename(filename).c_str());                                   Glib::filename_display_basename(filename).c_str());
583      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
584      g_free(msg);      g_free(msg);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
585      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  
586      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);      dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO);
587      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
588      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 598  bool MainWindow::close_confirmation_dial Line 596  bool MainWindow::close_confirmation_dial
596  bool MainWindow::leaving_shared_mode_dialog() {  bool MainWindow::leaving_shared_mode_dialog() {
597      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");      Glib::ustring msg = _("Detach from sampler and proceed working stand-alone?");
598      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);      Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
 #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 6) || GTKMM_MAJOR_VERSION > 2  
599      dialog.set_secondary_text(      dialog.set_secondary_text(
600          _("If you proceed to work on another instrument file, it won't be "          _("If you proceed to work on another instrument file, it won't be "
601            "used by the sampler until you tell the sampler explicitly to "            "used by the sampler until you tell the sampler explicitly to "
602            "load it.")            "load it."));
    );  
 #endif  
603      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);      dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES);
604      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
605      dialog.set_default_response(Gtk::RESPONSE_CANCEL);      dialog.set_default_response(Gtk::RESPONSE_CANCEL);
# Line 623  void MainWindow::on_action_file_open() Line 618  void MainWindow::on_action_file_open()
618      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
619      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
620      dialog.set_default_response(Gtk::RESPONSE_OK);      dialog.set_default_response(Gtk::RESPONSE_OK);
621    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
622      Gtk::FileFilter filter;      Gtk::FileFilter filter;
623      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
624    #else
625        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
626        filter->add_pattern("*.gig");
627    #endif
628      dialog.set_filter(filter);      dialog.set_filter(filter);
629      if (current_gig_dir != "") {      if (current_gig_dir != "") {
630          dialog.set_current_folder(current_gig_dir);          dialog.set_current_folder(current_gig_dir);
# Line 632  void MainWindow::on_action_file_open() Line 632  void MainWindow::on_action_file_open()
632      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
633          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
634          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
635          printf("on_action_file_open self=%x\n", Glib::Thread::self());          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
636          load_file(filename.c_str());          load_file(filename.c_str());
637          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
638      }      }
# Line 674  void MainWindow::on_loader_progress() Line 674  void MainWindow::on_loader_progress()
674  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
675  {  {
676      printf("Loader finished!\n");      printf("Loader finished!\n");
677      printf("on_loader_finished self=%x\n", Glib::Thread::self());      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
678      load_gig(loader->gig, loader->filename);      load_gig(loader->gig, loader->filename);
679      load_dialog->hide();      load_dialog->hide();
680  }  }
# Line 746  bool MainWindow::file_save_as() Line 746  bool MainWindow::file_save_as()
746      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
747      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
748      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  
749      dialog.set_do_overwrite_confirmation();      dialog.set_do_overwrite_confirmation();
750      // TODO: an overwrite dialog for gtkmm < 2.8  
751  #endif  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
752      Gtk::FileFilter filter;      Gtk::FileFilter filter;
753      filter.add_pattern("*.gig");      filter.add_pattern("*.gig");
754    #else
755        Glib::RefPtr<Gtk::FileFilter> filter = Gtk::FileFilter::create();
756        filter->add_pattern("*.gig");
757    #endif
758      dialog.set_filter(filter);      dialog.set_filter(filter);
759    
760      // set initial dir and filename of the Save As dialog      // set initial dir and filename of the Save As dialog
# Line 775  bool MainWindow::file_save_as() Line 777  bool MainWindow::file_save_as()
777      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
778      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
779      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
780    #if GTKMM_MAJOR_VERSION < 3
781      view::WrapLabel description;      view::WrapLabel description;
782    #else
783        Gtk::Label description;
784        description.set_line_wrap();
785    #endif
786      description.set_markup(      description.set_markup(
787          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "          _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
788            "<span style=\"italic\">\"Save\"</span> dialog instead of "            "<span style=\"italic\">\"Save\"</span> dialog instead of "
# Line 827  void MainWindow::__import_queued_samples Line 834  void MainWindow::__import_queued_samples
834          SF_INFO info;          SF_INFO info;
835          info.format = 0;          info.format = 0;
836          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);
837            sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);
838          try {          try {
839              if (!hFile) throw std::string(_("could not open file"));              if (!hFile) throw std::string(_("could not open file"));
840              // determine sample's bit depth              // determine sample's bit depth
# Line 917  void MainWindow::on_action_file_properti Line 925  void MainWindow::on_action_file_properti
925    
926  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
927  {  {
 #ifdef ABOUT_DIALOG  
928      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
929  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2  #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 12) || GTKMM_MAJOR_VERSION > 2
930      dialog.set_program_name("Gigedit");      dialog.set_program_name("Gigedit");
# Line 925  void MainWindow::on_action_help_about() Line 932  void MainWindow::on_action_help_about()
932      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
933  #endif  #endif
934      dialog.set_version(VERSION);      dialog.set_version(VERSION);
935      dialog.set_copyright("Copyright (C) 2006-2009 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson");
936      dialog.set_comments(_(      dialog.set_comments(_(
937          "Released under the GNU General Public License.\n"          "Released under the GNU General Public License.\n"
938          "\n"          "\n"
# Line 938  void MainWindow::on_action_help_about() Line 945  void MainWindow::on_action_help_about()
945      dialog.set_website("http://www.linuxsampler.org");      dialog.set_website("http://www.linuxsampler.org");
946      dialog.set_website_label("http://www.linuxsampler.org");      dialog.set_website_label("http://www.linuxsampler.org");
947      dialog.run();      dialog.run();
 #endif  
948  }  }
949    
950  PropDialog::PropDialog()  PropDialog::PropDialog()
951      : table(2,1),      : eName(_("Name")),
       eName(_("Name")),  
952        eCreationDate(_("Creation date")),        eCreationDate(_("Creation date")),
953        eComments(_("Comments")),        eComments(_("Comments")),
954        eProduct(_("Product")),        eProduct(_("Product")),
# Line 960  PropDialog::PropDialog() Line 965  PropDialog::PropDialog()
965        eCommissioned(_("Commissioned")),        eCommissioned(_("Commissioned")),
966        eSubject(_("Subject")),        eSubject(_("Subject")),
967        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
968          table(2, 1),
969        update_model(0)        update_model(0)
970  {  {
971      set_title(_("File Properties"));      set_title(_("File Properties"));
# Line 1008  PropDialog::PropDialog() Line 1014  PropDialog::PropDialog()
1014      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1015      buttonBox.show();      buttonBox.show();
1016      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1017      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1018      quitButton.grab_focus();      quitButton.grab_focus();
1019      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
1020          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &PropDialog::hide));
# Line 1078  void InstrumentProps::set_DimensionKeyRa Line 1084  void InstrumentProps::set_DimensionKeyRa
1084  }  }
1085    
1086  InstrumentProps::InstrumentProps()  InstrumentProps::InstrumentProps()
1087      : table(2,1),      : update_model(0),
1088        quitButton(Gtk::Stock::CLOSE),        quitButton(Gtk::Stock::CLOSE),
1089          table(2,1),
1090        eName(_("Name")),        eName(_("Name")),
1091        eIsDrum(_("Is drum")),        eIsDrum(_("Is drum")),
1092        eMIDIBank(_("MIDI bank"), 0, 16383),        eMIDIBank(_("MIDI bank"), 0, 16383),
# Line 1091  InstrumentProps::InstrumentProps() Line 1098  InstrumentProps::InstrumentProps()
1098        ePitchbendRange(_("Pitchbend range"), 0, 12),        ePitchbendRange(_("Pitchbend range"), 0, 12),
1099        ePianoReleaseMode(_("Piano release mode")),        ePianoReleaseMode(_("Piano release mode")),
1100        eDimensionKeyRangeLow(_("Keyswitching range low")),        eDimensionKeyRangeLow(_("Keyswitching range low")),
1101        eDimensionKeyRangeHigh(_("Keyswitching range high")),        eDimensionKeyRangeHigh(_("Keyswitching range high"))
       update_model(0)  
1102  {  {
1103      set_title(_("Instrument Properties"));      set_title(_("Instrument Properties"));
1104    
# Line 1143  InstrumentProps::InstrumentProps() Line 1149  InstrumentProps::InstrumentProps()
1149      buttonBox.set_border_width(5);      buttonBox.set_border_width(5);
1150      buttonBox.show();      buttonBox.show();
1151      buttonBox.pack_start(quitButton);      buttonBox.pack_start(quitButton);
1152      quitButton.set_flags(Gtk::CAN_DEFAULT);      quitButton.set_can_default();
1153      quitButton.grab_focus();      quitButton.grab_focus();
1154    
1155      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
# Line 1328  void MainWindow::on_action_add_instrumen Line 1334  void MainWindow::on_action_add_instrumen
1334      file_changed();      file_changed();
1335  }  }
1336    
1337    void MainWindow::on_action_duplicate_instrument() {
1338        if (!file) return;
1339        
1340        // retrieve the currently selected instrument
1341        // (being the original instrument to be duplicated)
1342        Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
1343        Gtk::TreeModel::iterator itSelection = sel->get_selected();
1344        if (!itSelection) return;
1345        Gtk::TreeModel::Row row = *itSelection;
1346        gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
1347        if (!instrOrig) return;
1348        
1349        // duplicate the orginal instrument
1350        gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
1351        instrNew->pInfo->Name =
1352            instrOrig->pInfo->Name + " (" + _("Copy") + ")";
1353            
1354        // update instrument tree view
1355        Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
1356        Gtk::TreeModel::Row rowInstr = *iterInstr;
1357        rowInstr[m_Columns.m_col_name] = instrNew->pInfo->Name.c_str();
1358        rowInstr[m_Columns.m_col_instr] = instrNew;
1359        file_changed();
1360    }
1361    
1362  void MainWindow::on_action_remove_instrument() {  void MainWindow::on_action_remove_instrument() {
1363      if (!file) return;      if (!file) return;
1364      if (file_is_shared) {      if (file_is_shared) {
# Line 1405  void MainWindow::on_action_add_sample() Line 1436  void MainWindow::on_action_add_sample()
1436      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1437      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1438      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1439      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile  
1440        // matches all file types supported by libsndfile
1441    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1442        Gtk::FileFilter soundfilter;
1443    #else
1444        Glib::RefPtr<Gtk::FileFilter> soundfilter = Gtk::FileFilter::create();
1445    #endif
1446      const char* const supportedFileTypes[] = {      const char* const supportedFileTypes[] = {
1447          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",          "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1448          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",          "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
# Line 1413  void MainWindow::on_action_add_sample() Line 1450  void MainWindow::on_action_add_sample()
1450          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",          "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1451          "*.caf", "*.CAF", NULL          "*.caf", "*.CAF", NULL
1452      };      };
1453        const char* soundfiles = _("Sound Files");
1454        const char* allfiles = _("All Files");
1455    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
1456      for (int i = 0; supportedFileTypes[i]; i++)      for (int i = 0; supportedFileTypes[i]; i++)
1457          soundfilter.add_pattern(supportedFileTypes[i]);          soundfilter.add_pattern(supportedFileTypes[i]);
1458      soundfilter.set_name(_("Sound Files"));      soundfilter.set_name(soundfiles);
1459      Gtk::FileFilter allpassfilter; // matches every file  
1460        // matches every file
1461        Gtk::FileFilter allpassfilter;
1462      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
1463      allpassfilter.set_name(_("All Files"));      allpassfilter.set_name(allfiles);
1464    #else
1465        for (int i = 0; supportedFileTypes[i]; i++)
1466            soundfilter->add_pattern(supportedFileTypes[i]);
1467        soundfilter->set_name(soundfiles);
1468    
1469        // matches every file
1470        Glib::RefPtr<Gtk::FileFilter> allpassfilter = Gtk::FileFilter::create();
1471        allpassfilter->add_pattern("*.*");
1472        allpassfilter->set_name(allfiles);
1473    #endif
1474      dialog.add_filter(soundfilter);      dialog.add_filter(soundfilter);
1475      dialog.add_filter(allpassfilter);      dialog.add_filter(allpassfilter);
1476      if (current_sample_dir != "") {      if (current_sample_dir != "") {
# Line 1427  void MainWindow::on_action_add_sample() Line 1479  void MainWindow::on_action_add_sample()
1479      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1480          current_sample_dir = dialog.get_current_folder();          current_sample_dir = dialog.get_current_folder();
1481          Glib::ustring error_files;          Glib::ustring error_files;
1482          Glib::SListHandle<Glib::ustring> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
1483          for (Glib::SListHandle<Glib::ustring>::iterator iter = filenames.begin();          for (std::vector<std::string>::iterator iter = filenames.begin();
1484               iter != filenames.end(); ++iter) {               iter != filenames.end(); ++iter) {
1485              printf("Adding sample %s\n",(*iter).c_str());              printf("Adding sample %s\n",(*iter).c_str());
1486              // use libsndfile to retrieve file informations              // use libsndfile to retrieve file informations
# Line 1480  void MainWindow::on_action_add_sample() Line 1532  void MainWindow::on_action_add_sample()
1532                  {                  {
1533                      sample->MIDIUnityNote = instrument.basenote;                      sample->MIDIUnityNote = instrument.basenote;
1534    
 #if HAVE_SF_INSTRUMENT_LOOPS  
1535                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {                      if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) {
1536                          sample->Loops = 1;                          sample->Loops = 1;
1537    
# Line 1500  void MainWindow::on_action_add_sample() Line 1551  void MainWindow::on_action_add_sample()
1551                          sample->LoopPlayCount = instrument.loops[0].count;                          sample->LoopPlayCount = instrument.loops[0].count;
1552                          sample->LoopSize = sample->LoopEnd - sample->LoopStart + 1;                          sample->LoopSize = sample->LoopEnd - sample->LoopStart + 1;
1553                      }                      }
 #endif  
1554                  }                  }
1555    
1556                  // schedule resizing the sample (which will be done                  // schedule resizing the sample (which will be done
# Line 1543  void MainWindow::on_action_replace_all_s Line 1593  void MainWindow::on_action_replace_all_s
1593      if (!file) return;      if (!file) return;
1594      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),      Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
1595                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);                                    Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
1596      view::WrapLabel description(      const char* str =
1597          _("This is a very specific function. It tries to replace all samples "          _("This is a very specific function. It tries to replace all samples "
1598            "in the current gig file by samples located in the chosen "            "in the current gig file by samples located in the chosen "
1599            "directory.\n\n"            "directory.\n\n"
# Line 1557  void MainWindow::on_action_replace_all_s Line 1607  void MainWindow::on_action_replace_all_s
1607            "the sample in the gig file accordingly. If you don't need an "            "the sample in the gig file accordingly. If you don't need an "
1608            "extension, blank the field below. Any gig sample where no "            "extension, blank the field below. Any gig sample where no "
1609            "appropriate sample file could be found will be reported and left "            "appropriate sample file could be found will be reported and left "
1610            "untouched.\n")            "untouched.\n");
1611      );  #if GTKMM_MAJOR_VERSION < 3
1612        view::WrapLabel description(str);
1613    #else
1614        Gtk::Label description(str);
1615        description.set_line_wrap();
1616    #endif
1617      Gtk::HBox entryArea;      Gtk::HBox entryArea;
1618      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_RIGHT);      Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
1619      Gtk::Entry postfixEntryBox;      Gtk::Entry postfixEntryBox;
1620      postfixEntryBox.set_text(".wav");      postfixEntryBox.set_text(".wav");
1621      entryArea.pack_start(entryLabel);      entryArea.pack_start(entryLabel);
# Line 1579  void MainWindow::on_action_replace_all_s Line 1634  void MainWindow::on_action_replace_all_s
1634      {      {
1635          current_sample_dir = dialog.get_current_folder();          current_sample_dir = dialog.get_current_folder();
1636          Glib::ustring error_files;          Glib::ustring error_files;
1637          Glib::ustring folder = dialog.get_filename();          std::string folder = dialog.get_filename();
1638          for (gig::Sample* sample = file->GetFirstSample();          for (gig::Sample* sample = file->GetFirstSample();
1639               sample; sample = file->GetNextSample())               sample; sample = file->GetNextSample())
1640          {          {
Legend:
Removed from v.1959  
changed lines
  Added in v.2398
  ViewVC Help
Powered by ViewVC