summaryrefslogtreecommitdiffstats
path: root/src/libs/client/NodeModel.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/client/NodeModel.h')
-rw-r--r--src/libs/client/NodeModel.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libs/client/NodeModel.h b/src/libs/client/NodeModel.h
index 71c77022..e251d8ad 100644
--- a/src/libs/client/NodeModel.h
+++ b/src/libs/client/NodeModel.h
@@ -24,8 +24,8 @@
#include <sigc++/sigc++.h>
#include "ObjectModel.h"
#include "PortModel.h"
-#include "util/Path.h"
-#include "util/CountedPtr.h"
+#include "raul/Path.h"
+#include "raul/SharedPtr.h"
#include "PluginModel.h"
using std::string; using std::map; using std::find;
@@ -47,30 +47,30 @@ class NodeModel : public ObjectModel
public:
virtual ~NodeModel();
- CountedPtr<PortModel> get_port(const string& port_name) const;
+ SharedPtr<PortModel> get_port(const string& port_name) const;
const map<int, map<int, string> >& get_programs() const { return m_banks; }
const string& plugin_uri() const { return m_plugin_uri; }
- CountedPtr<PluginModel> plugin() const { return m_plugin; }
+ SharedPtr<PluginModel> plugin() const { return m_plugin; }
int num_ports() const { return m_ports.size(); }
const PortModelList& ports() const { return m_ports; }
virtual bool polyphonic() const { return m_polyphonic; }
// Signals
- sigc::signal<void, CountedPtr<PortModel> > new_port_sig;
- sigc::signal<void, CountedPtr<PortModel> > removed_port_sig;
+ sigc::signal<void, SharedPtr<PortModel> > new_port_sig;
+ sigc::signal<void, SharedPtr<PortModel> > removed_port_sig;
protected:
friend class Store;
NodeModel(const string& plugin_uri, const Path& path, bool polyphonic);
- NodeModel(CountedPtr<PluginModel> plugin, const Path& path, bool polyphonic);
+ NodeModel(SharedPtr<PluginModel> plugin, const Path& path, bool polyphonic);
NodeModel(const Path& path);
- void add_child(CountedPtr<ObjectModel> c);
- void remove_child(CountedPtr<ObjectModel> c);
- void add_port(CountedPtr<PortModel> pm);
- void remove_port(CountedPtr<PortModel> pm);
+ void add_child(SharedPtr<ObjectModel> c);
+ void remove_child(SharedPtr<ObjectModel> c);
+ void add_port(SharedPtr<PortModel> pm);
+ void remove_port(SharedPtr<PortModel> pm);
void remove_port(const Path& port_path);
void add_program(int bank, int program, const string& name);
void remove_program(int bank, int program);
@@ -83,7 +83,7 @@ protected:
bool m_polyphonic;
PortModelList m_ports; ///< List of ports (not a map to preserve order)
string m_plugin_uri; ///< Plugin URI (if PluginModel is unknown)
- CountedPtr<PluginModel> m_plugin; ///< The plugin this node is an instance of
+ SharedPtr<PluginModel> m_plugin; ///< The plugin this node is an instance of
map<int, map<int, string> > m_banks; ///< DSSI banks
private:
@@ -93,7 +93,7 @@ private:
};
-typedef map<string, CountedPtr<NodeModel> > NodeModelMap;
+typedef map<string, SharedPtr<NodeModel> > NodeModelMap;
} // namespace Client