/[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 3021 by persson, Sun Oct 23 07:24:40 2016 UTC revision 3123 by schoenebeck, Tue Apr 25 20:45:54 2017 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2016 Andreas Persson   * Copyright (C) 2006-2017 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 57  Line 57 
57  #include "ReferencesView.h"  #include "ReferencesView.h"
58  #include "../../gfx/status_attached.xpm"  #include "../../gfx/status_attached.xpm"
59  #include "../../gfx/status_detached.xpm"  #include "../../gfx/status_detached.xpm"
60    #include "gfx/builtinpix.h"
61    
62  MainWindow::MainWindow() :  MainWindow::MainWindow() :
63      m_DimRegionChooser(*this),      m_DimRegionChooser(*this),
64      dimreg_label(_("Changes apply to:")),      dimreg_label(_("Changes apply to:")),
65      dimreg_all_regions(_("all regions")),      dimreg_all_regions(_("all regions")),
66      dimreg_all_dimregs(_("all dimension splits")),      dimreg_all_dimregs(_("all dimension splits")),
67      dimreg_stereo(_("both channels"))      dimreg_stereo(_("both channels")),
68        labelLegend(_("Legend:")),
69        labelNoSample(_(" No Sample")),
70        labelMissingSample(_(" Missing some Sample(s)")),
71        labelLooped(_(" Looped")),
72        labelSomeLoops(_(" Some Loop(s)"))
73  {  {
74        loadBuiltInPix();
75    
76  //    set_border_width(5);  //    set_border_width(5);
77  //    set_default_size(400, 200);  //    set_default_size(400, 200);
78    
   
79      add(m_VBox);      add(m_VBox);
80    
81      // Handle selection      // Handle selection
# Line 103  MainWindow::MainWindow() : Line 109  MainWindow::MainWindow() :
109      dimreg_hbox.add(dimreg_stereo);      dimreg_hbox.add(dimreg_stereo);
110      dimreg_vbox.add(dimreg_edit);      dimreg_vbox.add(dimreg_edit);
111      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);
112        {
113            legend_hbox.add(labelLegend);
114    
115            imageNoSample.set(redDot);
116            imageNoSample.set_alignment(Gtk::ALIGN_END);
117            labelNoSample.set_alignment(Gtk::ALIGN_START);
118            legend_hbox.add(imageNoSample);
119            legend_hbox.add(labelNoSample);
120    
121            imageMissingSample.set(yellowDot);
122            imageMissingSample.set_alignment(Gtk::ALIGN_END);
123            labelMissingSample.set_alignment(Gtk::ALIGN_START);
124            legend_hbox.add(imageMissingSample);
125            legend_hbox.add(labelMissingSample);
126    
127            imageLooped.set(blackLoop);
128            imageLooped.set_alignment(Gtk::ALIGN_END);
129            labelLooped.set_alignment(Gtk::ALIGN_START);
130            legend_hbox.add(imageLooped);
131            legend_hbox.add(labelLooped);
132    
133            imageSomeLoops.set(grayLoop);
134            imageSomeLoops.set_alignment(Gtk::ALIGN_END);
135            labelSomeLoops.set_alignment(Gtk::ALIGN_START);
136            legend_hbox.add(imageSomeLoops);
137            legend_hbox.add(labelSomeLoops);
138    
139            legend_hbox.show_all_children();
140        }
141        dimreg_vbox.pack_start(legend_hbox, Gtk::PACK_SHRINK);
142      m_HPaned.add2(dimreg_vbox);      m_HPaned.add2(dimreg_vbox);
143    
144      dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right."));      dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right."));
# Line 169  MainWindow::MainWindow() : Line 205  MainWindow::MainWindow() :
205    
206      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
207    
208        const Gdk::ModifierType primaryModifierKey =
209    #if defined(__APPLE__)
210        Gdk::META_MASK; // Cmd key on Mac
211    #else
212        Gdk::CONTROL_MASK; // Ctrl key on all other OSs
213    #endif
214    
215        actionGroup->add(Gtk::Action::create("SelectPrevRegion",
216                                             _("Select Previous Region")),
217                         Gtk::AccelKey(GDK_KEY_Left, primaryModifierKey),
218                         sigc::mem_fun(*this, &MainWindow::select_prev_region));
219    
220        actionGroup->add(Gtk::Action::create("SelectNextRegion",
221                                             _("Select Next Region")),
222                         Gtk::AccelKey(GDK_KEY_Right, primaryModifierKey),
223                         sigc::mem_fun(*this, &MainWindow::select_next_region));
224    
225        actionGroup->add(Gtk::Action::create("SelectPrevDimRgnZone",
226                                             _("Select Previous Dimension Region Zone")),
227                         Gtk::AccelKey(GDK_KEY_Left, Gdk::MOD1_MASK),
228                         sigc::mem_fun(*this, &MainWindow::select_prev_dim_rgn_zone));
229    
230        actionGroup->add(Gtk::Action::create("SelectNextDimRgnZone",
231                                             _("Select Next Dimension Region Zone")),
232                         Gtk::AccelKey(GDK_KEY_Right, Gdk::MOD1_MASK),
233                         sigc::mem_fun(*this, &MainWindow::select_next_dim_rgn_zone));
234    
235        actionGroup->add(Gtk::Action::create("SelectPrevDimension",
236                                             _("Select Previous Dimension")),
237                         Gtk::AccelKey(GDK_KEY_Up, Gdk::MOD1_MASK),
238                         sigc::mem_fun(*this, &MainWindow::select_prev_dimension));
239    
240        actionGroup->add(Gtk::Action::create("SelectNextDimension",
241                                             _("Select Next Dimension")),
242                         Gtk::AccelKey(GDK_KEY_Down, Gdk::MOD1_MASK),
243                         sigc::mem_fun(*this, &MainWindow::select_next_dimension));
244    
245    
246      Glib::RefPtr<Gtk::ToggleAction> toggle_action =      Glib::RefPtr<Gtk::ToggleAction> toggle_action =
247          Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));          Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));
248      toggle_action->set_active(true);      toggle_action->set_active(true);
# Line 343  MainWindow::MainWindow() : Line 417  MainWindow::MainWindow() :
417          "      <menuitem action='Quit'/>"          "      <menuitem action='Quit'/>"
418          "    </menu>"          "    </menu>"
419          "    <menu action='MenuEdit'>"          "    <menu action='MenuEdit'>"
420            "      <menuitem action='SelectPrevRegion'/>"
421            "      <menuitem action='SelectNextRegion'/>"
422            "      <separator/>"
423            "      <menuitem action='SelectPrevDimRgnZone'/>"
424            "      <menuitem action='SelectNextDimRgnZone'/>"
425            "      <menuitem action='SelectPrevDimension'/>"
426            "      <menuitem action='SelectNextDimension'/>"
427            "      <separator/>"
428          "      <menuitem action='CopySampleUnity'/>"          "      <menuitem action='CopySampleUnity'/>"
429          "      <menuitem action='CopySampleTune'/>"          "      <menuitem action='CopySampleTune'/>"
430          "      <menuitem action='CopySampleLoop'/>"          "      <menuitem action='CopySampleLoop'/>"
# Line 776  void MainWindow::update_dimregs() Line 858  void MainWindow::update_dimregs()
858              add_region_to_dimregs(region, stereo, all_dimregs);              add_region_to_dimregs(region, stereo, all_dimregs);
859          }          }
860      }      }
861    
862        m_DimRegionChooser.setModifyAllRegions(all_regions);
863        m_DimRegionChooser.setModifyAllDimensionRegions(all_dimregs);
864        m_DimRegionChooser.setModifyBothChannels(stereo);
865  }  }
866    
867  void MainWindow::dimreg_all_dimregs_toggled()  void MainWindow::dimreg_all_dimregs_toggled()
# Line 1408  void MainWindow::__import_queued_samples Line 1494  void MainWindow::__import_queued_samples
1494      std::cout << "Starting sample import\n" << std::flush;      std::cout << "Starting sample import\n" << std::flush;
1495      Glib::ustring error_files;      Glib::ustring error_files;
1496      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));
1497      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();      for (std::map<gig::Sample*, SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
1498           iter != m_SampleImportQueue.end(); ) {           iter != m_SampleImportQueue.end(); ) {
1499          printf("Importing sample %s\n",(*iter).sample_path.c_str());          printf("Importing sample %s\n",iter->second.sample_path.c_str());
1500          SF_INFO info;          SF_INFO info;
1501          info.format = 0;          info.format = 0;
1502          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open(iter->second.sample_path.c_str(), SFM_READ, &info);
1503          sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);          sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);
1504          try {          try {
1505              if (!hFile) throw std::string(_("could not open file"));              if (!hFile) throw std::string(_("could not open file"));
# Line 1436  void MainWindow::__import_queued_samples Line 1522  void MainWindow::__import_queued_samples
1522                      throw std::string(_("format not supported")); // unsupported subformat (yet?)                      throw std::string(_("format not supported")); // unsupported subformat (yet?)
1523              }              }
1524    
1525                // reset write position for sample
1526                iter->first->SetPos(0);
1527    
1528              const int bufsize = 10000;              const int bufsize = 10000;
1529              switch (bitdepth) {              switch (bitdepth) {
1530                  case 16: {                  case 16: {
# Line 1445  void MainWindow::__import_queued_samples Line 1534  void MainWindow::__import_queued_samples
1534                          // libsndfile does the conversion for us (if needed)                          // libsndfile does the conversion for us (if needed)
1535                          int n = sf_readf_short(hFile, buffer, bufsize);                          int n = sf_readf_short(hFile, buffer, bufsize);
1536                          // write from buffer directly (physically) into .gig file                          // write from buffer directly (physically) into .gig file
1537                          iter->gig_sample->Write(buffer, n);                          iter->first->Write(buffer, n);
1538                          cnt -= n;                          cnt -= n;
1539                      }                      }
1540                      delete[] buffer;                      delete[] buffer;
# Line 1465  void MainWindow::__import_queued_samples Line 1554  void MainWindow::__import_queued_samples
1554                              dstbuf[j++] = srcbuf[i] >> 24;                              dstbuf[j++] = srcbuf[i] >> 24;
1555                          }                          }
1556                          // write from buffer directly (physically) into .gig file                          // write from buffer directly (physically) into .gig file
1557                          iter->gig_sample->Write(dstbuf, n);                          iter->first->Write(dstbuf, n);
1558                          cnt -= n;                          cnt -= n;
1559                      }                      }
1560                      delete[] srcbuf;                      delete[] srcbuf;
# Line 1476  void MainWindow::__import_queued_samples Line 1565  void MainWindow::__import_queued_samples
1565              // cleanup              // cleanup
1566              sf_close(hFile);              sf_close(hFile);
1567              // let the sampler re-cache the sample if needed              // let the sampler re-cache the sample if needed
1568              sample_changed_signal.emit(iter->gig_sample);              sample_changed_signal.emit(iter->first);
1569              // on success we remove the sample from the import queue,              // on success we remove the sample from the import queue,
1570              // otherwise keep it, maybe it works the next time ?              // otherwise keep it, maybe it works the next time ?
1571              std::list<SampleImportItem>::iterator cur = iter;              std::map<gig::Sample*, SampleImportItem>::iterator cur = iter;
1572              ++iter;              ++iter;
1573              m_SampleImportQueue.erase(cur);              m_SampleImportQueue.erase(cur);
1574          } catch (std::string what) {          } catch (std::string what) {
1575              // remember the files that made trouble (and their cause)              // remember the files that made trouble (and their cause)
1576              if (!error_files.empty()) error_files += "\n";              if (!error_files.empty()) error_files += "\n";
1577              error_files += (*iter).sample_path += " (" + what + ")";              error_files += iter->second.sample_path += " (" + what + ")";
1578              ++iter;              ++iter;
1579          }          }
1580      }      }
# Line 1527  void MainWindow::on_action_help_about() Line 1616  void MainWindow::on_action_help_about()
1616      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
1617  #endif  #endif
1618      dialog.set_version(VERSION);      dialog.set_version(VERSION);
1619      dialog.set_copyright("Copyright (C) 2006-2016 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2017 Andreas Persson");
1620      const std::string sComment =      const std::string sComment =
1621          _("Built " __DATE__ "\nUsing ") +          _("Built " __DATE__ "\nUsing ") +
1622          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
# Line 2707  void MainWindow::add_or_replace_sample(b Line 2796  void MainWindow::add_or_replace_sample(b
2796                  SampleImportItem sched_item;                  SampleImportItem sched_item;
2797                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
2798                  sched_item.sample_path = *iter;                  sched_item.sample_path = *iter;
2799                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue[sample] = sched_item;
2800                  // add sample to the tree view                  // add sample to the tree view
2801                  if (replace) {                  if (replace) {
2802                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);
# Line 2817  void MainWindow::on_action_replace_all_s Line 2906  void MainWindow::on_action_replace_all_s
2906                  SampleImportItem sched_item;                  SampleImportItem sched_item;
2907                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
2908                  sched_item.sample_path = filename;                  sched_item.sample_path = filename;
2909                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue[sample] = sched_item;
2910                  sf_close(hFile);                  sf_close(hFile);
2911                  file_changed();                  file_changed();
2912              }              }
# Line 2869  void MainWindow::on_action_remove_sample Line 2958  void MainWindow::on_action_remove_sample
2958                  // if sample(s) were just previously added, remove                  // if sample(s) were just previously added, remove
2959                  // them from the import queue                  // them from the import queue
2960                  for (std::list<gig::Sample*>::iterator member = members.begin();                  for (std::list<gig::Sample*>::iterator member = members.begin();
2961                       member != members.end(); ++member) {                       member != members.end(); ++member)
2962                      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();                  {
2963                           iter != m_SampleImportQueue.end(); ++iter) {                      if (m_SampleImportQueue.count(*member)) {
2964                          if ((*iter).gig_sample == *member) {                          printf("Removing previously added sample '%s' from group '%s'\n",
2965                              printf("Removing previously added sample '%s' from group '%s'\n",                                 m_SampleImportQueue[sample].sample_path.c_str(), name.c_str());
2966                                     (*iter).sample_path.c_str(), name.c_str());                          m_SampleImportQueue.erase(*member);
                             m_SampleImportQueue.erase(iter);  
                             break;  
                         }  
2967                      }                      }
2968                  }                  }
2969                  file_changed();                  file_changed();
# Line 2892  void MainWindow::on_action_remove_sample Line 2978  void MainWindow::on_action_remove_sample
2978                  samples_removed_signal.emit();                  samples_removed_signal.emit();
2979                  // if sample was just previously added, remove it from                  // if sample was just previously added, remove it from
2980                  // the import queue                  // the import queue
2981                  for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();                  if (m_SampleImportQueue.count(sample)) {
2982                       iter != m_SampleImportQueue.end(); ++iter) {                      printf("Removing previously added sample '%s'\n",
2983                      if ((*iter).gig_sample == sample) {                             m_SampleImportQueue[sample].sample_path.c_str());
2984                          printf("Removing previously added sample '%s'\n",                      m_SampleImportQueue.erase(sample);
                                (*iter).sample_path.c_str());  
                         m_SampleImportQueue.erase(iter);  
                         break;  
                     }  
2985                  }                  }
2986                  dimreg_changed();                  dimreg_changed();
2987                  file_changed();                  file_changed();
# Line 2955  void MainWindow::on_action_remove_unused Line 3037  void MainWindow::on_action_remove_unused
3037              gig::Sample* sample = *itSample;              gig::Sample* sample = *itSample;
3038              // remove sample from the .gig file              // remove sample from the .gig file
3039              file->DeleteSample(sample);              file->DeleteSample(sample);
3040              // if sample was just previously added, remove it fro the import queue              // if sample was just previously added, remove it from the import queue
3041              for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();              if (m_SampleImportQueue.count(sample)) {
3042                   iter != m_SampleImportQueue.end(); ++iter)                  printf("Removing previously added sample '%s'\n",
3043              {                         m_SampleImportQueue[sample].sample_path.c_str());
3044                  if ((*iter).gig_sample == sample) {                  m_SampleImportQueue.erase(sample);
                     printf("Removing previously added sample '%s'\n",  
                            (*iter).sample_path.c_str());  
                     m_SampleImportQueue.erase(iter);  
                     break;  
                 }  
3045              }              }
3046          }          }
3047      } catch (RIFF::Exception e) {      } catch (RIFF::Exception e) {
# Line 3540  void MainWindow::show_scripts_tab() { Line 3617  void MainWindow::show_scripts_tab() {
3617      m_TreeViewNotebook.set_current_page(2);      m_TreeViewNotebook.set_current_page(2);
3618  }  }
3619    
3620    void MainWindow::select_prev_region() {
3621        m_RegionChooser.select_prev_region();
3622    }
3623    
3624    void MainWindow::select_next_region() {
3625        m_RegionChooser.select_next_region();
3626    }
3627    
3628    void MainWindow::select_next_dim_rgn_zone() {
3629        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3630        m_DimRegionChooser.select_next_dimzone();
3631    }
3632    
3633    void MainWindow::select_prev_dim_rgn_zone() {
3634        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3635        m_DimRegionChooser.select_prev_dimzone();
3636    }
3637    
3638    void MainWindow::select_prev_dimension() {
3639        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3640        m_DimRegionChooser.select_prev_dimension();
3641    }
3642    
3643    void MainWindow::select_next_dimension() {
3644        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3645        m_DimRegionChooser.select_next_dimension();
3646    }
3647    
3648  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {
3649      return file_structure_to_be_changed_signal;      return file_structure_to_be_changed_signal;
3650  }  }

Legend:
Removed from v.3021  
changed lines
  Added in v.3123

  ViewVC Help
Powered by ViewVC