summaryrefslogtreecommitdiffstats
path: root/src/libs/client/ObjectModel.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-06-12 04:48:20 +0000
committerDavid Robillard <d@drobilla.net>2006-06-12 04:48:20 +0000
commitefee2b08f575e2c216cffa6f08a928223ab2cedb (patch)
tree089fdf9bc89aa04793b03cbfccb438a7a9c9f387 /src/libs/client/ObjectModel.h
parent5818a04533e472820f6c6748b2f07d7d1ca5789a (diff)
downloadingen-efee2b08f575e2c216cffa6f08a928223ab2cedb.tar.gz
ingen-efee2b08f575e2c216cffa6f08a928223ab2cedb.tar.bz2
ingen-efee2b08f575e2c216cffa6f08a928223ab2cedb.zip
Store memory bug fixes (multiple ref ptr's to the same object, bad),
control panel fixes git-svn-id: http://svn.drobilla.net/lad/grauph@32 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client/ObjectModel.h')
-rw-r--r--src/libs/client/ObjectModel.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h
index 94103c53..b9a6d75d 100644
--- a/src/libs/client/ObjectModel.h
+++ b/src/libs/client/ObjectModel.h
@@ -25,7 +25,7 @@
#include <cassert>
#include <sigc++/sigc++.h>
#include "util/Path.h"
-
+#include "util/CountedPtr.h"
using std::string; using std::map; using std::find;
using std::cout; using std::cerr; using std::endl;
using Om::Path;
@@ -55,8 +55,8 @@ public:
inline const Path& path() const { return m_path; }
virtual void set_path(const Path& p) { m_path = p; }
- ObjectModel* parent() const { return m_parent; }
- virtual void set_parent(ObjectModel* p) { m_parent = p; }
+ CountedPtr<ObjectModel> parent() const { return m_parent; }
+ virtual void set_parent(CountedPtr<ObjectModel> p) { m_parent = p; }
ObjectController* controller() const { return m_controller; }
@@ -69,9 +69,9 @@ public:
// Signals
sigc::signal<void, const string&, const string&> metadata_update_sig;
protected:
- Path m_path;
- ObjectModel* m_parent;
- ObjectController* m_controller;
+ Path m_path;
+ CountedPtr<ObjectModel> m_parent;
+ ObjectController* m_controller; // FIXME: remove
map<string,string> m_metadata;