diff options
author | David Robillard <d@drobilla.net> | 2006-09-18 07:19:42 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-09-18 07:19:42 +0000 |
commit | f0d7a30b0a4d9daeb8db95c59a5b0e836b03b31b (patch) | |
tree | df254e018dbede7f7ef83a70a5f4c0d57102978e /src/libs/client/ObjectModel.h | |
parent | 6f93b3d7c80f9dee2d95fac1bbc4f781a6f45979 (diff) | |
download | ingen-f0d7a30b0a4d9daeb8db95c59a5b0e836b03b31b.tar.gz ingen-f0d7a30b0a4d9daeb8db95c59a5b0e836b03b31b.tar.bz2 ingen-f0d7a30b0a4d9daeb8db95c59a5b0e836b03b31b.zip |
More store error correcting fixes.
Working (sometimes...) patch refresh button.
git-svn-id: http://svn.drobilla.net/lad/ingen@143 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client/ObjectModel.h')
-rw-r--r-- | src/libs/client/ObjectModel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h index a3cc745c..5ef03b85 100644 --- a/src/libs/client/ObjectModel.h +++ b/src/libs/client/ObjectModel.h @@ -69,13 +69,13 @@ protected: ObjectModel(const Path& path); virtual void set_path(const Path& p) { _path = p; } - virtual void set_parent(CountedPtr<ObjectModel> p) { _parent = p; } + virtual void set_parent(CountedPtr<ObjectModel> p) { assert(p); _parent = p; } virtual void add_child(CountedPtr<ObjectModel> c) = 0; virtual void remove_child(CountedPtr<ObjectModel> c) = 0; void add_metadata(const MetadataMap& data); - void assimilate(CountedPtr<ObjectModel> model); + void set(CountedPtr<ObjectModel> model); void set_metadata(const string& key, const Atom& value) { _metadata[key] = value; metadata_update_sig.emit(key, value); } |