← Back to branch summary

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

« back to all changes in this revision

Viewing changes to muse/master/lmaster.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/master/lmaster.cpp
26
26
#include <qmessagebox.h>
27
27
#include <qstyle.h>
28
28
#include <qaccel.h>
 
29
#include <qaction.h>
29
30
 
30
31
#define LMASTER_BEAT_COL 0
31
32
#define LMASTER_TIME_COL 1
505
506
      //
506
507
      // SigEvent, value changed:
507
508
      //
508
 
      else if (editedItem->getType() == LMASTER_SIGEVENT && editorColumn == LMASTER_VAL_COL) {
 
509
      else if (editedItem->getType() == LMASTER_SIGEVENT && editorColumn == LMASTER_VAL_COL) 
 
510
      {
509
511
            Sig newSig = sig_editor->sig();
 
512
            
510
513
            sig_editor->hide();
511
 
            LMasterSigEventItem* e = (LMasterSigEventItem*) editedItem;
512
 
            int tick = e->tick();
513
 
            if (!editingNewItem) {
514
 
                  song->startUndo();
515
 
                  if (tick > 0)
516
 
                        audio->msgRemoveSig(tick, e->z(), e->n(), false);
517
 
                  audio->msgAddSig(tick, newSig.z, newSig.n, false);
518
 
                  song->endUndo(SC_SIG);
519
 
                  }
520
 
            else
521
 
                  audio->msgAddSig(tick, newSig.z, newSig.n, true);
522
 
            }
 
514
            
 
515
            // Added p3.3.43 Prevents aborting with 0 z or n.
 
516
            if(newSig.isValid())
 
517
            {
 
518
            
 
519
              LMasterSigEventItem* e = (LMasterSigEventItem*) editedItem;
 
520
              int tick = e->tick();
 
521
              if (!editingNewItem) {
 
522
                    song->startUndo();
 
523
                    if (tick > 0)
 
524
                          audio->msgRemoveSig(tick, e->z(), e->n(), false);
 
525
                    audio->msgAddSig(tick, newSig.z, newSig.n, false);
 
526
                    song->endUndo(SC_SIG);
 
527
                    }
 
528
              else
 
529
                    audio->msgAddSig(tick, newSig.z, newSig.n, true);
 
530
            }        
 
531
      }
523
532
 
524
533
      view->setFocus();
525
534
      // No item edited now: