diff options
| author | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
| commit | d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch) | |
| tree | 387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/midiedit/ecanvas.cpp | |
| parent | 716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/midiedit/ecanvas.cpp')
| -rw-r--r-- | muse2/muse/midiedit/ecanvas.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp index 75757bf9..88cf3318 100644 --- a/muse2/muse/midiedit/ecanvas.cpp +++ b/muse2/muse/midiedit/ecanvas.cpp @@ -23,7 +23,7 @@ #include <stdio.h> #include <errno.h> -#include <values.h> +#include <limits.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/mman.h> @@ -92,7 +92,7 @@ QString EventCanvas::getCaption() const void EventCanvas::leaveEvent(QEvent*) { emit pitchChanged(-1); - emit timeChanged(MAXINT); + emit timeChanged(INT_MAX); } //--------------------------------------------------------- @@ -150,7 +150,8 @@ void EventCanvas::songChanged(int flags) return; if (flags & ~SC_SELECTION) { - //items.clear(); DELETETHIS + // TODO FIXME: don't we actually only want SC_PART_*, and maybe SC_TRACK_DELETED? + // (same in waveview.cpp) bool curItemNeedsRestore=false; MusECore::Event storedEvent; int partSn; @@ -163,7 +164,7 @@ void EventCanvas::songChanged(int flags) curItem=NULL; items.clearDelete(); - start_tick = MAXINT; + start_tick = INT_MAX; end_tick = 0; curPart = 0; for (MusECore::iPart p = editor->parts()->begin(); p != editor->parts()->end(); ++p) { @@ -331,6 +332,9 @@ void EventCanvas::keyPress(QKeyEvent* event) // Select items by key (PianoRoll & DrumEditor) else if (key == shortcuts[SHRT_SEL_RIGHT].key || key == shortcuts[SHRT_SEL_RIGHT_ADD].key) { rciCItem i; + + if (items.empty()) + return; for (i = items.rbegin(); i != items.rend(); ++i) if (i->second->isSelected()) break; @@ -359,7 +363,9 @@ void EventCanvas::keyPress(QKeyEvent* event) //Select items by key: (PianoRoll & DrumEditor) else if (key == shortcuts[SHRT_SEL_LEFT].key || key == shortcuts[SHRT_SEL_LEFT_ADD].key) { ciCItem i; - for (i = items.begin(); i != items.end(); ++i) + if (items.empty()) + return; + for (i = items.begin(); i != items.end(); ++i) if (i->second->isSelected()) break; |