projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
gtk2_ardour
/
editor_mouse.cc
diff --git
a/gtk2_ardour/editor_mouse.cc
b/gtk2_ardour/editor_mouse.cc
index 03974dbd5f0dc3a4089bed456981418c62ef598d..8a8a9518cf02b9ee912a2cbcf744dd97cda600f8 100644
(file)
--- a/
gtk2_ardour/editor_mouse.cc
+++ b/
gtk2_ardour/editor_mouse.cc
@@
-71,7
+71,7
@@
#include "verbose_cursor.h"
#include "note.h"
#include "verbose_cursor.h"
#include "note.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-718,9
+718,9
@@
Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case MinsecRulerItem:
case BBTRulerItem:
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
case MinsecRulerItem:
case BBTRulerItem:
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)
- && !Keyboard::modifier_state_
equal
s (event->button.state, ArdourKeyboard::constraint_modifier())) {
+ && !Keyboard::modifier_state_
contain
s (event->button.state, ArdourKeyboard::constraint_modifier())) {
_drags->set (new CursorDrag (this, *playhead_cursor, false), event);
_drags->set (new CursorDrag (this, *playhead_cursor, false), event);
- } else if (Keyboard::modifier_state_
equal
s (event->button.state, ArdourKeyboard::constraint_modifier())) {
+ } else if (Keyboard::modifier_state_
contain
s (event->button.state, ArdourKeyboard::constraint_modifier())) {
_drags->set (new BBTRulerDrag (this, item), event);
}
return true;
_drags->set (new BBTRulerDrag (this, item), event);
}
return true;
@@
-1037,7
+1037,7
@@
Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
if (!prev) {
_drags->set (new RegionCreateDrag (this, item, parent), event);
} else {
if (!prev) {
_drags->set (new RegionCreateDrag (this, item, parent), event);
} else {
- prev->set_length (t - prev->position ());
+ prev->set_length (t - prev->position ()
, get_grid_music_divisions (event->button.state)
);
}
}
} else {
}
}
} else {
@@
-2082,8
+2082,12
@@
Editor::edit_notes (MidiRegionView* mrv)
void
Editor::note_edit_done (int r, EditNoteDialog* d)
{
void
Editor::note_edit_done (int r, EditNoteDialog* d)
{
+ begin_reversible_command (_("edit note(s)"));
+
d->done (r);
delete d;
d->done (r);
delete d;
+
+ commit_reversible_command();
}
void
}
void
@@
-2096,7
+2100,7
@@
Editor::visible_order_range (int* low, int* high) const
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
- if (!rtv->hidden()) {
+ if (
rtv &&
!rtv->hidden()) {
if (*high < rtv->order()) {
*high = rtv->order ();
if (*high < rtv->order()) {
*high = rtv->order ();
@@
-2309,7
+2313,7
@@
Editor::mouse_brush_insert_region (RegionView* rv, framepos_t pos)
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&rv->get_time_axis_view());
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&rv->get_time_axis_view());
- if (
rtv == 0
|| !rtv->is_track()) {
+ if (
!rtv
|| !rtv->is_track()) {
return;
}
return;
}