/[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 2772 by schoenebeck, Thu Jun 11 20:29:22 2015 UTC revision 2841 by persson, Sun Aug 30 10:00:49 2015 UTC
# Line 20  Line 20 
20  #include <iostream>  #include <iostream>
21  #include <cstring>  #include <cstring>
22    
23    #include <glibmmconfig.h>
24    // threads.h must be included first to be able to build with
25    // G_DISABLE_DEPRECATED
26    #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \
27        (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION > 31) || GLIBMM_MAJOR_VERSION > 2
28    #include <glibmm/threads.h>
29    #endif
30    
31  #include <glibmm/convert.h>  #include <glibmm/convert.h>
32  #include <glibmm/dispatcher.h>  #include <glibmm/dispatcher.h>
33  #include <glibmm/miscutils.h>  #include <glibmm/miscutils.h>
# Line 229  MainWindow::MainWindow() : Line 237  MainWindow::MainWindow() :
237          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)
238      );      );
239    
240        toggle_action =
241            Gtk::ToggleAction::create("MoveRootNoteWithRegionMoved", _("Move root note with region moved"));
242        toggle_action->set_active(Settings::singleton()->moveRootNoteWithRegionMoved);
243        actionGroup->add(
244            toggle_action,
245            sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved)
246        );
247    
248    
249      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
250    
# Line 362  MainWindow::MainWindow() : Line 378  MainWindow::MainWindow() :
378          "    <menu action='MenuSettings'>"          "    <menu action='MenuSettings'>"
379          "      <menuitem action='WarnUserOnExtensions'/>"          "      <menuitem action='WarnUserOnExtensions'/>"
380          "      <menuitem action='SyncSamplerInstrumentSelection'/>"          "      <menuitem action='SyncSamplerInstrumentSelection'/>"
381            "      <menuitem action='MoveRootNoteWithRegionMoved'/>"
382          "    </menu>"          "    </menu>"
383          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
384          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
# Line 430  MainWindow::MainWindow() : Line 447  MainWindow::MainWindow() :
447      }      }
448      {      {
449          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
450                uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
451            item->set_tooltip_text(_("If checked, and when a region is moved by dragging it around on the virtual keyboard, the keybord position dependent pitch will move exactly with the amount of semi tones the region was moved around."));
452        }
453        {
454            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
455              uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));              uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));
456          item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));          item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));
457          // copy tooltip to popup menu          // copy tooltip to popup menu
# Line 591  MainWindow::MainWindow() : Line 613  MainWindow::MainWindow() :
613          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));
614      m_RegionChooser.signal_instrument_changed().connect(      m_RegionChooser.signal_instrument_changed().connect(
615          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
616        m_RegionChooser.signal_instrument_changed().connect(
617            sigc::mem_fun(*this, &MainWindow::region_changed));
618      m_DimRegionChooser.signal_region_changed().connect(      m_DimRegionChooser.signal_region_changed().connect(
619          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
620      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
# Line 780  void Loader::progress_callback(float fra Line 804  void Loader::progress_callback(float fra
804    
805  void Loader::thread_function()  void Loader::thread_function()
806  {  {
807      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
808               static_cast<void*>(Glib::Threads::Thread::self()));
809      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
810      try {      try {
811          RIFF::File* riff = new RIFF::File(filename);          RIFF::File* riff = new RIFF::File(filename);
# Line 802  void Loader::thread_function() Line 827  void Loader::thread_function()
827  }  }
828    
829  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
830      : filename(filename), thread(0), progress(0.f)      : filename(filename), gig(0), thread(0), progress(0.f)
831  {  {
832  }  }
833    
# Line 813  void Loader::launch() Line 838  void Loader::launch()
838  #else  #else
839      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
840  #endif  #endif
841      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
842  }  }
843    
844  float Loader::get_progress()  float Loader::get_progress()
# Line 858  void Saver::progress_callback(float frac Line 883  void Saver::progress_callback(float frac
883    
884  void Saver::thread_function()  void Saver::thread_function()
885  {  {
886      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
887               static_cast<void*>(Glib::Threads::Thread::self()));
888      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
889      try {      try {
890          gig::progress_t progress;          gig::progress_t progress;
# Line 895  void Saver::launch() Line 921  void Saver::launch()
921  #else  #else
922      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));
923  #endif  #endif
924      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
925  }  }
926    
927  float Saver::get_progress()  float Saver::get_progress()
# Line 1055  void MainWindow::on_action_file_open() Line 1081  void MainWindow::on_action_file_open()
1081      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1082          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
1083          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
1084          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());          printf("on_action_file_open self=%p\n",
1085                   static_cast<void*>(Glib::Threads::Thread::self()));
1086          load_file(filename.c_str());          load_file(filename.c_str());
1087          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
1088      }      }
# Line 1125  void MainWindow::on_loader_progress() Line 1152  void MainWindow::on_loader_progress()
1152  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
1153  {  {
1154      printf("Loader finished!\n");      printf("Loader finished!\n");
1155      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());      printf("on_loader_finished self=%p\n",
1156               static_cast<void*>(Glib::Threads::Thread::self()));
1157      load_gig(loader->gig, loader->filename.c_str());      load_gig(loader->gig, loader->filename.c_str());
1158      progress_dialog->hide();      progress_dialog->hide();
1159  }  }
# Line 1317  bool MainWindow::file_save_as() Line 1345  bool MainWindow::file_save_as()
1345  void MainWindow::__import_queued_samples() {  void MainWindow::__import_queued_samples() {
1346      std::cout << "Starting sample import\n" << std::flush;      std::cout << "Starting sample import\n" << std::flush;
1347      Glib::ustring error_files;      Glib::ustring error_files;
1348      printf("Samples to import: %d\n", m_SampleImportQueue.size());      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));
1349      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
1350           iter != m_SampleImportQueue.end(); ) {           iter != m_SampleImportQueue.end(); ) {
1351          printf("Importing sample %s\n",(*iter).sample_path.c_str());          printf("Importing sample %s\n",(*iter).sample_path.c_str());
# Line 1423  void MainWindow::on_action_sync_sampler_ Line 1451  void MainWindow::on_action_sync_sampler_
1451          !Settings::singleton()->syncSamplerInstrumentSelection;          !Settings::singleton()->syncSamplerInstrumentSelection;
1452  }  }
1453    
1454    void MainWindow::on_action_move_root_note_with_region_moved() {
1455        Settings::singleton()->moveRootNoteWithRegionMoved =
1456            !Settings::singleton()->moveRootNoteWithRegionMoved;
1457    }
1458    
1459  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
1460  {  {
1461      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
# Line 2630  void MainWindow::on_action_replace_all_s Line 2663  void MainWindow::on_action_replace_all_s
2663              try              try
2664              {              {
2665                  if (!hFile) throw std::string(_("could not open file"));                  if (!hFile) throw std::string(_("could not open file"));
                 int bitdepth;  
2666                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
2667                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
2668                      case SF_FORMAT_PCM_16:                      case SF_FORMAT_PCM_16:
2669                      case SF_FORMAT_PCM_U8:                      case SF_FORMAT_PCM_U8:
                         bitdepth = 16;  
                         break;  
2670                      case SF_FORMAT_PCM_24:                      case SF_FORMAT_PCM_24:
2671                      case SF_FORMAT_PCM_32:                      case SF_FORMAT_PCM_32:
2672                      case SF_FORMAT_FLOAT:                      case SF_FORMAT_FLOAT:
2673                      case SF_FORMAT_DOUBLE:                      case SF_FORMAT_DOUBLE:
                         bitdepth = 24;  
2674                          break;                          break;
2675                      default:                      default:
2676                          sf_close(hFile);                          sf_close(hFile);
# Line 3272  void MainWindow::on_action_merge_files() Line 3301  void MainWindow::on_action_merge_files()
3301      descriptionArea.show_all();      descriptionArea.show_all();
3302    
3303      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
3304          printf("on_action_merge_files self=%x\n", Glib::Threads::Thread::self());          printf("on_action_merge_files self=%p\n",
3305                   static_cast<void*>(Glib::Threads::Thread::self()));
3306          std::vector<std::string> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
3307    
3308          // merge the selected files to the currently open .gig file          // merge the selected files to the currently open .gig file
Legend:
Removed from v.2772  
changed lines
  Added in v.2841
  ViewVC Help
Powered by ViewVC