diff options
| author | Robin Gareus <robin@gareus.org> | 2015-12-27 00:38:28 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-12-27 00:38:28 +0100 |
| commit | 228d6a18610b54884688d0f7d208b6b6303c17bb (patch) | |
| tree | 39d04b3586de1748752814c08bac8cfe9411f9b8 /gtk2_ardour/mixer_ui.cc | |
| parent | b7461fb7c010104f54fa134e14cd7c849da8cec0 (diff) | |
Ardour 4.5 is later than planned.
Revert "quick hack: hide unfinished processor sidebar for 4.5 release"
This reverts commit 20521bad20655a7f4b57b26270ae4d983b6da9a7.
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 9ade58584b..a92c564af2 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -43,7 +43,6 @@ #include "ardour/route_group.h" #include "ardour/route_sorters.h" #include "ardour/session.h" -#include "ardour/revision.h" // XXX remove after 4.5 release #include "keyboard.h" #include "mixer_ui.h" @@ -215,16 +214,10 @@ Mixer_UI::Mixer_UI () favorite_plugins_frame.set_shadow_type (Gtk::SHADOW_IN); favorite_plugins_frame.add (favorite_plugins_scroller); - // XXX remove after 4.5 release - if (!strcmp (ARDOUR::revision, "4.5") || strcmp (PROGRAM_NAME, "Ardour")) { - rhs_pane2.pack1 (track_display_frame); - rhs_pane2.pack2 (group_display_frame); - } else { - rhs_pane1.pack1 (favorite_plugins_frame, false, true); - rhs_pane1.pack2 (track_display_frame); - rhs_pane2.pack1 (rhs_pane1); - rhs_pane2.pack2 (group_display_frame); - } + rhs_pane1.pack1 (favorite_plugins_frame, false, true); + rhs_pane1.pack2 (track_display_frame); + rhs_pane2.pack1 (rhs_pane1); + rhs_pane2.pack2 (group_display_frame); list_vpacker.pack_start (rhs_pane2, true, true); |