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

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

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

revision 1088 by persson, Sat Mar 10 08:16:38 2007 UTC revision 1094 by schoenebeck, Sun Mar 11 17:47:21 2007 UTC
# Line 390  void MainWindow::addProp(LabelWidget& pr Line 390  void MainWindow::addProp(LabelWidget& pr
390    
391  MainWindow::MainWindow() :  MainWindow::MainWindow() :
392  //    eSample("Sample", wSample),  //    eSample("Sample", wSample),
     eVelocityUpperLimit("VelocityUpperLimit",  
                         &gig::DimensionRegion::VelocityUpperLimit),  
393      eEG1PreAttack("PreAttack", &gig::DimensionRegion::EG1PreAttack, 0, 100, 2),      eEG1PreAttack("PreAttack", &gig::DimensionRegion::EG1PreAttack, 0, 100, 2),
394      eEG1Attack("Attack", &gig::DimensionRegion::EG1Attack, 0, 60, 3),      eEG1Attack("Attack", &gig::DimensionRegion::EG1Attack, 0, 60, 3),
395      eEG1Decay1("Decay1", &gig::DimensionRegion::EG1Decay1, 0.005, 60, 3),      eEG1Decay1("Decay1", &gig::DimensionRegion::EG1Decay1, 0.005, 60, 3),
# Line 552  MainWindow::MainWindow() : Line 550  MainWindow::MainWindow() :
550      firstRowInBlock = 0;      firstRowInBlock = 0;
551    
552      addString("Sample", lSample, wSample);      addString("Sample", lSample, wSample);
     addProp(eVelocityUpperLimit);  
