diff options
| author | Robin Gareus <robin@gareus.org> | 2016-05-17 18:19:26 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-05-17 18:19:26 +0200 |
| commit | 5ac35d47d6ad46c5f5eab827c154dcea88323055 (patch) | |
| tree | c734d93a394fe82bd710e27561b3eab86cb63d23 | |
| parent | 524fb8df49508c938dc0be72f75b63fc834dbb80 (diff) | |
some more mixbus backports (NO-OP for ardour)
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 13 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/startup.cc | 5 |
3 files changed, 13 insertions, 7 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 7c2e509a96..26e2b9a688 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -26,6 +26,7 @@ #include "ardour/audioregion.h" #include "ardour/export_status.h" #include "ardour/export_handler.h" +#include "ardour/profile.h" #include "export_dialog.h" #include "export_report.h" @@ -331,12 +332,12 @@ ExportDialog::show_progress () if (!status->aborted()) { hide(); - - NagScreen* ns = NagScreen::maybe_nag (_("export")); - - if (ns) { - ns->nag (); - delete ns; + if (!ARDOUR::Profile->get_mixbus()) { + NagScreen* ns = NagScreen::maybe_nag (_("export")); + if (ns) { + ns->nag (); + delete ns; + } } } else { notify_errors (); diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 4d6d135d46..331429a00c 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -300,6 +300,7 @@ class RouteUI : public virtual AxisView std::string route_state_id () const; +protected: struct SoloMuteRelease { SoloMuteRelease (bool was_active) : active (was_active) @@ -316,6 +317,7 @@ class RouteUI : public virtual AxisView SoloMuteRelease* _solo_release; SoloMuteRelease* _mute_release; +private: void setup_invert_buttons (); void set_invert_button_state (); void invert_menu_toggled (uint32_t); diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 45f543e118..ed0cd885cb 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -46,6 +46,7 @@ #include "ardour/session.h" #include "ardour/session_state_utils.h" #include "ardour/template_utils.h" +#include "ardour/profile.h" #include "startup.h" #include "opts.h" @@ -357,7 +358,9 @@ ArdourStartup::setup_final_page () VBox* vbox = manage (new VBox); vbox->pack_start (*final_label, true, true); - vbox->pack_start (plugin_disco_button, true, false); + if (!Profile->get_mixbus()) { + vbox->pack_start (plugin_disco_button, true, false); + } vbox->show (); final_page_index = append_page (*vbox); |