summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-13 06:17:28 +0000
committerDavid Robillard <d@drobilla.net>2013-01-13 06:17:28 +0000
commit6c81b00c7be1f590f13599b4d5e638686e4e7236 (patch)
treec6cd320fc459d255c41c258ce526625019a395db /src
parentc398f1e425e6c4570be3a7d78937c44a1f915c2b (diff)
downloadpatchage-6c81b00c7be1f590f13599b4d5e638686e4e7236.tar.gz
patchage-6c81b00c7be1f590f13599b4d5e638686e4e7236.tar.bz2
patchage-6c81b00c7be1f590f13599b4d5e638686e4e7236.zip
Update for latest ganv.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@4953 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/Patchage.cpp7
-rw-r--r--src/PatchageCanvas.cpp4
-rw-r--r--src/PatchageCanvas.hpp4
3 files changed, 6 insertions, 9 deletions
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index cd39cc8..3be7ed2 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -351,11 +351,8 @@ Patchage::zoom(double z)
void
Patchage::refresh()
{
- assert(_canvas);
-
- if (_enable_refresh) {
-
- _canvas->destroy();
+ if (_canvas && _enable_refresh) {
+ _canvas->clear();
#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS)
if (_jack_driver)
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index abb0b26..28fe1d4 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -332,9 +332,9 @@ PatchageCanvas::remove_module(PatchageModule* module)
}
void
-PatchageCanvas::destroy()
+PatchageCanvas::clear()
{
_port_index.clear();
_module_index.clear();
- Ganv::Canvas::destroy();
+ Ganv::Canvas::clear();
}
diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp
index ac0c9f7..3701519 100644
--- a/src/PatchageCanvas.hpp
+++ b/src/PatchageCanvas.hpp
@@ -66,11 +66,11 @@ public:
bool make_connection(Ganv::Node* tail,
Ganv::Node* head,
- uint32_t color);
+ uint32_t color);
void remove_port(const PortID& id);
- void destroy();
+ void clear();
private:
Patchage* _app;