diff options
| author | David Robillard <d@drobilla.net> | 2007-10-08 16:30:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-10-08 16:30:57 +0000 |
| commit | 763bba9de67fb1bd06658a0bac91440727ee5a51 (patch) | |
| tree | 39e7af069828981c2c06d78e015686062eba73dc /src/libs/client/ObjectModel.cpp | |
| parent | 260a406b12997fdab7446a9980e921d8cfc46915 (diff) | |
| download | ingen-763bba9de67fb1bd06658a0bac91440727ee5a51.tar.gz ingen-763bba9de67fb1bd06658a0bac91440727ee5a51.tar.bz2 ingen-763bba9de67fb1bd06658a0bac91440727ee5a51.zip | |
SharedPtr-ify engine side store.
Fix reattaching to engine.
Fix connection paths.
Remove last dependencies on client (model) library from Serialiser.
Fix Raul::PathTable::find_descendants_end.
git-svn-id: http://svn.drobilla.net/lad/ingen@847 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client/ObjectModel.cpp')
| -rw-r--r-- | src/libs/client/ObjectModel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp index ca38b42f..7d144faf 100644 --- a/src/libs/client/ObjectModel.cpp +++ b/src/libs/client/ObjectModel.cpp @@ -15,9 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ObjectModel.hpp" -#include <raul/TableImpl.hpp> #include <iostream> +#include <raul/TableImpl.hpp> +#include "interface/GraphObject.hpp" +#include "ObjectModel.hpp" using namespace std; @@ -57,7 +58,7 @@ ObjectModel::children_end() const } -SharedPtr<ObjectModel> +SharedPtr<Shared::GraphObject> ObjectModel::find_child(const string& name) const { const_iterator me = _store.objects().find(_path); @@ -65,7 +66,7 @@ ObjectModel::find_child(const string& name) const const_iterator children_end = _store.objects().find_descendants_end(me); const_iterator child = _store.objects().find(me, children_end, _path.base() + name); if (child != _store.objects().end()) - return child->second; + return PtrCast<ObjectModel>(child->second); else return SharedPtr<ObjectModel>(); } |