ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NO-OP: Clarify function name

This commit is contained in:
Robin Gareus 2018-11-28 14:56:04 +01:00
parent 76f9764a44
commit 245d48dbd0
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
10 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View File

@ -4362,7 +4362,7 @@ ARDOUR_UI::add_route_dialog_response (int r)
return;
}
add_route_dialog->ArdourDialog::on_response (r);
ARDOUR_UI_UTILS::no_engine_notify ();
ARDOUR_UI_UTILS::engine_is_running ();
return;
}

2
gtk2_ardour/editor_canvas.cc
View File

@ -373,7 +373,7 @@ 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 ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return;
}
if (data.get_target() == "regions") {

2
gtk2_ardour/editor_drag.cc
View File

@ -1428,7 +1428,7 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
RouteTimeAxisView*
RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region, TimeAxisView* original)
{
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return NULL;
}

2
gtk2_ardour/editor_ops.cc
View File

@ -7421,7 +7421,7 @@ Editor::_remove_tracks ()
return;
}
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return;
}

4
gtk2_ardour/mixer_strip.cc
View File

@ -873,7 +873,7 @@ gint
MixerStrip::output_press (GdkEventButton *ev)
{
using namespace Menu_Helpers;
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return true;
}
@ -987,7 +987,7 @@ MixerStrip::input_press (GdkEventButton *ev)
input_menu.set_name ("ArdourContextMenu");
citems.clear();
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return true;
}

14
gtk2_ardour/processor_box.cc
View File

@ -2427,7 +2427,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
if (!one_processor_can_be_edited ()) {
return true;
}
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return true;
}
@ -2534,7 +2534,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
; /* only show inline display */
}
else if (processor_can_be_edited (processor)) {
if (ARDOUR_UI_UTILS::no_engine_notify()) {
if (!ARDOUR_UI_UTILS::engine_is_running()) {
return true;
} else if ((*p)->has_editor ()) {
edit_processor (processor);
@ -3663,7 +3663,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us
} else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return 0;
}
@ -3679,7 +3679,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us
return 0;
}
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return 0;
}
@ -3721,7 +3721,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us
} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return 0;
}
@ -4089,7 +4089,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
if (edit_aux_send (processor)) {
return;
}
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return;
}
@ -4110,7 +4110,7 @@ ProcessorBox::generic_edit_processor (boost::shared_ptr<Processor> processor)
if (edit_aux_send (processor)) {
return;
}
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return;
}

2
gtk2_ardour/route_ui.cc
View File

@ -2323,7 +2323,7 @@ RouteUI::manage_pins ()
void
RouteUI::fan_out (bool to_busses, bool group)
{
if (ARDOUR_UI_UTILS::no_engine_notify ()) {
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return;
}

2
gtk2_ardour/sfdb_ui.cc
View File

@ -2057,7 +2057,7 @@ SoundFileOmega::do_something (int action)
{
SoundFileBrowser::do_something (action);
if (action == RESPONSE_CLOSE || ARDOUR_UI_UTILS::no_engine_notify ()) {
if (action == RESPONSE_CLOSE || !ARDOUR_UI_UTILS::engine_is_running ()) {
hide ();
return;
}

6
gtk2_ardour/utils.cc
View File

@ -124,13 +124,13 @@ idle_notify_engine_stopped ()
}
bool
ARDOUR_UI_UTILS::no_engine_notify ()
ARDOUR_UI_UTILS::engine_is_running ()
{
if (ARDOUR::AudioEngine::instance()->running ()) {
return false; // 0 == OK
return true;
}
Glib::signal_idle().connect (sigc::ptr_fun (&idle_notify_engine_stopped));
return true;
return false;
}

5
gtk2_ardour/utils.h
View File

@ -52,10 +52,7 @@ namespace ARDOUR_UI_UTILS {
gint just_hide_it (GdkEventAny*, Gtk::Window*);
void add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList &, Gtk::Menu_Helpers::MenuElem, bool);
/* return 0 (false) if there is no error (engine runs).
* otherwise queue an idle user-notificaion and return true.
*/
bool no_engine_notify ();
bool engine_is_running ();
unsigned char* xpm2rgb (const char** xpm, uint32_t& w, uint32_t& h);
unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);