smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 04:06:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix some weird style

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9668 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-06-02 03:17:53 +00:00
parent 3f68aa2638
commit c43c219c2e
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/midi_region_view.cc
View file

@ -525,20 +525,17 @@ MidiRegionView::motion (GdkEventMotion* ev)
&& _mouse_state != AddDragging) { && _mouse_state != AddDragging) {
create_ghost_note (ev->x, ev->y); create_ghost_note (ev->x, ev->y);
} } else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange
else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange
&& Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
update_ghost_note (ev->x, ev->y); update_ghost_note (ev->x, ev->y);
} } else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange) {
else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange){
delete _ghost_note; delete _ghost_note;
_ghost_note = 0; _ghost_note = 0;
trackview.editor().verbose_cursor()->hide (); trackview.editor().verbose_cursor()->hide ();
} } else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) {
else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) {
update_ghost_note (ev->x, ev->y); update_ghost_note (ev->x, ev->y);
} }
@ -556,9 +553,9 @@ MidiRegionView::motion (GdkEventMotion* ev)
return false; return false;
} }
// Select drag start
if (_pressed_button == 1 && trackview.editor().current_mouse_mode() == MouseObject if (_pressed_button == 1 && trackview.editor().current_mouse_mode() == MouseObject
&& !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
// Select drag start
group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
Gdk::Cursor(Gdk::FLEUR), ev->time); Gdk::Cursor(Gdk::FLEUR), ev->time);
@ -582,8 +579,8 @@ MidiRegionView::motion (GdkEventMotion* ev)
_mouse_state = SelectRectDragging; _mouse_state = SelectRectDragging;
return true; return true;
// Add note drag start
} else if (trackview.editor().internal_editing()) { } else if (trackview.editor().internal_editing()) {
// Add note drag start
delete _ghost_note; delete _ghost_note;
_ghost_note = 0; _ghost_note = 0;

2
gtk2_ardour/rc_option_editor.cc
View file

@ -282,8 +282,6 @@ public:
_edit_button_spin (_edit_button_adjustment), _edit_button_spin (_edit_button_adjustment),
_insert_note_button_adjustment (3, 1, 5), _insert_note_button_adjustment (3, 1, 5),
_insert_note_button_spin (_insert_note_button_adjustment) _insert_note_button_spin (_insert_note_button_adjustment)
{ {
/* internationalize and prepare for use with combos */ /* internationalize and prepare for use with combos */