553      addHeader("EG1");      addHeader("EG1");
554      addProp(eEG1PreAttack);      addProp(eEG1PreAttack);
555      addProp(eEG1Attack);      addProp(eEG1Attack);
# Line 977  void MainWindow::set_dim_region(gig::Dim Line 974  void MainWindow::set_dim_region(gig::Dim
974  {  {
975      update_gui = false;      update_gui = false;
976      wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : "NULL");      wSample->set_text(d->pSample ? d->pSample->pInfo->Name.c_str() : "NULL");
     eVelocityUpperLimit.set_dimreg(d);  
977      eEG1PreAttack.set_dimreg(d);      eEG1PreAttack.set_dimreg(d);
978      eEG1Attack.set_dimreg(d);      eEG1Attack.set_dimreg(d);
979      eEG1Decay1.set_dimreg(d);      eEG1Decay1.set_dimreg(d);
# Line 1349  void MainWindow::on_loader_finished() Line 1345  void MainWindow::on_loader_finished()
1345  void MainWindow::on_action_file_save()  void MainWindow::on_action_file_save()
1346  {  {
1347      if (!file) return;      if (!file) return;
1348      file->Save();      std::cout << "Saving file\n" << std::flush;
1349        try {
1350            file->Save();
1351        } catch (RIFF::Exception e) {
1352            Glib::ustring txt = "Could not save file: " + e.Message;
1353            Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1354            msg.run();
1355            return;
1356        }
1357        std::cout << "Saving file done\n" << std::flush;
1358      __import_queued_samples();      __import_queued_samples();
1359  }  }
1360    
# Line 1364  void MainWindow::on_action_file_save_as( Line 1369  void MainWindow::on_action_file_save_as(
1369      dialog.set_filter(filter);      dialog.set_filter(filter);
1370      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1371          printf("filename=%s\n", dialog.get_filename().c_str());          printf("filename=%s\n", dialog.get_filename().c_str());
1372          file->Save(dialog.get_filename());          try {
1373                file->Save(dialog.get_filename());
1374            } catch (RIFF::Exception e) {
1375                Glib::ustring txt = "Could not save file: " + e.Message;
1376                Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1377                msg.run();
1378                return;
1379            }
1380          __import_queued_samples();          __import_queued_samples();
1381      }      }
1382  }  }
1383    
1384  // actually write the sample(s)' data to the gig file  // actually write the sample(s)' data to the gig file
1385  void MainWindow::__import_queued_samples() {  void MainWindow::__import_queued_samples() {
1386        std::cout << "Starting sample import\n" << std::flush;
1387      Glib::ustring error_files;      Glib::ustring error_files;
1388      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin(); iter != m_SampleImportQueue.end(); ++iter) {      printf("Samples to import: %d\n", m_SampleImportQueue.size());
1389        for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin(); iter != m_SampleImportQueue.end(); ) {
1390          printf("Importing sample %s\n",(*iter).sample_path.c_str());          printf("Importing sample %s\n",(*iter).sample_path.c_str());
1391          SF_INFO info;          SF_INFO info;
1392          info.format = 0;          info.format = 0;
# Line 1426  void MainWindow::__import_queued_samples Line 1440  void MainWindow::__import_queued_samples
1440              sf_close(hFile);              sf_close(hFile);
1441              delete buffer;              delete buffer;
1442              // on success we remove the sample from the import queue, otherwise keep it, maybe it works the next time ?              // on success we remove the sample from the import queue, otherwise keep it, maybe it works the next time ?
1443              m_SampleImportQueue.erase(iter);              std::list<SampleImportItem>::iterator cur = iter;
1444                ++iter;
1445                m_SampleImportQueue.erase(cur);
1446          } catch (std::string what) { // remember the files that made trouble (and their cause)          } catch (std::string what) { // remember the files that made trouble (and their cause)
1447              if (error_files.size()) error_files += "\n";              if (error_files.size()) error_files += "\n";
1448              error_files += (*iter).sample_path += " (" + what + ")";              error_files += (*iter).sample_path += " (" + what + ")";
1449                ++iter;
1450          }          }
1451      }      }
1452      // show error message box when some sample(s) could not be imported      // show error message box when some sample(s) could not be imported
# Line 1749  void MainWindow::on_action_add_sample() Line 1766  void MainWindow::on_action_add_sample()
1766      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);      dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1767      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);      dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
1768      dialog.set_select_multiple(true);      dialog.set_select_multiple(true);
1769      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile (yet to do ;-)      Gtk::FileFilter soundfilter; // matches all file types supported by libsndfile
1770      soundfilter.add_pattern("*.wav");      const char* supportedFileTypes[] = {
1771            "*.wav", "*.WAV", "*.aiff", "*.AIFF", "*.aifc", "*.AIFC", "*.snd",
1772            "*.SND", "*.au", "*.AU", "*.paf", "*.PAF", "*.iff", "*.IFF",
1773            "*.svx", "*.SVX", "*.sf", "*.SF", "*.voc", "*.VOC", "*.w64",
1774            "*.W64", "*.pvf", "*.PVF", "*.xi", "*.XI", "*.htk", "*.HTK",
1775            "*.caf", "*.CAF", NULL
1776        };
1777        for (int i = 0; supportedFileTypes[i]; i++)
1778            soundfilter.add_pattern(supportedFileTypes[i]);
1779      soundfilter.set_name("Sound Files");      soundfilter.set_name("Sound Files");
1780      Gtk::FileFilter allpassfilter; // matches every file      Gtk::FileFilter allpassfilter; // matches every file
1781      allpassfilter.add_pattern("*.*");      allpassfilter.add_pattern("*.*");
# Line 1804  void MainWindow::on_action_add_sample() Line 1829  void MainWindow::on_action_add_sample()
1829                  sample->SamplesPerSecond = info.samplerate;                  sample->SamplesPerSecond = info.samplerate;
1830                  // schedule resizing the sample (which will be done physically when File::Save() is called)                  // schedule resizing the sample (which will be done physically when File::Save() is called)
1831                  sample->Resize(info.frames);                  sample->Resize(info.frames);
1832                    // make sure sample is part of the selected group
1833                    group->AddSample(sample);
1834                  // schedule that physical resize and sample import (data copying), performed when "Save" is requested                  // schedule that physical resize and sample import (data copying), performed when "Save" is requested
1835                  SampleImportItem sched_item;                  SampleImportItem sched_item;
1836                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
# Line 1839  void MainWindow::on_action_remove_sample Line 1866  void MainWindow::on_action_remove_sample
1866          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
1867          gig::Group* group   = row[m_SamplesModel.m_col_group];          gig::Group* group   = row[m_SamplesModel.m_col_group];
1868          gig::Sample* sample = row[m_SamplesModel.m_col_sample];          gig::Sample* sample = row[m_SamplesModel.m_col_sample];
1869            Glib::ustring name  = row[m_SamplesModel.m_col_name];
1870          try {          try {
1871              // remove group or sample from the gig file              // remove group or sample from the gig file
1872              if (group) {              if (group) {
1873                    // temporarily remember the samples that bolong to that group (we need that to clean the queue)
1874                    std::list<gig::Sample*> members;
1875                    for (gig::Sample* pSample = group->GetFirstSample(); pSample; pSample = group->GetNextSample()) {
1876                        members.push_back(pSample);
1877                    }
1878                    // delete the group in the .gig file including the samples that belong to the group
1879                  file->DeleteGroup(group);                  file->DeleteGroup(group);
1880                    // if sample(s) were just previously added, remove them from the import queue
1881                    for (std::list<gig::Sample*>::iterator member = members.begin(); member != members.end(); ++member) {
1882                        for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin(); iter != m_SampleImportQueue.end(); ++iter) {
1883                            if ((*iter).gig_sample == *member) {
1884                                printf("Removing previously added sample '%s' from group '%s'\n", (*iter).sample_path.c_str(), name.c_str());
1885                                m_SampleImportQueue.erase(iter);
1886                                break;
1887                            }
1888                        }
1889                    }
1890              } else if (sample) {              } else if (sample) {
1891                    // remove sample from the .gig file
1892                  file->DeleteSample(sample);                  file->DeleteSample(sample);
1893              }                  // if sample was just previously added, remove it from the import queue
             // if sample was just previously added, remove it from the import queue  
             if (sample) {  
1894                  for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin(); iter != m_SampleImportQueue.end(); ++iter) {                  for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin(); iter != m_SampleImportQueue.end(); ++iter) {
1895                      if ((*iter).gig_sample == sample) {                      if ((*iter).gig_sample == sample) {
1896                            printf("Removing previously added sample '%s'\n", (*iter).sample_path.c_str());
1897                          m_SampleImportQueue.erase(iter);                          m_SampleImportQueue.erase(iter);
1898                          break;                          break;
1899                      }                      }
Legend:
Removed from v.1088  
changed lines
  Added in v.1094
  ViewVC Help
Powered by ViewVC