← Back to branch summary

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

« back to all changes in this revision

Viewing changes to muse/arranger/pcanvas.h

  • 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/arranger/pcanvas.h
10
10
 
11
11
#include "song.h"
12
12
#include "canvas.h"
 
13
#include "trackautomationview.h"
13
14
#define beats     4
14
15
 
15
16
//---------------------------------------------------------
46
47
      int curColorIndex;
47
48
      bool editMode;
48
49
 
 
50
      std::vector<TrackAutomationView*> automationViews;
49
51
      Q_OBJECT
50
52
      virtual void keyPress(QKeyEvent*);
51
53
      virtual void mousePress(QMouseEvent*);
84
86
      void splitItem(CItem* item, const QPoint&);
85
87
 
86
88
      void copy(PartList*);
87
 
      void paste(bool clone = false, bool toTrack = true);
 
89
      void paste(bool clone = false, bool toTrack = true, bool doInsert=false);
88
90
      int pasteAt(const QString&, Track*, int, bool clone = false, bool toTrack = true);
 
91
      void movePartsTotheRight(int startTick, int length);
89
92
      //Part* readClone(Xml&, Track*, bool toTrack = true);
90
93
      void drawWavePart(QPainter&, const QRect&, WavePart*, const QRect&);
91
94
      Track* y2Track(int) const;
92
95
      void drawAudioTrack(QPainter& p, const QRect& r, AudioTrack* track);
 
96
      void drawAutomation(QPainter& p, const QRect& r, AudioTrack* track);
 
97
 
93
98
 
94
99
   protected:
95
100
      virtual void drawCanvas(QPainter&, const QRect&);
103
108
      void dropMidiFile(const QString&);
104
109
      void setUsedTool(int);
105
110
      void trackChanged(Track*);
 
111
      void selectTrackAbove();
 
112
      void selectTrackBelow();
106
113
 
107
114
      void startEditor(PartList*, int);
108
115
 
110
117
      void returnPressed();
111
118
 
112
119
   public:
113
 
      enum { CMD_CUT_PART, CMD_COPY_PART, CMD_PASTE_PART, CMD_PASTE_CLONE_PART, CMD_PASTE_PART_TO_TRACK, CMD_PASTE_CLONE_PART_TO_TRACK };
 
120
      enum { CMD_CUT_PART, CMD_COPY_PART, CMD_PASTE_PART, CMD_PASTE_CLONE_PART, CMD_PASTE_PART_TO_TRACK, CMD_PASTE_CLONE_PART_TO_TRACK,
 
121
             CMD_INSERT_PART, CMD_INSERT_EMPTYMEAS };
114
122
 
115
123
      PartCanvas(int* raster, QWidget* parent, int, int);
116
124
      void partsChanged();
117
125
      void cmd(int);
 
126
      void controllerChanged(Track *t);
118
127
   public slots:
119
128
   void redirKeypress(QKeyEvent* e) { keyPress(e); }
120
129
      };