Mercurial > hg > svgui
diff layer/NoteLayer.cpp @ 248:28c8e8e3c537
* Fix many compile warnings, remove some debug output
author | Chris Cannam |
---|---|
date | Mon, 30 Apr 2007 13:36:23 +0000 |
parents | b4809e942e7d |
children | e175ade2d6b0 |
line wrap: on
line diff
--- a/layer/NoteLayer.cpp Mon Apr 30 09:07:08 2007 +0000 +++ b/layer/NoteLayer.cpp Mon Apr 30 13:36:23 2007 +0000 @@ -295,11 +295,11 @@ if (prevPoints.empty()) { usePoints = nextPoints; - } else if (prevPoints.begin()->frame < v->getStartFrame() && + } else if (long(prevPoints.begin()->frame) < v->getStartFrame() && !(nextPoints.begin()->frame > v->getEndFrame())) { usePoints = nextPoints; - } else if (nextPoints.begin()->frame - frame < - frame - prevPoints.begin()->frame) { + } else if (long(nextPoints.begin()->frame) - frame < + frame - long(prevPoints.begin()->frame)) { usePoints = nextPoints; } @@ -604,9 +604,6 @@ float max = m_model->getValueMaximum(); if (max == min) max = min + 1.0; - int origin = int(nearbyint(v->height() - - (-min * v->height()) / (max - min))); - QPoint localPos; long illuminateFrame = -1; @@ -709,7 +706,7 @@ } void -NoteLayer::drawEnd(View *v, QMouseEvent *e) +NoteLayer::drawEnd(View *, QMouseEvent *) { // std::cerr << "NoteLayer::drawEnd(" << e->x() << "," << e->y() << ")" << std::endl; if (!m_model || !m_editing) return; @@ -764,7 +761,7 @@ } void -NoteLayer::editEnd(View *v, QMouseEvent *e) +NoteLayer::editEnd(View *, QMouseEvent *) { // std::cerr << "NoteLayer::editEnd(" << e->x() << "," << e->y() << ")" << std::endl; if (!m_model || !m_editing) return; @@ -936,7 +933,7 @@ } bool -NoteLayer::paste(const Clipboard &from, int frameOffset, bool interactive) +NoteLayer::paste(const Clipboard &from, int frameOffset, bool /* interactive */) { if (!m_model) return false;