some more mixbus backports (NO-OP for ardour)

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 7c2e509a96a9e65040045bea239cf5aeba5bd9ce..26e2b9a68887628f64560848f7f491f453784ffc 100644 (file)
--- 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 4d6d135d46fd8defb112af3a57d8d24b856bc022..331429a00c3758041ef479b90311df957e268e8a 100644 (file)
--- 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 45f543e11875a2eac7713c6f7603d6bf91e7213a..ed0cd885cb4a3f0edadf809464e681edb7db088e 100644 (file)
--- 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);