smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

some more mixbus backports (NO-OP for ardour)

Browse source
This commit is contained in:
Robin Gareus 2016-05-17 18:19:26 +02:00
parent 524fb8df49
commit 5ac35d47d6
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/export_dialog.cc
View file

@ -26,6 +26,7 @@
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/export_status.h" #include "ardour/export_status.h"
#include "ardour/export_handler.h" #include "ardour/export_handler.h"
#include "ardour/profile.h"
#include "export_dialog.h" #include "export_dialog.h"
#include "export_report.h" #include "export_report.h"
@ -331,13 +332,13 @@ ExportDialog::show_progress ()
if (!status->aborted()) { if (!status->aborted()) {
hide(); hide();
if (!ARDOUR::Profile->get_mixbus()) {
NagScreen* ns = NagScreen::maybe_nag (_("export")); NagScreen* ns = NagScreen::maybe_nag (_("export"));
if (ns) { if (ns) {
ns->nag (); ns->nag ();
delete ns; delete ns;
} }
}
} else { } else {
notify_errors (); notify_errors ();
} }

2
gtk2_ardour/route_ui.h
View file

@ -300,6 +300,7 @@ class RouteUI : public virtual AxisView
std::string route_state_id () const; std::string route_state_id () const;
protected:
struct SoloMuteRelease { struct SoloMuteRelease {
SoloMuteRelease (bool was_active) SoloMuteRelease (bool was_active)
: active (was_active) : active (was_active)
@ -316,6 +317,7 @@ class RouteUI : public virtual AxisView
SoloMuteRelease* _solo_release; SoloMuteRelease* _solo_release;
SoloMuteRelease* _mute_release; SoloMuteRelease* _mute_release;
private:
void setup_invert_buttons (); void setup_invert_buttons ();
void set_invert_button_state (); void set_invert_button_state ();
void invert_menu_toggled (uint32_t); void invert_menu_toggled (uint32_t);

3
gtk2_ardour/startup.cc
View file

@ -46,6 +46,7 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_state_utils.h" #include "ardour/session_state_utils.h"
#include "ardour/template_utils.h" #include "ardour/template_utils.h"
#include "ardour/profile.h"
#include "startup.h" #include "startup.h"
#include "opts.h" #include "opts.h"
@ -357,7 +358,9 @@ ArdourStartup::setup_final_page ()
VBox* vbox = manage (new VBox); VBox* vbox = manage (new VBox);
vbox->pack_start (*final_label, true, true); vbox->pack_start (*final_label, true, true);
if (!Profile->get_mixbus()) {
vbox->pack_start (plugin_disco_button, true, false); vbox->pack_start (plugin_disco_button, true, false);
}
vbox->show (); vbox->show ();
final_page_index = append_page (*vbox); final_page_index = append_page (*vbox);