Remove unused RegionGainDrag; fix logic in adding new

region gain points; remove unreached switch {} that may
have come from a mis-merge.


git-svn-id: svn://localhost/ardour2/branches/3.0@11631 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-03-09 20:47:40 +00:00
parent c52c2b7368
commit e9bf20021e
3 changed files with 2 additions and 65 deletions

View file

@ -1602,30 +1602,6 @@ NoteResizeDrag::aborted (bool)
}
}
RegionGainDrag::RegionGainDrag (Editor* e, ArdourCanvas::Item* i)
: Drag (e, i)
{
DEBUG_TRACE (DEBUG::Drags, "New RegionGainDrag\n");
}
void
RegionGainDrag::motion (GdkEvent* /*event*/, bool)
{
}
void
RegionGainDrag::finished (GdkEvent *, bool)
{
}
void
RegionGainDrag::aborted (bool)
{
/* XXX: TODO */
}
TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v)
: RegionDrag (e, i, p, v)
{

View file

@ -504,21 +504,6 @@ private:
double _cumulative_dx;
};
/** Drag of region gain */
class RegionGainDrag : public Drag
{
public:
RegionGainDrag (Editor *, ArdourCanvas::Item *);
void motion (GdkEvent *, bool);
void finished (GdkEvent *, bool);
bool active (Editing::MouseMode m) {
return (m == Editing::MouseGain);
}
void aborted (bool);
};
/** Drag to trim region(s) */
class TrimDrag : public RegionDrag
{

View file

@ -1110,13 +1110,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case MouseGain:
switch (item_type) {
case RegionItem:
/* start a grab so that if we finish after moving
we can tell what happened.
*/
_drags->set (new RegionGainDrag (this, item), event, current_canvas_cursor);
break;
case GainLineItem:
_drags->set (new LineDrag (this, item), event);
return true;
@ -1126,27 +1119,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
return true;
break;
default:
break;
}
return true;
break;
switch (item_type) {
case ControlPointItem:
_drags->set (new ControlPointDrag (this, item), event);
break;
case AutomationLineItem:
_drags->set (new LineDrag (this, item), event);
break;
case RegionItem:
// XXX need automation mode to identify which
// line to use
// start_line_grab_from_regionview (item, event);
break;
default:
break;
}
@ -1664,7 +1640,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
points when doing this.
*/
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (clicked_regionview);
if (were_dragging && arv) {
if (!were_dragging && arv) {
arv->add_gain_point_event (item, event);
}
return true;