← Back to branch summary

~ubuntu-branches/ubuntu/quantal/muse/quantal

« back to all changes in this revision

Viewing changes to muse/waveedit/waveview.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fabrice Coutadeur
  • Date: 2010-11-17 21:43:38 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101117214338-1hvfl7oo2dsqnvrb
Tags: 1.1-0ubuntu1
https://launchpad.net/bugs/668631
* New upstream release (LP: #668631)
* Switch to dpkg-source 3.0 (quilt) format
* Switch to dh7 short form
* debian/rules:
  - added --enable-dssi and --enable-osc to conf flags for dssi support
  - added -ljackserver to LDFLAGS to fix a FTBFS because of --as-needed
* debian/control:
  - added build build dependency on liblo-dev and dssi-dev for dssi support
  - bump Standards-version to 3.9.1. No changes required.
* debian/muse.desktop, debian/muse.xpm: dropped as desktop file and icon is
  now shipped upstream.
* fix-desktop-categories.patch: fix Categories tag in upstream desktop file
* 10_es_locale_fix.dpatch: refreshed and converted to quilt as
  fix_es_locale.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
muse/waveedit/waveview.cpp
551
551
      if (modifyoperation != -1) {
552
552
            if (selectionStart == selectionStop) {
553
553
                  printf("No selection. Ignoring\n"); //@!TODO: Disable menu options when no selection
 
554
                  QMessageBox::information(this,
 
555
                     QString("MusE"),
 
556
                     QWidget::tr("No selection. Ignoring"));
 
557
 
554
558
                  return;
555
559
                  }
556
560
            
660
664
                     tmpdata[i] = new float[tmpdatalen];
661
665
                     }
662
666
               file.seek(tmpdataoffset, 0);
663
 
               file.read(file_channels, tmpdata, tmpdatalen);
 
667
               file.readWithHeap(file_channels, tmpdata, tmpdatalen);
664
668
               file.close();
665
669
               tmpFile.write(file_channels, tmpdata, tmpdatalen);
666
670
               tmpFile.close();
865
869
            else {
866
870
                // Re-read file again
867
871
                exttmpFile.seek(0, 0);
868
 
                size_t sz = exttmpFile.read(file_channels, tmpdata, tmpdatalen);
 
872
                size_t sz = exttmpFile.readWithHeap(file_channels, tmpdata, tmpdatalen);
869
873
                if (sz != tmpdatalen) {
870
874
                        // File must have been shrunken - not good. Alert user.
871
875
                        QMessageBox::critical(this, tr("MusE - file size changed"),