/[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 2392 by persson, Mon Jan 7 20:41:16 2013 UTC revision 2398 by persson, Sun Jan 13 09:14:29 2013 UTC
# Line 179  MainWindow::MainWindow() : Line 179  MainWindow::MainWindow() :
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 236  MainWindow::MainWindow() : Line 240  MainWindow::MainWindow() :
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 829  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 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 1501  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 1521  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
Legend:
Removed from v.2392  
changed lines
  Added in v.2398
  ViewVC Help
Powered by ViewVC