summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/AlsaDriver.cpp4
-rw-r--r--src/JackDriver.cpp3
-rw-r--r--src/Patchage.cpp23
-rw-r--r--src/Patchage.hpp5
-rw-r--r--src/PatchageEvent.cpp4
5 files changed, 1 insertions, 38 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index b2ceed7..2ddb2b6 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -134,9 +134,6 @@ AlsaDriver::refresh()
}
create_port_view_internal(_app, addr, parent, port);
- if (parent) {
- _app->enqueue_resize(parent);
- }
}
}
@@ -223,7 +220,6 @@ AlsaDriver::find_or_create_module(
m = new PatchageModule(patchage, client_name, type);
m->load_location();
_app->canvas()->add_module(client_name, m);
- _app->enqueue_resize(m);
_modules.insert(std::make_pair(client_id, m));
}
return m;
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 27cab50..9624692 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -161,7 +161,6 @@ JackDriver::create_port_view(Patchage* patchage,
PatchagePort* port = create_port(*parent, jack_port, id);
port->show();
- _app->enqueue_resize(parent);
return port;
}
@@ -271,8 +270,6 @@ JackDriver::refresh()
if (!m->get_port(jack_port_short_name(port)))
create_port(*m, port, PortID());
-
- _app->enqueue_resize(m);
}
// Add all connections
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 441247a..016fbbe 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -366,8 +366,6 @@ Patchage::idle_callback()
_refresh = false;
_driver_detached = false;
- flush_resize();
-
// Update load every 10 idle callbacks
static int count = 0;
if (++count == 10) {
@@ -456,8 +454,6 @@ Patchage::refresh()
if (_alsa_driver)
_alsa_driver->refresh();
#endif
-
- flush_resize();
}
}
@@ -813,22 +809,3 @@ Patchage::on_scroll(GdkEventScroll* ev)
{
return false;
}
-
-void
-Patchage::enqueue_resize(FlowCanvas::Module* module)
-{
- if (module)
- _pending_resize.insert(module);
-}
-
-void
-Patchage::flush_resize()
-{
- for (std::set<FlowCanvas::Module*>::iterator i = _pending_resize.begin();
- i != _pending_resize.end(); ++i) {
- (*i)->resize();
- }
-
- _pending_resize.clear();
-}
-
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index 4d6a11d..1c4f609 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -99,9 +99,6 @@ public:
void update_state();
void store_window_location();
- void enqueue_resize(FlowCanvas::Module* module);
- void flush_resize();
-
protected:
void connect_widgets();
@@ -150,8 +147,6 @@ protected:
boost::shared_ptr<PatchageCanvas> _canvas;
- std::set<FlowCanvas::Module*> _pending_resize;
-
JackDriver* _jack_driver;
StateManager* _state_manager;
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index 32136e3..cf53c03 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -72,9 +72,7 @@ PatchageEvent::execute(Patchage* patchage)
if (driver) {
PatchagePort* port = driver->create_port_view(patchage, _port_1);
- if (port)
- patchage->enqueue_resize(port->module());
- else
+ if (!port)
Raul::error << "Unable to create port view: " << _port_1 << endl;
} else {
Raul::error << "Attempt to create port with unknown type: " << _port_1 << endl;