summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Patchage.cpp12
-rw-r--r--src/Patchage.hpp3
-rw-r--r--src/PatchageModule.hpp4
3 files changed, 10 insertions, 9 deletions
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 234bf47..7fc4508 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -219,7 +219,7 @@ Patchage::Patchage(int argc, char** argv)
#endif
_menu_store_positions->signal_activate().connect(sigc::mem_fun(this, &Patchage::menu_store_positions));
_menu_file_quit->signal_activate().connect( sigc::mem_fun(this, &Patchage::menu_file_quit));
- _menu_view_refresh->signal_activate().connect( sigc::mem_fun(this, &Patchage::menu_view_refresh));
+ _menu_view_refresh->signal_activate().connect( sigc::mem_fun(this, &Patchage::refresh));
_menu_view_arrange->signal_activate().connect( sigc::mem_fun(this, &Patchage::menu_view_arrange));
_menu_view_toolbar->signal_activate().connect( sigc::mem_fun(this, &Patchage::view_toolbar_toggled));
_menu_view_messages->signal_toggled().connect( sigc::mem_fun(this, &Patchage::show_messages_toggled));
@@ -282,7 +282,7 @@ Patchage::attach()
_alsa_driver->attach();
#endif
- menu_view_refresh();
+ refresh();
update_toolbar();
@@ -487,7 +487,7 @@ Patchage::connect_widgets()
_jack_driver->signal_attached.connect(
sigc::mem_fun(this, &Patchage::update_toolbar));
_jack_driver->signal_attached.connect(
- sigc::mem_fun(this, &Patchage::menu_view_refresh));
+ sigc::mem_fun(this, &Patchage::refresh));
//_jack_driver->signal_attached.connect(sigc::bind(
/// sigc::mem_fun(_jack_connect_toggle, &Gtk::ToggleButton::set_active), true));
@@ -510,7 +510,7 @@ Patchage::connect_widgets()
_alsa_driver->signal_attached.connect(sigc::bind(
sigc::mem_fun(_menu_alsa_disconnect, &Gtk::MenuItem::set_sensitive), true));
_alsa_driver->signal_attached.connect(
- sigc::mem_fun(this, &Patchage::menu_view_refresh));
+ sigc::mem_fun(this, &Patchage::refresh));
_alsa_driver->signal_detached.connect(sigc::bind(
sigc::mem_fun(_menu_alsa_connect, &Gtk::MenuItem::set_sensitive), true));
@@ -601,7 +601,7 @@ void
Patchage::menu_alsa_disconnect()
{
_alsa_driver->detach();
- menu_view_refresh();
+ refresh();
}
#endif
@@ -688,7 +688,7 @@ Patchage::show_messages_toggled()
void
-Patchage::menu_view_refresh()
+Patchage::refresh()
{
assert(_canvas);
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index 75f419c..b1eb444 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -56,6 +56,8 @@ public:
void clear_load();
+ void refresh();
+
void update_state();
void store_window_location();
@@ -73,7 +75,6 @@ protected:
void menu_file_quit();
void show_messages_toggled();
void view_toolbar_toggled();
- void menu_view_refresh();
void menu_view_arrange();
void menu_help_about();
void zoom(double z);
diff --git a/src/PatchageModule.hpp b/src/PatchageModule.hpp
index 244e7bf..fe74ac2 100644
--- a/src/PatchageModule.hpp
+++ b/src/PatchageModule.hpp
@@ -94,13 +94,13 @@ public:
void split() {
assert(_type == InputOutput);
_app->state_manager()->set_module_split(_name, true);
- _app->queue_refresh();
+ _app->refresh();
}
void join() {
assert(_type != InputOutput);
_app->state_manager()->set_module_split(_name, false);
- _app->queue_refresh();
+ _app->refresh();
}
virtual void store_location() {