diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-17 17:51:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-17 17:51:22 +0000 |
| commit | 595b12c6a2932c4fec29f695f7f518f36a3fcd59 (patch) | |
| tree | 9003ef938699a5252d5dfeda9c98c22e1522e1c1 /libs | |
| parent | 5f37d769351d03acfa6e1704fb9f54fcf57c3c60 (diff) | |
add reset envelope gain; small patch from brian for tearoff dragging
git-svn-id: svn://localhost/ardour2/trunk@1139 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/tearoff.cc | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 1d389cec1a..0d45d20c0d 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -116,6 +116,7 @@ class AudioRegion : public Region void set_fade_out (FadeShape, nframes_t); void set_envelope_active (bool yn); + void set_default_envelope (); int separate_by_channel (ARDOUR::Session&, vector<AudioRegion*>&) const; @@ -153,7 +154,6 @@ class AudioRegion : public Region void set_default_fades (); void set_default_fade_in (); void set_default_fade_out (); - void set_default_envelope (); void recompute_gain_at_end (); void recompute_gain_at_start (); diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc index 9f915d8227..6e8111152f 100644 --- a/libs/gtkmm2ext/tearoff.cc +++ b/libs/gtkmm2ext/tearoff.cc @@ -109,7 +109,7 @@ TearOff::tearoff_click (GdkEventButton* ev) own_window.show_all (); hide (); Detach (); - return TRUE; + return true; } gint @@ -121,19 +121,25 @@ TearOff::close_click (GdkEventButton* ev) own_window.hide (); show_all (); Attach (); - return TRUE; + return true; } gint TearOff::window_button_press (GdkEventButton* ev) { + if (dragging) { + dragging = false; + own_window.remove_modal_grab(); + return true; + } + dragging = true; drag_x = ev->x_root; drag_y = ev->y_root; own_window.add_modal_grab(); - return TRUE; + return true; } gint @@ -141,7 +147,7 @@ TearOff::window_button_release (GdkEventButton* ev) { dragging = false; own_window.remove_modal_grab(); - return TRUE; + return true; } gint @@ -163,7 +169,7 @@ TearOff::window_motion (GdkEventMotion* ev) own_window.get_pointer (mx, my); if (!dragging) { - return TRUE; + return true; } x_delta = ev->x_root - drag_x; @@ -175,7 +181,7 @@ TearOff::window_motion (GdkEventMotion* ev) drag_x = ev->x_root; drag_y = ev->y_root; - return TRUE; + return true; } bool |