← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/muse/oneiric

« back to all changes in this revision

Viewing changes to muse/undo.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/undo.cpp
27
27
            "AddPart",  "DeletePart",  "ModifyPart",
28
28
            "AddEvent", "DeleteEvent", "ModifyEvent",
29
29
            "AddTempo", "DeleteTempo", "AddSig", "DeleteSig",
30
 
            "SwapTrack"
 
30
            "SwapTrack", "ModifyClip"
31
31
            };
32
32
      return name[type];
33
33
      }
68
68
            case SwapTrack:
69
69
            case DeleteSig:
70
70
            case ModifyClip:
 
71
            case ModifyMarker:
71
72
                  break;
72
73
            }
73
74
      }
157
158
          //      break;
158
159
          //case UndoOp::DeleteSig:
159
160
          //      break;
 
161
            case UndoOp::ModifyMarker:
 
162
                if (i->copyMarker)
 
163
                  delete i->copyMarker;
160
164
          default:
161
165
                break;
162
166
        }
424
428
                        updateFlags |= SC_SIG;
425
429
                        break;
426
430
                  case UndoOp::ModifyClip:
 
431
                  case UndoOp::ModifyMarker:
427
432
                        break;
428
433
                  }
429
434
            }
649
654
                        updateFlags |= SC_SIG;
650
655
                        break;
651
656
                  case UndoOp::ModifyClip:
 
657
                  case UndoOp::ModifyMarker:
652
658
                        break;
653
659
                  }
654
660
            }
767
773
      //printf("Adding ModifyClip undo-operation: origfile=%s tmpfile=%s sf=%d ef=%d\n", changedFile, changeData, startframe, endframe);
768
774
      }
769
775
 
 
776
void Song::undoOp(UndoOp::UndoType type, Marker* copyMarker, Marker* realMarker)
 
777
      {
 
778
      UndoOp i;
 
779
      i.type    = type;
 
780
      i.realMarker  = realMarker;
 
781
      i.copyMarker  = copyMarker;
 
782
 
 
783
      addUndo(i);
 
784
      }
 
785
 
770
786
//---------------------------------------------------------
771
787
//   addUndo
772
788
//---------------------------------------------------------
823
839
                  case UndoOp::ModifyClip:
824
840
                        SndFile::applyUndoFile(i->filename, i->tmpwavfile, i->startframe, i->endframe);
825
841
                        break;
 
842
 
826
843
                  default:
827
844
                        break;
828
845
                  }
850
867
                        // Not much choice but to do this - Tim.
851
868
                        //clearClipboardAndCloneList();
852
869
                        break;      
 
870
                  case UndoOp::ModifyMarker:
 
871
                        {
 
872
                          //printf("performing undo for one marker at %d\n", i->realMarker->tick());
 
873
                          Marker tmpMarker = *i->realMarker;
 
874
                          *i->realMarker = *i->copyMarker; // swap them
 
875
                          *i->copyMarker = tmpMarker;
 
876
                        }
 
877
                        break;
853
878
                  default:
854
879
                        break;
855
880
                  }
924
949
                        // Not much choice but to do this - Tim.
925
950
                        //clearClipboardAndCloneList();
926
951
                        break;      
927
 
                  default:
 
952
                  case UndoOp::ModifyMarker:
 
953
                        {
 
954
                          //printf("performing redo for one marker at %d\n", i->realMarker->tick());
 
955
                          Marker tmpMarker = *i->realMarker;
 
956
                          *i->realMarker = *i->copyMarker; // swap them
 
957
                          *i->copyMarker = tmpMarker;
 
958
                        }
 
959
                        break;
 
960
                   default:
928
961
                        break;
929
962
                  }
930
963
            }