summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2018-11-28 00:01:50 +0100
committerRobin Gareus <robin@gareus.org>2018-11-28 00:01:50 +0100
commitf150f6c074e09e99531f8e82c5972fa49e302374 (patch)
treed78c5dfd2a63826b8ef274ec6336699f552bcdf8 /gtk2_ardour
parent415721fa5b48f3c3dc164ac60095c095c4e48ad0 (diff)
Use central method to check for engine where required
These are generally places where tracks/busses are created or port connections change.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc3
-rw-r--r--gtk2_ardour/editor_canvas.cc3
-rw-r--r--gtk2_ardour/editor_drag.cc3
-rw-r--r--gtk2_ardour/editor_ops.cc6
-rw-r--r--gtk2_ardour/mixer_strip.cc8
-rw-r--r--gtk2_ardour/processor_box.cc4
-rw-r--r--gtk2_ardour/route_ui.cc4
-rw-r--r--gtk2_ardour/sfdb_ui.cc2
8 files changed, 12 insertions, 21 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 7fcb7c74b5..148bf0317e 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -4362,8 +4362,7 @@ ARDOUR_UI::add_route_dialog_response (int r)
return;
}
add_route_dialog->ArdourDialog::on_response (r);
- MessageDialog msg (_("Not connected to audio engine - Adding Tracks/Busses is not possible"));
- msg.run ();
+ ARDOUR_UI_UTILS::no_engine_notify ();
return;
}
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 72a86808d0..1f8e81e7aa 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -373,6 +373,9 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
const SelectionData& data,
guint info, guint time)
{
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
+ return;
+ }
if (data.get_target() == "regions") {
drop_regions (context, x, y, data, info, time);
} else {
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 5310eeed33..7b8ffca750 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1428,8 +1428,7 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
RouteTimeAxisView*
RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region, TimeAxisView* original)
{
- if (!AudioEngine::instance()->running ()) {
- error << _("Not connected to audio engine - Could not create new track after region placed in the drop zone") << endmsg;
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
return NULL;
}
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 3675a02fc5..e73ea5fab0 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -45,7 +45,6 @@
#include "widgets/prompter.h"
#include "ardour/audio_track.h"
-#include "ardour/audioengine.h"
#include "ardour/audioregion.h"
#include "ardour/boost_debug.h"
#include "ardour/dB.h"
@@ -111,6 +110,7 @@
#include "transpose_dialog.h"
#include "transform_dialog.h"
#include "ui_config.h"
+#include "utils.h"
#include "vca_time_axis.h"
#include "pbd/i18n.h"
@@ -7421,9 +7421,7 @@ Editor::_remove_tracks ()
return;
}
- if (!AudioEngine::instance()->running ()) {
- MessageDialog msg (_("Not connected to audio engine - Removing Tracks/Busses is not possible"));
- msg.run ();
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
return;
}
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 7b94385970..d0404058e2 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -873,9 +873,7 @@ gint
MixerStrip::output_press (GdkEventButton *ev)
{
using namespace Menu_Helpers;
- if (!_session->engine().connected()) {
- MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible"));
- msg.run ();
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
return true;
}
@@ -989,9 +987,7 @@ MixerStrip::input_press (GdkEventButton *ev)
input_menu.set_name ("ArdourContextMenu");
citems.clear();
- if (!_session->engine().connected()) {
- MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible"));
- msg.run ();
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
return true;
}
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 550bdc2826..2658f57538 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -3720,9 +3720,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us
} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
- if (!_session->engine().connected()) {
- MessageDialog msg ( _("Not connected to audio engine - no I/O changes are possible"));
- msg.run ();
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
return 0;
}
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index f7c4d0cac0..157bb40a30 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -2323,9 +2323,7 @@ RouteUI::manage_pins ()
void
RouteUI::fan_out (bool to_busses, bool group)
{
- if (!AudioEngine::instance()->running ()) {
- MessageDialog msg (_("Not connected to audio engine - Fanning out to Tracks/Busses is not possible"));
- msg.run ();
+ if (ARDOUR_UI_UTILS::no_engine_notify ()) {
return;
}
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 2c4d5b4db6..9e473e3cc7 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -2057,7 +2057,7 @@ SoundFileOmega::do_something (int action)
{
SoundFileBrowser::do_something (action);
- if (action == RESPONSE_CLOSE) {
+ if (action == RESPONSE_CLOSE || ARDOUR_UI_UTILS::no_engine_notify ()) {
hide ();
return;
}