diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-01-01 22:11:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-01-01 22:11:15 +0000 |
| commit | f5acf936728c721bc556b7b3dfe69ebf0c3d63ed (patch) | |
| tree | 0041127f99ecc339917c530ac4cf339c740f6af8 /gtk2_ardour/ardour_ui2.cc | |
| parent | 6572f421a40b30112dbe11a4eace115a6af1c83e (diff) | |
First cut of some Pro-tools inspired editing features; linked play/play range
and linked object/range modes.
git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index ab772389a7..b759e022a1 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -178,6 +178,7 @@ ARDOUR_UI::setup_transport () play_selection_button.set_name ("TransportButton"); rec_button.set_name ("TransportRecButton"); auto_loop_button.set_name ("TransportButton"); + join_play_range_button.set_name ("TransportButton"); auto_return_button.set_name ("TransportButton"); auto_play_button.set_name ("TransportButton"); @@ -221,6 +222,9 @@ ARDOUR_UI::setup_transport () w = manage (new Image (get_icon (X_("transport_loop")))); w->show(); auto_loop_button.add (*w); + w = manage (new Image (get_icon (X_("join_tools")))); + w->show (); + join_play_range_button.add (*w); RefPtr<Action> act; @@ -361,11 +365,17 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*svbox, false, false, 3); - transport_tearoff_hbox.pack_start (auto_loop_button, false, false); - if (!Profile->get_sae()) { - transport_tearoff_hbox.pack_start (play_selection_button, false, false); + if (Profile->get_sae()) { + transport_tearoff_hbox.pack_start (auto_loop_button); + transport_tearoff_hbox.pack_start (roll_button); + } else { + transport_tearoff_hbox.pack_start (auto_loop_button, false, false); + play_range_hbox.pack_start (play_selection_button, false, false); + play_range_hbox.pack_start (roll_button, false, false); + play_range_vbox.pack_start (play_range_hbox, false, false); + play_range_vbox.pack_start (join_play_range_button, false, false); + transport_tearoff_hbox.pack_start (play_range_vbox, false, false); } - transport_tearoff_hbox.pack_start (roll_button, false, false); transport_tearoff_hbox.pack_start (stop_button, false, false); transport_tearoff_hbox.pack_start (rec_button, false, false, 6); |