From 41f1be0a68676f33dc1d7dfbb32c5d6440ebd4c9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 23 Sep 2011 22:00:38 +0000 Subject: Fix broken iterator use (memory errors on erase) in ResourceImpl::set_property. Load all required modules before starting jack (Jack went crazy sometimes otherwise, particularly with ingen running in gdb). Fix insane non-const reference return to Resource::set_property. Exit cleanly on interrupt (Ctrl-C) and terminate (kill). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3480 a436a847-0d15-0410-975c-d299462d15a1 --- include/ingen/client/ObjectModel.hpp | 4 ++-- include/ingen/client/PortModel.hpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/ingen/client') diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp index d3959f4f..1f446bb0 100644 --- a/include/ingen/client/ObjectModel.hpp +++ b/include/ingen/client/ObjectModel.hpp @@ -57,8 +57,8 @@ public: const Raul::Atom& get_property(const Raul::URI& key) const; - Raul::Atom& set_property(const Raul::URI& key, const Raul::Atom& value, - Resource::Graph ctx); + const Raul::Atom& set_property(const Raul::URI& key, const Raul::Atom& value, + Resource::Graph ctx); void add_property(const Raul::URI& key, const Raul::Atom& value); const Raul::Path& path() const { return _path; } diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp index 0786e7fc..7fd4d746 100644 --- a/include/ingen/client/PortModel.hpp +++ b/include/ingen/client/PortModel.hpp @@ -63,9 +63,9 @@ public: inline bool operator==(const PortModel& pm) const { return (path() == pm.path()); } - Raul::Atom& set_property(const Raul::URI& uri, - const Raul::Atom& value, - Resource::Graph ctx); + const Raul::Atom& set_property(const Raul::URI& uri, + const Raul::Atom& value, + Resource::Graph ctx); inline void value(const Raul::Atom& val) { if (val != _current_val) { -- cgit v1.2.1