From 198560d5fd499ab14eb4e130ee74e21fa86674a4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 13 May 2011 02:57:36 +0000 Subject: Make models const in client code. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3259 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/ConnectWindow.cpp | 6 ++-- src/gui/Connection.cpp | 2 +- src/gui/Connection.hpp | 6 ++-- src/gui/ControlPanel.cpp | 14 +++++---- src/gui/ControlPanel.hpp | 11 +++---- src/gui/Controls.cpp | 8 +++--- src/gui/Controls.hpp | 18 ++++++------ src/gui/LoadPatchWindow.cpp | 9 ++++-- src/gui/LoadPatchWindow.hpp | 8 ++++-- src/gui/LoadPluginWindow.cpp | 36 +++++++++++++---------- src/gui/LoadPluginWindow.hpp | 17 +++++------ src/gui/LoadRemotePatchWindow.cpp | 8 ++++-- src/gui/LoadRemotePatchWindow.hpp | 10 ++++--- src/gui/NewSubpatchWindow.cpp | 8 ++++-- src/gui/NewSubpatchWindow.hpp | 12 ++++---- src/gui/NodeControlWindow.cpp | 6 ++-- src/gui/NodeControlWindow.hpp | 12 ++++---- src/gui/NodeMenu.cpp | 21 +++++++------- src/gui/NodeMenu.hpp | 2 +- src/gui/NodeModule.cpp | 15 +++++----- src/gui/NodeModule.hpp | 24 ++++++++-------- src/gui/ObjectMenu.cpp | 4 +-- src/gui/ObjectMenu.hpp | 21 +++++++------- src/gui/PatchCanvas.cpp | 31 +++++++++++--------- src/gui/PatchCanvas.hpp | 25 +++++++++------- src/gui/PatchPortModule.cpp | 9 ++++-- src/gui/PatchPortModule.hpp | 18 ++++++------ src/gui/PatchView.cpp | 11 +++---- src/gui/PatchView.hpp | 21 +++++++------- src/gui/PatchWindow.cpp | 34 +++++++++++----------- src/gui/PatchWindow.hpp | 20 ++++++------- src/gui/Port.cpp | 36 +++++++++++------------ src/gui/Port.hpp | 14 ++++----- src/gui/PortMenu.cpp | 23 ++++++++------- src/gui/PortMenu.hpp | 5 ++-- src/gui/PortPropertiesWindow.cpp | 5 ++-- src/gui/PortPropertiesWindow.hpp | 17 +++++------ src/gui/PropertiesWindow.cpp | 12 ++++++-- src/gui/PropertiesWindow.hpp | 23 ++++++++------- src/gui/RenameWindow.cpp | 21 ++++++++------ src/gui/RenameWindow.hpp | 19 +++++++------ src/gui/SubpatchModule.cpp | 3 +- src/gui/SubpatchModule.hpp | 7 +++-- src/gui/ThreadedLoader.cpp | 6 ++-- src/gui/ThreadedLoader.hpp | 5 ++-- src/gui/WindowFactory.cpp | 60 ++++++++++++++++++++++++--------------- src/gui/WindowFactory.hpp | 34 +++++++++++----------- 47 files changed, 409 insertions(+), 328 deletions(-) (limited to 'src/gui') diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 7741be10..84d67797 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -54,7 +54,8 @@ namespace Raul { class Deletable; } namespace Ingen { namespace GUI { -ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +ConnectWindow::ConnectWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Dialog(cobject) , _xml(xml) , _mode(CONNECT_REMOTE) @@ -444,7 +445,8 @@ ConnectWindow::gtk_callback() ++_connect_stage; } else if (_connect_stage == 3) { if (App::instance().store()->size() > 0) { - SharedPtr root = PtrCast(App::instance().store()->object("/")); + SharedPtr root = PtrCast( + App::instance().store()->object("/")); if (root) { set_connected_to(App::instance().engine()); App::instance().window_factory()->present_patch(root); diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp index 27110227..f9e079c0 100644 --- a/src/gui/Connection.cpp +++ b/src/gui/Connection.cpp @@ -25,7 +25,7 @@ namespace Ingen { namespace GUI { Connection::Connection(boost::shared_ptr canvas, - boost::shared_ptr model, + boost::shared_ptr model, boost::shared_ptr src, boost::shared_ptr dst, uint32_t color) diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp index 6ff6365f..fb30a7c0 100644 --- a/src/gui/Connection.hpp +++ b/src/gui/Connection.hpp @@ -38,15 +38,15 @@ class Connection : public FlowCanvas::Connection { public: Connection(boost::shared_ptr canvas, - boost::shared_ptr model, + boost::shared_ptr model, boost::shared_ptr src, boost::shared_ptr dst, uint32_t color); - SharedPtr model() const { return _connection_model; } + SharedPtr model() const { return _connection_model; } private: - SharedPtr _connection_model; + SharedPtr _connection_model; }; } // namespace GUI diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index 03e044cc..59309ab4 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -32,7 +32,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& xml) +ControlPanel::ControlPanel(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Gtk::HBox(cobject) , _callback_enabled(true) { @@ -48,12 +49,13 @@ ControlPanel::~ControlPanel() } void -ControlPanel::init(SharedPtr node, uint32_t poly) +ControlPanel::init(SharedPtr node, uint32_t poly) { assert(node != NULL); assert(poly > 0); - for (NodeModel::Ports::const_iterator i = node->ports().begin(); i != node->ports().end(); ++i) { + for (NodeModel::Ports::const_iterator i = node->ports().begin(); + i != node->ports().end(); ++i) { add_port(*i); } @@ -73,7 +75,7 @@ ControlPanel::find_port(const Path& path) const /** Add a control to the panel for the given port. */ void -ControlPanel::add_port(SharedPtr pm) +ControlPanel::add_port(SharedPtr pm) { assert(pm); @@ -146,13 +148,13 @@ ControlPanel::remove_port(const Path& path) /** Callback for Controls to notify this of a change. */ void -ControlPanel::value_changed_atom(SharedPtr port, const Raul::Atom& val) +ControlPanel::value_changed_atom(SharedPtr port, + const Raul::Atom& val) { if (_callback_enabled) { App::instance().engine()->set_property(port->path(), App::instance().uris().ingen_value, val); - port->value(val); } } diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index 57e3bec6..cff7e946 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -47,14 +47,15 @@ namespace GUI { */ class ControlPanel : public Gtk::HBox { public: - ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); + ControlPanel(BaseObjectType* cobject, + const Glib::RefPtr& glade_xml); virtual ~ControlPanel(); - void init(SharedPtr node, uint32_t poly); + void init(SharedPtr node, uint32_t poly); Control* find_port(const Raul::Path& path) const; - void add_port(SharedPtr port); + void add_port(SharedPtr port); void remove_port(const Raul::Path& path); void enable_port(const Raul::Path& path); @@ -64,10 +65,10 @@ public: std::pair ideal_size() const { return _ideal_size; } // Callback for Control - void value_changed_atom(SharedPtr port, const Raul::Atom& val); + void value_changed_atom(SharedPtr port, const Raul::Atom& val); template - void value_changed(SharedPtr port, T val) { + void value_changed(SharedPtr port, T val) { this->value_changed_atom(port, Raul::Atom(val)); } diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index 153f1c26..b9362ed7 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -60,7 +60,7 @@ Control::~Control() } void -Control::init(ControlPanel* panel, SharedPtr pm) +Control::init(ControlPanel* panel, SharedPtr pm) { _control_panel = panel; _port_model = pm, @@ -124,7 +124,7 @@ SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr pm) +SliderControl::init(ControlPanel* panel, SharedPtr pm) { _enable_signal = false; _enabled = true; @@ -297,7 +297,7 @@ ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr pm) +ToggleControl::init(ControlPanel* panel, SharedPtr pm) { _enable_signal = false; @@ -355,7 +355,7 @@ StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr pm) +StringControl::init(ControlPanel* panel, SharedPtr pm) { _enable_signal = false; diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp index 95b89c73..c64f7062 100644 --- a/src/gui/Controls.hpp +++ b/src/gui/Controls.hpp @@ -42,12 +42,12 @@ public: Control(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); virtual ~Control(); - virtual void init(ControlPanel* panel, SharedPtr pm); + virtual void init(ControlPanel* panel, SharedPtr pm); void enable(); void disable(); - inline const SharedPtr port_model() const { return _port_model; } + inline const SharedPtr port_model() const { return _port_model; } protected: virtual void set_value(const Raul::Atom& value) = 0; @@ -56,10 +56,10 @@ protected: void set_label(const std::string& name); void menu_properties(); - ControlPanel* _control_panel; - SharedPtr _port_model; - sigc::connection _control_connection; - bool _enable_signal; + ControlPanel* _control_panel; + SharedPtr _port_model; + sigc::connection _control_connection; + bool _enable_signal; Gtk::Menu* _menu; Gtk::MenuItem* _menu_properties; @@ -74,7 +74,7 @@ class SliderControl : public Control { public: SliderControl(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); - void init(ControlPanel* panel, SharedPtr pm); + void init(ControlPanel* panel, SharedPtr pm); void set_min(float val); void set_max(float val); @@ -107,7 +107,7 @@ class ToggleControl : public Control public: ToggleControl(BaseObjectType* cobject, const Glib::RefPtr& xml); - void init(ControlPanel* panel, SharedPtr pm); + void init(ControlPanel* panel, SharedPtr pm); private: void set_value(const Raul::Atom& value); @@ -125,7 +125,7 @@ class StringControl : public Control public: StringControl(BaseObjectType* cobject, const Glib::RefPtr& xml); - void init(ControlPanel* panel, SharedPtr pm); + void init(ControlPanel* panel, SharedPtr pm); private: void set_value(const Raul::Atom& value); diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index 99c1c127..f002e36e 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -40,7 +40,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Gtk::FileChooserDialog(cobject) , _merge_ports(false) { @@ -95,7 +96,9 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr patch, bool import, GraphObject::Properties data) +LoadPatchWindow::present(SharedPtr patch, + bool import, + GraphObject::Properties data) { _import = import; set_patch(patch); @@ -113,7 +116,7 @@ LoadPatchWindow::present(SharedPtr patch, bool import, GraphObject:: * This function MUST be called before using the window in any way! */ void -LoadPatchWindow::set_patch(SharedPtr patch) +LoadPatchWindow::set_patch(SharedPtr patch) { _patch = patch; _symbol_entry->set_text(""); diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp index 66aebece..cc60ef80 100644 --- a/src/gui/LoadPatchWindow.hpp +++ b/src/gui/LoadPatchWindow.hpp @@ -42,9 +42,11 @@ class LoadPatchWindow : public Gtk::FileChooserDialog public: LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - void set_patch(SharedPtr patch); + void set_patch(SharedPtr patch); - void present(SharedPtr patch, bool import, GraphObject::Properties data); + void present(SharedPtr patch, + bool import, + GraphObject::Properties data); protected: void on_show(); @@ -62,7 +64,7 @@ private: GraphObject::Properties _initial_data; - SharedPtr _patch; + SharedPtr _patch; Gtk::Label* _symbol_label; Gtk::Entry* _symbol_entry; diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 66868f18..b763c0ae 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -35,7 +35,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Window(cobject) , _name_offset(0) , _has_shown(false) @@ -107,7 +108,8 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr patch, GraphObject::Properties data) +LoadPluginWindow::present(SharedPtr patch, + GraphObject::Properties data) { set_patch(patch); _initial_data = data; @@ -148,7 +150,7 @@ LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* * This function MUST be called before using the window in any way! */ void -LoadPluginWindow::set_patch(SharedPtr patch) +LoadPluginWindow::set_patch(SharedPtr patch) { if (_patch) { _patch = patch; @@ -205,7 +207,7 @@ LoadPluginWindow::set_plugins(SharedPtr m) } void -LoadPluginWindow::new_plugin(SharedPtr pm) +LoadPluginWindow::new_plugin(SharedPtr pm) { if (is_visible()) add_plugin(pm); @@ -214,7 +216,8 @@ LoadPluginWindow::new_plugin(SharedPtr pm) } void -LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr plugin) +LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, + SharedPtr plugin) { const LV2URIMap& uris = App::instance().uris(); const Atom& name = plugin->get_property(uris.doap_name); @@ -241,14 +244,14 @@ LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr plugi } void -LoadPluginWindow::add_plugin(SharedPtr plugin) +LoadPluginWindow::add_plugin(SharedPtr plugin) { if (plugin->lilv_plugin() && lilv_plugin_is_replaced(plugin->lilv_plugin())) { return; } Gtk::TreeModel::iterator iter = _plugins_liststore->append(); - Gtk::TreeModel::Row row = *iter; + Gtk::TreeModel::Row row = *iter; _rows.insert(make_pair(plugin->uri(), iter)); set_row(row, plugin); @@ -261,7 +264,8 @@ LoadPluginWindow::add_plugin(SharedPtr plugin) ///// Event Handlers ////// void -LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col) +LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, + Gtk::TreeViewColumn* col) { add_clicked(); } @@ -279,7 +283,8 @@ LoadPluginWindow::plugin_selection_changed() *_selection->get_selected_rows().begin()); if (iter) { Gtk::TreeModel::Row row = *iter; - boost::shared_ptr p = row.get_value(_plugins_columns._col_plugin); + boost::shared_ptr p = row.get_value( + _plugins_columns._col_plugin); _name_offset = App::instance().store()->child_name_offset( _patch->path(), p->default_node_symbol()); _node_name_entry->set_text(generate_module_name(p, _name_offset)); @@ -302,7 +307,8 @@ LoadPluginWindow::plugin_selection_changed() * sends the notification back. */ string -LoadPluginWindow::generate_module_name(SharedPtr plugin, int offset) +LoadPluginWindow::generate_module_name(SharedPtr plugin, + int offset) { std::stringstream ss; ss << plugin->default_node_symbol(); @@ -314,11 +320,11 @@ LoadPluginWindow::generate_module_name(SharedPtr plugin, int offset void LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) { - const LV2URIMap& uris = App::instance().uris(); - Gtk::TreeModel::Row row = *iter; - SharedPtr plugin = row.get_value(_plugins_columns._col_plugin); - bool polyphonic = _polyphonic_checkbutton->get_active(); - string name = _node_name_entry->get_text(); + const LV2URIMap& uris = App::instance().uris(); + Gtk::TreeModel::Row row = *iter; + SharedPtr plugin = row.get_value(_plugins_columns._col_plugin); + bool polyphonic = _polyphonic_checkbutton->get_active(); + string name = _node_name_entry->get_text(); if (name.empty()) name = generate_module_name(plugin, _name_offset); diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 63ba5eb0..3ba9a590 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -50,12 +50,12 @@ class LoadPluginWindow : public Window public: LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - void set_patch(SharedPtr patch); + void set_patch(SharedPtr patch); void set_plugins(SharedPtr plugins); - void add_plugin(SharedPtr plugin); + void add_plugin(SharedPtr plugin); - void present(SharedPtr patch, GraphObject::Properties data); + void present(SharedPtr patch, GraphObject::Properties data); protected: void on_show(); @@ -79,7 +79,7 @@ private: Gtk::TreeModelColumn _col_uri; // Not displayed: - Gtk::TreeModelColumn > _col_plugin; + Gtk::TreeModelColumn< SharedPtr > _col_plugin; }; /** Column for the filter criteria combo box. */ @@ -101,8 +101,8 @@ private: void name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event); #endif - void set_row(Gtk::TreeModel::Row& row, SharedPtr plugin); - void new_plugin(SharedPtr plugin); + void set_row(Gtk::TreeModel::Row& row, SharedPtr plugin); + void new_plugin(SharedPtr plugin); void plugin_property_changed(const Raul::URI& plugin, const Raul::URI& predicate, @@ -111,13 +111,14 @@ private: void plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col); void plugin_selection_changed(); - std::string generate_module_name(SharedPtr plugin, int offset = 0); + std::string generate_module_name(SharedPtr plugin, + int offset=0); void load_plugin(const Gtk::TreeModel::iterator& iter); GraphObject::Properties _initial_data; - SharedPtr _patch; + SharedPtr _patch; typedef std::map Rows; Rows _rows; diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index 0318dba7..84b304da 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -33,7 +33,8 @@ using namespace std; namespace Ingen { namespace GUI { -LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Dialog(cobject) { xml->get_widget("load_remote_patch_treeview", _treeview); @@ -56,7 +57,8 @@ LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib } void -LoadRemotePatchWindow::present(SharedPtr patch, GraphObject::Properties data) +LoadRemotePatchWindow::present(SharedPtr patch, + GraphObject::Properties data) { _liststore->clear(); @@ -93,7 +95,7 @@ LoadRemotePatchWindow::present(SharedPtr patch, GraphObject::Propert * This function MUST be called before using the window in any way! */ void -LoadRemotePatchWindow::set_patch(SharedPtr patch) +LoadRemotePatchWindow::set_patch(SharedPtr patch) { _patch = patch; } diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp index 07be9a30..dd0bb116 100644 --- a/src/gui/LoadRemotePatchWindow.hpp +++ b/src/gui/LoadRemotePatchWindow.hpp @@ -55,11 +55,13 @@ public: class LoadRemotePatchWindow : public Dialog { public: - LoadRemotePatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + LoadRemotePatchWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml); - void set_patch(SharedPtr patch); + void set_patch(SharedPtr patch); - void present(SharedPtr patch, GraphObject::Properties data); + void present(SharedPtr patch, + GraphObject::Properties data); private: void patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col); @@ -70,7 +72,7 @@ private: GraphObject::Properties _initial_data; - SharedPtr _patch; + SharedPtr _patch; Glib::RefPtr _selection; Glib::RefPtr _liststore; diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp index 26664693..f2e2227a 100644 --- a/src/gui/NewSubpatchWindow.cpp +++ b/src/gui/NewSubpatchWindow.cpp @@ -29,7 +29,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Window(cobject) { xml->get_widget("new_subpatch_name_entry", _name_entry); @@ -46,7 +47,8 @@ NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr } void -NewSubpatchWindow::present(SharedPtr patch, GraphObject::Properties data) +NewSubpatchWindow::present(SharedPtr patch, + GraphObject::Properties data) { set_patch(patch); _initial_data = data; @@ -58,7 +60,7 @@ NewSubpatchWindow::present(SharedPtr patch, GraphObject::Properties * This function MUST be called before using the window in any way! */ void -NewSubpatchWindow::set_patch(SharedPtr patch) +NewSubpatchWindow::set_patch(SharedPtr patch) { _patch = patch; } diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp index cf05b31d..5da4c314 100644 --- a/src/gui/NewSubpatchWindow.hpp +++ b/src/gui/NewSubpatchWindow.hpp @@ -42,19 +42,21 @@ namespace GUI { class NewSubpatchWindow : public Window { public: - NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + NewSubpatchWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml); - void set_patch(SharedPtr patch); + void set_patch(SharedPtr patch); - void present(SharedPtr patch, GraphObject::Properties data); + void present(SharedPtr patch, + GraphObject::Properties data); private: void name_changed(); void ok_clicked(); void cancel_clicked(); - GraphObject::Properties _initial_data; - SharedPtr _patch; + GraphObject::Properties _initial_data; + SharedPtr _patch; Gtk::Entry* _name_entry; Gtk::Label* _message_label; diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp index ef09a68d..ebee1ad3 100644 --- a/src/gui/NodeControlWindow.cpp +++ b/src/gui/NodeControlWindow.cpp @@ -33,7 +33,8 @@ namespace GUI { /** Create a node control window and load a new ControlPanel for it. */ -NodeControlWindow::NodeControlWindow(SharedPtr node, uint32_t poly) +NodeControlWindow::NodeControlWindow(SharedPtr node, + uint32_t poly) : _node(node) , _position_stored(false) , _x(0) @@ -62,7 +63,8 @@ NodeControlWindow::NodeControlWindow(SharedPtr node, uint32_t poly) /** Create a node control window and with an existing ControlPanel. */ -NodeControlWindow::NodeControlWindow(SharedPtr node, ControlPanel* panel) +NodeControlWindow::NodeControlWindow(SharedPtr node, + ControlPanel* panel) : _node(node) , _control_panel(panel) { diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp index 4a340826..97ec7ba3 100644 --- a/src/gui/NodeControlWindow.hpp +++ b/src/gui/NodeControlWindow.hpp @@ -42,11 +42,11 @@ class ControlPanel; class NodeControlWindow : public Window { public: - NodeControlWindow(SharedPtr node, uint32_t poly); - NodeControlWindow(SharedPtr node, ControlPanel* panel); + NodeControlWindow(SharedPtr node, uint32_t poly); + NodeControlWindow(SharedPtr node, ControlPanel* panel); virtual ~NodeControlWindow(); - SharedPtr node() { return _node; } + SharedPtr node() const { return _node; } ControlPanel* control_panel() const { return _control_panel; } @@ -57,9 +57,9 @@ protected: void on_hide(); private: - SharedPtr _node; - ControlPanel* _control_panel; - bool _callback_enabled; + SharedPtr _node; + ControlPanel* _control_panel; + bool _callback_enabled; bool _position_stored; int _x; diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 793f1b39..7da1c374 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -59,21 +59,22 @@ NodeMenu::NodeMenu(BaseObjectType* cobject, const Glib::RefPtr node) +NodeMenu::init(SharedPtr node) { ObjectMenu::init(node); _learn_menuitem->signal_activate().connect(sigc::mem_fun(this, &NodeMenu::on_menu_learn)); - _controls_menuitem->signal_activate().connect(sigc::bind( - sigc::mem_fun(App::instance().window_factory(), &WindowFactory::present_controls), - node)); - _popup_gui_menuitem->signal_activate().connect(sigc::mem_fun(signal_popup_gui, - &sigc::signal::emit)); - _embed_gui_menuitem->signal_toggled().connect(sigc::mem_fun(this, - &NodeMenu::on_menu_embed_gui)); - _randomize_menuitem->signal_activate().connect(sigc::mem_fun(this, - &NodeMenu::on_menu_randomize)); + _controls_menuitem->signal_activate().connect( + sigc::bind(sigc::mem_fun(App::instance().window_factory(), + &WindowFactory::present_controls), + node)); + _popup_gui_menuitem->signal_activate().connect( + sigc::mem_fun(signal_popup_gui, &sigc::signal::emit)); + _embed_gui_menuitem->signal_toggled().connect( + sigc::mem_fun(this, &NodeMenu::on_menu_embed_gui)); + _randomize_menuitem->signal_activate().connect( + sigc::mem_fun(this, &NodeMenu::on_menu_randomize)); const PluginModel* plugin = dynamic_cast(node->plugin()); if (plugin && plugin->type() == PluginModel::LV2 && plugin->has_ui()) { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index 60aee20f..5a10e021 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -38,7 +38,7 @@ class NodeMenu : public ObjectMenu public: NodeMenu(BaseObjectType* cobject, const Glib::RefPtr& xml); - void init(SharedPtr node); + void init(SharedPtr node); bool has_control_inputs(); diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 5a6e8b44..e385c8ec 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -44,7 +44,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -NodeModule::NodeModule(boost::shared_ptr canvas, SharedPtr node) +NodeModule::NodeModule(boost::shared_ptr canvas, + SharedPtr node) : FlowCanvas::Module(canvas, node->path().symbol(), 0, 0, true, canvas->show_port_names()) , _node(node) , _gui_widget(NULL) @@ -61,7 +62,7 @@ NodeModule::NodeModule(boost::shared_ptr canvas, SharedPtrsignal_moved().connect( sigc::mem_fun(this, &NodeModule::rename)); - PluginModel* plugin = dynamic_cast(node->plugin()); + const PluginModel* plugin = dynamic_cast(node->plugin()); if (plugin) { plugin->signal_changed().connect( sigc::mem_fun(this, &NodeModule::plugin_changed)); @@ -89,12 +90,12 @@ NodeModule::create_menu() boost::shared_ptr NodeModule::create(boost::shared_ptr canvas, - SharedPtr node, + SharedPtr node, bool human) { boost::shared_ptr ret; - SharedPtr patch = PtrCast(node); + SharedPtr patch = PtrCast(node); if (patch) ret = boost::shared_ptr(new SubpatchModule(canvas, patch)); else @@ -252,7 +253,7 @@ NodeModule::rename() } void -NodeModule::add_port(SharedPtr port, bool resize_to_fit) +NodeModule::add_port(SharedPtr port, bool resize_to_fit) { Module::add_port(Port::create(PtrCast(shared_from_this()), port, App::instance().configuration()->name_style() == Configuration::HUMAN)); @@ -266,7 +267,7 @@ NodeModule::add_port(SharedPtr port, bool resize_to_fit) } boost::shared_ptr -NodeModule::port(boost::shared_ptr model) +NodeModule::port(boost::shared_ptr model) { for (PortVector::const_iterator p = ports().begin(); p != ports().end(); ++p) { SharedPtr port = PtrCast(*p); @@ -277,7 +278,7 @@ NodeModule::port(boost::shared_ptr model) } void -NodeModule::remove_port(SharedPtr model) +NodeModule::remove_port(SharedPtr model) { SharedPtr p = port(model); if (p) { diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 95ded490..78a301c5 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -50,22 +50,22 @@ class NodeModule : public FlowCanvas::Module public: static boost::shared_ptr create ( boost::shared_ptr canvas, - SharedPtr node, - bool human_names); + SharedPtr node, + bool human_names); virtual ~NodeModule(); - boost::shared_ptr port(boost::shared_ptr model); + boost::shared_ptr port(boost::shared_ptr model); - void remove_port(SharedPtr port); + void remove_port(SharedPtr port); virtual void store_location(); void show_human_names(bool b); - SharedPtr node() const { return _node; } + SharedPtr node() const { return _node; } protected: - NodeModule(boost::shared_ptr canvas, SharedPtr node); + NodeModule(boost::shared_ptr canvas, SharedPtr node); void on_double_click(GdkEventButton* ev); @@ -78,7 +78,7 @@ protected: void rename(); void property_changed(const Raul::URI& predicate, const Raul::Atom& value); - void add_port(SharedPtr port, bool resize=true); + void add_port(SharedPtr port, bool resize=true); void value_changed(uint32_t index, const Raul::Atom& value); void plugin_changed(); @@ -86,11 +86,11 @@ protected: void create_menu(); - SharedPtr _node; - NodeMenu* _menu; - SharedPtr _plugin_ui; - Gtk::Widget* _gui_widget; - Gtk::Window* _gui_window; ///< iff popped up + SharedPtr _node; + NodeMenu* _menu; + SharedPtr _plugin_ui; + Gtk::Widget* _gui_widget; + Gtk::Window* _gui_window; ///< iff popped up }; } // namespace GUI diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 82822d57..ac0dda5c 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -31,12 +31,12 @@ namespace GUI { ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr& xml) : Gtk::Menu(cobject) - , _enable_signal(false) , _polyphonic_menuitem(NULL) , _disconnect_menuitem(NULL) , _rename_menuitem(NULL) , _destroy_menuitem(NULL) , _properties_menuitem(NULL) + , _enable_signal(false) { xml->get_widget("object_learn_menuitem", _learn_menuitem); xml->get_widget("object_unlearn_menuitem", _unlearn_menuitem); @@ -48,7 +48,7 @@ ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr object) +ObjectMenu::init(SharedPtr object) { _object = object; diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index 77f90e53..ffac870d 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -41,7 +41,7 @@ class ObjectMenu : public Gtk::Menu public: ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr& xml); - void init(SharedPtr object); + void init(SharedPtr object); protected: void on_menu_learn(); @@ -53,15 +53,16 @@ protected: void property_changed(const Raul::URI& predicate, const Raul::Atom& value); - bool _enable_signal; - SharedPtr _object; - Gtk::MenuItem* _learn_menuitem; - Gtk::MenuItem* _unlearn_menuitem; - Gtk::CheckMenuItem* _polyphonic_menuitem; - Gtk::MenuItem* _disconnect_menuitem; - Gtk::MenuItem* _rename_menuitem; - Gtk::MenuItem* _destroy_menuitem; - Gtk::MenuItem* _properties_menuitem; + SharedPtr _object; + Gtk::MenuItem* _learn_menuitem; + Gtk::MenuItem* _unlearn_menuitem; + Gtk::CheckMenuItem* _polyphonic_menuitem; + Gtk::MenuItem* _disconnect_menuitem; + Gtk::MenuItem* _rename_menuitem; + Gtk::MenuItem* _destroy_menuitem; + Gtk::MenuItem* _properties_menuitem; + + bool _enable_signal; }; } // namespace GUI diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 1215b957..99110eb6 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -58,19 +58,19 @@ using namespace Raul; namespace Ingen { namespace GUI { -PatchCanvas::PatchCanvas(SharedPtr patch, int width, int height) +PatchCanvas::PatchCanvas(SharedPtr patch, int width, int height) : Canvas(width, height) , _patch(patch) , _auto_position_count(0) , _last_click_x(0) , _last_click_y(0) , _paste_count(0) - , _human_names(true) - , _show_port_names(true) , _menu(NULL) , _internal_menu(NULL) , _classless_menu(NULL) , _plugin_menu(NULL) + , _human_names(true) + , _show_port_names(true) { Glib::RefPtr xml = GladeFactory::new_glade_reference(); xml->get_widget("canvas_menu", _menu); @@ -392,13 +392,13 @@ PatchCanvas::add_plugin(SharedPtr p) } void -PatchCanvas::add_node(SharedPtr nm) +PatchCanvas::add_node(SharedPtr nm) { boost::shared_ptr shared_this = boost::dynamic_pointer_cast(shared_from_this()); - SharedPtr pm = PtrCast(nm); - SharedPtr module; + SharedPtr pm = PtrCast(nm); + SharedPtr module; if (pm) { module = SubpatchModule::create(shared_this, pm, _human_names); } else { @@ -414,7 +414,7 @@ PatchCanvas::add_node(SharedPtr nm) } void -PatchCanvas::remove_node(SharedPtr nm) +PatchCanvas::remove_node(SharedPtr nm) { Views::iterator i = _views.find(nm); @@ -425,7 +425,7 @@ PatchCanvas::remove_node(SharedPtr nm) } void -PatchCanvas::add_port(SharedPtr pm) +PatchCanvas::add_port(SharedPtr pm) { boost::shared_ptr shared_this = boost::dynamic_pointer_cast(shared_from_this()); @@ -437,7 +437,7 @@ PatchCanvas::add_port(SharedPtr pm) } void -PatchCanvas::remove_port(SharedPtr pm) +PatchCanvas::remove_port(SharedPtr pm) { Views::iterator i = _views.find(pm); @@ -483,7 +483,7 @@ PatchCanvas::get_port_view(SharedPtr port) } void -PatchCanvas::connection(SharedPtr cm) +PatchCanvas::connection(SharedPtr cm) { assert(cm); @@ -491,8 +491,10 @@ PatchCanvas::connection(SharedPtr cm) const SharedPtr dst = get_port_view(cm->dst_port()); if (src && dst) { - add_connection(boost::shared_ptr(new GUI::Connection(shared_from_this(), - cm, src, dst, src->color() + 0x22222200))); + add_connection( + boost::shared_ptr( + new GUI::Connection(shared_from_this(), cm, src, dst, + src->color() + 0x22222200))); } else { LOG(error) << "Unable to find ports to connect " << cm->src_port_path() << " -> " << cm->dst_port_path() << endl; @@ -500,7 +502,7 @@ PatchCanvas::connection(SharedPtr cm) } void -PatchCanvas::disconnection(SharedPtr cm) +PatchCanvas::disconnection(SharedPtr cm) { const SharedPtr src = get_port_view(cm->src_port()); const SharedPtr dst = get_port_view(cm->dst_port()); @@ -761,7 +763,8 @@ PatchCanvas::paste() } // Successful connections - SharedPtr root = PtrCast(clipboard.object(_patch->path())); + SharedPtr root = PtrCast( + clipboard.object(_patch->path())); assert(root); for (Patch::Connections::const_iterator i = root->connections().begin(); i != root->connections().end(); ++i) { diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index 1263b8ac..d5f30b49 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -56,7 +56,7 @@ class NodeModule; class PatchCanvas : public FlowCanvas::Canvas { public: - PatchCanvas(SharedPtr patch, int width, int height); + PatchCanvas(SharedPtr patch, int width, int height); virtual ~PatchCanvas() {} @@ -67,12 +67,12 @@ public: bool show_port_names() const { return _show_port_names; } void add_plugin(SharedPtr pm); - void add_node(SharedPtr nm); - void remove_node(SharedPtr nm); - void add_port(SharedPtr pm); - void remove_port(SharedPtr pm); - void connection(SharedPtr cm); - void disconnection(SharedPtr cm); + void add_node(SharedPtr nm); + void remove_node(SharedPtr nm); + void add_port(SharedPtr pm); + void remove_port(SharedPtr pm); + void connection(SharedPtr cm); + void disconnection(SharedPtr cm); void get_new_module_location(double& x, double& y); @@ -131,9 +131,11 @@ private: void disconnect(boost::shared_ptr src, boost::shared_ptr dst); - SharedPtr _patch; + SharedPtr _patch; - typedef std::map, SharedPtr > Views; + typedef std::map, + SharedPtr + > Views; Views _views; int _auto_position_count; @@ -153,8 +155,6 @@ private: ClassMenus _class_menus; - bool _human_names; - bool _show_port_names; Gtk::Menu* _menu; Gtk::Menu* _internal_menu; Gtk::Menu* _classless_menu; @@ -169,6 +169,9 @@ private: Gtk::MenuItem* _menu_load_patch; Gtk::MenuItem* _menu_new_patch; Gtk::CheckMenuItem* _menu_edit; + + bool _human_names; + bool _show_port_names; }; } // namespace GUI diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 998e8a97..b491e249 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -38,14 +38,15 @@ using namespace Raul; namespace Ingen { namespace GUI { -PatchPortModule::PatchPortModule(boost::shared_ptr canvas, SharedPtr model) +PatchPortModule::PatchPortModule(boost::shared_ptr canvas, + SharedPtr model) : FlowCanvas::Module(canvas, "", 0, 0, false) // FIXME: coords? , _model(model) { assert(canvas); assert(model); - assert(PtrCast(model->parent())); + assert(PtrCast(model->parent())); set_stacked_border(model->polyphonic()); @@ -54,7 +55,9 @@ PatchPortModule::PatchPortModule(boost::shared_ptr canvas, SharedPt } boost::shared_ptr -PatchPortModule::create(boost::shared_ptr canvas, SharedPtr model, bool human) +PatchPortModule::create(boost::shared_ptr canvas, + SharedPtr model, + bool human) { boost::shared_ptr ret(new PatchPortModule(canvas, model)); boost::shared_ptr port(Port::create(ret, model, human, true)); diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index 68bf4505..7cdc3653 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -49,19 +49,21 @@ class PortMenu; class PatchPortModule : public FlowCanvas::Module { public: - static boost::shared_ptr create(boost::shared_ptr canvas, - SharedPtr model, - bool human); + static boost::shared_ptr create( + boost::shared_ptr canvas, + SharedPtr model, + bool human); virtual void store_location(); void show_human_names(bool b); void set_name(const std::string& n); - SharedPtr port() const { return _model; } + SharedPtr port() const { return _model; } protected: - PatchPortModule(boost::shared_ptr canvas, SharedPtr model); + PatchPortModule(boost::shared_ptr canvas, + SharedPtr model); void create_menu(); void set_selected(bool b); @@ -70,9 +72,9 @@ protected: void property_changed(const Raul::URI& predicate, const Raul::Atom& value); - SharedPtr _model; - SharedPtr _port; - PortMenu* _menu; + SharedPtr _model; + SharedPtr _port; + PortMenu* _menu; }; } // namespace GUI diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp index 65c3566a..4df3d4b7 100644 --- a/src/gui/PatchView.cpp +++ b/src/gui/PatchView.cpp @@ -36,7 +36,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr& xml) +PatchView::PatchView(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Gtk::Box(cobject) , _breadcrumb_container(NULL) , _enable_signal(true) @@ -61,7 +62,7 @@ PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr patch) +PatchView::set_patch(SharedPtr patch) { assert(!_canvas); // FIXME: remove @@ -114,7 +115,7 @@ PatchView::set_patch(SharedPtr patch) } SharedPtr -PatchView::create(SharedPtr patch) +PatchView::create(SharedPtr patch) { const Glib::RefPtr& xml = GladeFactory::new_glade_reference("patch_view_box"); PatchView* result = NULL; @@ -152,7 +153,7 @@ PatchView::canvas_item_entered(Gnome::Canvas::Item* item) if (m) signal_object_entered.emit(m->node().get()); - Port* p = dynamic_cast(item); + const Port* p = dynamic_cast(item); if (p) signal_object_entered.emit(p->model().get()); } @@ -166,7 +167,7 @@ PatchView::canvas_item_left(Gnome::Canvas::Item* item) return; } - Port* p = dynamic_cast(item); + const Port* p = dynamic_cast(item); if (p) signal_object_left.emit(p->model().get()); } diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index 5995cd42..f637ce5d 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -54,21 +54,22 @@ class SubpatchModule; class PatchView : public Gtk::Box { public: - PatchView(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); + PatchView(BaseObjectType* cobject, + const Glib::RefPtr& glade_xml); - SharedPtr canvas() const { return _canvas; } - SharedPtr patch() const { return _patch; } - Gtk::ToolItem* breadcrumb_container() const { return _breadcrumb_container; } + SharedPtr canvas() const { return _canvas; } + SharedPtr patch() const { return _patch; } + Gtk::ToolItem* breadcrumb_container() const { return _breadcrumb_container; } void set_editable(bool editable); - static SharedPtr create(SharedPtr patch); + static SharedPtr create(SharedPtr patch); - sigc::signal signal_object_entered; - sigc::signal signal_object_left; + sigc::signal signal_object_entered; + sigc::signal signal_object_left; private: - void set_patch(SharedPtr patch); + void set_patch(SharedPtr patch); void process_toggled(); void poly_changed(); @@ -84,8 +85,8 @@ private: void zoom_full(); - SharedPtr _patch; - SharedPtr _canvas; + SharedPtr _patch; + SharedPtr _canvas; Gtk::ScrolledWindow* _canvas_scrolledwindow; diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp index ab8fcfd9..844cac81 100644 --- a/src/gui/PatchWindow.cpp +++ b/src/gui/PatchWindow.cpp @@ -189,7 +189,8 @@ PatchWindow::set_patch_from_path(const Path& path, SharedPtr view) assert(view->patch()->path() == path); App::instance().window_factory()->present_patch(view->patch(), this, view); } else { - SharedPtr model = PtrCast(App::instance().store()->object(path)); + SharedPtr model = PtrCast( + App::instance().store()->object(path)); if (model) App::instance().window_factory()->present_patch(model, this); } @@ -200,7 +201,8 @@ PatchWindow::set_patch_from_path(const Path& path, SharedPtr view) * If @a view is NULL, a new view will be created. */ void -PatchWindow::set_patch(SharedPtr patch, SharedPtr view) +PatchWindow::set_patch(SharedPtr patch, + SharedPtr view) { if (!patch || patch == _patch) return; @@ -271,7 +273,7 @@ PatchWindow::set_patch(SharedPtr patch, SharedPtr view) } void -PatchWindow::patch_port_added(SharedPtr port) +PatchWindow::patch_port_added(SharedPtr port) { if (port->is_input() && App::instance().can_control(port.get())) { _menu_view_control_window->property_sensitive() = true; @@ -279,7 +281,7 @@ PatchWindow::patch_port_added(SharedPtr port) } void -PatchWindow::patch_port_removed(SharedPtr port) +PatchWindow::patch_port_removed(SharedPtr port) { if (!(port->is_input() && App::instance().can_control(port.get()))) return; @@ -296,19 +298,19 @@ PatchWindow::patch_port_removed(SharedPtr port) } void -PatchWindow::show_status(ObjectModel* model) +PatchWindow::show_status(const ObjectModel* model) { std::stringstream msg; msg << model->path().chop_scheme(); - PortModel* port = 0; - NodeModel* node = 0; + const PortModel* port = 0; + const NodeModel* node = 0; - if ((port = dynamic_cast(model))) { + if ((port = dynamic_cast(model))) { show_port_status(port, port->value()); - } else if ((node = dynamic_cast(model))) { - PluginModel* plugin = dynamic_cast(node->plugin()); + } else if ((node = dynamic_cast(model))) { + const PluginModel* plugin = dynamic_cast(node->plugin()); if (plugin) msg << ((boost::format(" (%1%)") % plugin->human_name()).str()); _status_bar->push(msg.str(), STATUS_CONTEXT_HOVER); @@ -316,12 +318,12 @@ PatchWindow::show_status(ObjectModel* model) } void -PatchWindow::show_port_status(PortModel* port, const Raul::Atom& value) +PatchWindow::show_port_status(const PortModel* port, const Raul::Atom& value) { std::stringstream msg; msg << port->path().chop_scheme(); - NodeModel* parent = dynamic_cast(port->parent().get()); + const NodeModel* parent = dynamic_cast(port->parent().get()); if (parent) { const PluginModel* plugin = dynamic_cast(parent->plugin()); if (plugin) { @@ -340,13 +342,13 @@ PatchWindow::show_port_status(PortModel* port, const Raul::Atom& value) } void -PatchWindow::object_entered(ObjectModel* model) +PatchWindow::object_entered(const ObjectModel* model) { show_status(model); } void -PatchWindow::object_left(ObjectModel* model) +PatchWindow::object_left(const ObjectModel* model) { _status_bar->pop(STATUS_CONTEXT_HOVER); } @@ -462,7 +464,7 @@ PatchWindow::event_save_as() continue; } - _patch->set_property(uris.lv2_symbol, Atom(symbol.c_str())); + //_patch->set_property(uris.lv2_symbol, Atom(symbol.c_str())); bool confirm = true; if (Glib::file_test(filename, Glib::FILE_TEST_IS_DIR)) { @@ -495,7 +497,7 @@ more files and/or directories, recursively. Existing files will be overwritten. if (confirm) { const Glib::ustring uri = Glib::filename_to_uri(filename); App::instance().loader()->save_patch(_patch, uri); - _patch->set_property(uris.ingen_document, Atom(Atom::URI, uri.c_str())); + //_patch->set_property(uris.ingen_document, Atom(Atom::URI, uri.c_str())); _status_bar->push( (boost::format("Saved %1% to %2%") % _patch->path().chop_scheme() % filename).str(), diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp index aef759d4..420359a0 100644 --- a/src/gui/PatchWindow.hpp +++ b/src/gui/PatchWindow.hpp @@ -59,13 +59,13 @@ public: Gtk::TextView* doc_textview() { return _doc_textview; } void set_patch_from_path(const Raul::Path& path, SharedPtr view); - void set_patch(SharedPtr pc, SharedPtr view); + void set_patch(SharedPtr pc, SharedPtr view); - SharedPtr patch() const { return _patch; } + SharedPtr patch() const { return _patch; } Gtk::MenuItem* menu_view_control_window() { return _menu_view_control_window; } - void show_port_status(PortModel* model, const Raul::Atom& value); + void show_port_status(const PortModel* model, const Raul::Atom& value); protected: void on_show(); @@ -73,11 +73,11 @@ protected: bool on_event(GdkEvent* event); private: - void patch_port_added(SharedPtr port); - void patch_port_removed(SharedPtr port); - void show_status(ObjectModel* model); - void object_entered(ObjectModel* model); - void object_left(ObjectModel* model); + void patch_port_added(SharedPtr port); + void patch_port_removed(SharedPtr port); + void show_status(const ObjectModel* model); + void object_entered(const ObjectModel* model); + void object_left(const ObjectModel* model); void editable_changed(bool editable); void event_import(); @@ -106,8 +106,8 @@ private: void event_show_engine(); void event_clipboard_changed(GdkEventOwnerChange* ev); - SharedPtr _patch; - SharedPtr _view; + SharedPtr _patch; + SharedPtr _view; sigc::connection new_port_connection; sigc::connection removed_port_connection; diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index afb46f4d..0ebc3418 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -41,11 +41,10 @@ namespace GUI { ArtVpathDash* Port::_dash; SharedPtr -Port::create( - boost::shared_ptr module, - SharedPtr pm, - bool human_name, - bool flip) +Port::create(boost::shared_ptr module, + SharedPtr pm, + bool human_name, + bool flip) { Glib::ustring label(human_name ? "" : pm->path().symbol()); if (human_name) { @@ -63,11 +62,10 @@ Port::create( /** @a flip Make an input port appear as an output port, and vice versa. */ -Port::Port( - boost::shared_ptr module, - SharedPtr pm, - const string& name, - bool flip) +Port::Port(boost::shared_ptr module, + SharedPtr pm, + const string& name, + bool flip) : FlowCanvas::Port(module, name, flip ? (!pm->is_input()) : pm->is_input(), App::instance().configuration()->get_port_color(pm.get())) @@ -111,9 +109,9 @@ Port::~Port() void Port::update_metadata() { - SharedPtr pm = _port_model.lock(); + SharedPtr pm = _port_model.lock(); if (App::instance().can_control(pm.get()) && pm->is_numeric()) { - boost::shared_ptr parent = PtrCast(pm->parent()); + boost::shared_ptr parent = PtrCast(pm->parent()); if (parent) { float min = 0.0f; float max = 1.0f; @@ -184,10 +182,10 @@ Port::set_control(float value, bool signal) app.engine()->set_property(model()->path(), world->uris()->ingen_value, Atom(value)); PatchWindow* pw = app.window_factory()->patch_window( - PtrCast(model()->parent())); + PtrCast(model()->parent())); if (!pw) pw = app.window_factory()->patch_window( - PtrCast(model()->parent()->parent())); + PtrCast(model()->parent()->parent())); if (pw) pw->show_port_status(model().get(), value); } @@ -225,7 +223,7 @@ ArtVpathDash* Port::dash() { const LV2URIMap& uris = App::instance().uris(); - SharedPtr pm = _port_model.lock(); + SharedPtr pm = _port_model.lock(); if (!pm) return NULL; @@ -248,11 +246,11 @@ Port::set_selected(bool b) { if (b != selected()) { FlowCanvas::Port::set_selected(b); - SharedPtr pm = _port_model.lock(); + SharedPtr pm = _port_model.lock(); if (pm && b) { - const App& app = App::instance(); - SharedPtr node = PtrCast(pm->parent()); - PatchWindow* win = app.window_factory()->parent_patch_window(node); + const App& app = App::instance(); + SharedPtr node = PtrCast(pm->parent()); + PatchWindow* win = app.window_factory()->parent_patch_window(node); if (win) { const std::string& doc = node->plugin_model()->port_documentation( pm->index()); diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index 116f31d4..a84f9e69 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -42,13 +42,13 @@ class Port : public FlowCanvas::Port public: static SharedPtr create( boost::shared_ptr module, - SharedPtr pm, + SharedPtr pm, bool human_name, bool flip=false); ~Port(); - SharedPtr model() const { return _port_model.lock(); } + SharedPtr model() const { return _port_model.lock(); } void create_menu(); void update_metadata(); @@ -63,9 +63,9 @@ public: private: Port(boost::shared_ptr module, - SharedPtr pm, + SharedPtr pm, const std::string& name, - bool flip=false); + bool flip = false); void property_changed(const Raul::URI& key, const Raul::Atom& value); @@ -74,9 +74,9 @@ private: static ArtVpathDash* _dash; - WeakPtr _port_model; - bool _pressed; - bool _flipped; + WeakPtr _port_model; + bool _pressed; + bool _flipped; }; } // namespace GUI diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 079e3c3e..7d1e765b 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -29,7 +29,8 @@ namespace Ingen { namespace GUI { -PortMenu::PortMenu(BaseObjectType* cobject, const Glib::RefPtr& xml) +PortMenu::PortMenu(BaseObjectType* cobject, + const Glib::RefPtr& xml) : ObjectMenu(cobject, xml) , _patch_port(NULL) { @@ -40,7 +41,7 @@ PortMenu::PortMenu(BaseObjectType* cobject, const Glib::RefPtr port, bool patch_port) +PortMenu::init(SharedPtr port, bool patch_port) { ObjectMenu::init(port); _patch_port = patch_port; @@ -97,9 +98,9 @@ PortMenu::on_menu_disconnect() void PortMenu::on_menu_set_min() { - const LV2URIMap& uris = App::instance().uris(); - SharedPtr model = PtrCast(_object); - const Raul::Atom& value = model->get_property(uris.ingen_value); + const LV2URIMap& uris = App::instance().uris(); + SharedPtr model = PtrCast(_object); + const Raul::Atom& value = model->get_property(uris.ingen_value); if (value.is_valid()) App::instance().engine()->set_property(_object->path(), uris.lv2_minimum, value); } @@ -107,9 +108,9 @@ PortMenu::on_menu_set_min() void PortMenu::on_menu_set_max() { - const LV2URIMap& uris = App::instance().uris(); - SharedPtr model = PtrCast(_object); - const Raul::Atom& value = model->get_property(uris.ingen_value); + const LV2URIMap& uris = App::instance().uris(); + SharedPtr model = PtrCast(_object); + const Raul::Atom& value = model->get_property(uris.ingen_value); if (value.is_valid()) App::instance().engine()->set_property(_object->path(), uris.lv2_maximum, value); } @@ -117,9 +118,9 @@ PortMenu::on_menu_set_max() void PortMenu::on_menu_reset_range() { - const LV2URIMap& uris = App::instance().uris(); - SharedPtr model = PtrCast(_object); - SharedPtr parent = PtrCast(_object->parent()); + const LV2URIMap& uris = App::instance().uris(); + SharedPtr model = PtrCast(_object); + SharedPtr parent = PtrCast(_object->parent()); float min, max; parent->default_port_value_range(model, min, max); diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index 21c18560..2eec5e02 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -36,9 +36,10 @@ namespace GUI { class PortMenu : public ObjectMenu { public: - PortMenu(BaseObjectType* cobject, const Glib::RefPtr& xml); + PortMenu(BaseObjectType* cobject, + const Glib::RefPtr& xml); - void init(SharedPtr port, bool patch_port = false); + void init(SharedPtr port, bool patch_port=false); private: void on_menu_disconnect(); diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index 3258c480..2d317456 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -32,7 +32,8 @@ namespace Ingen { using namespace Client; namespace GUI { -PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) : Window(cobject) , _initial_min(0.0f) , _initial_max(1.0f) @@ -53,7 +54,7 @@ PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, const Glib:: * This function MUST be called before using this object in any way. */ void -PortPropertiesWindow::present(SharedPtr pm) +PortPropertiesWindow::present(SharedPtr pm) { assert(pm); diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp index 05276434..3358e1fb 100644 --- a/src/gui/PortPropertiesWindow.hpp +++ b/src/gui/PortPropertiesWindow.hpp @@ -36,9 +36,10 @@ namespace GUI { class PortPropertiesWindow : public Window { public: - PortPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + PortPropertiesWindow(BaseObjectType* cobject, + const Glib::RefPtr& refGlade); - void present(SharedPtr port_model); + void present(SharedPtr port_model); private: void property_changed(const Raul::URI& key, const Raul::Atom& value); @@ -51,12 +52,12 @@ private: float _initial_min; float _initial_max; - SharedPtr _port_model; - Gtk::SpinButton* _min_spinner; - Gtk::SpinButton* _max_spinner; - Gtk::Button* _cancel_button; - Gtk::Button* _ok_button; - std::list _connections; + SharedPtr _port_model; + Gtk::SpinButton* _min_spinner; + Gtk::SpinButton* _max_spinner; + Gtk::Button* _cancel_button; + Gtk::Button* _ok_button; + std::list _connections; }; } // namespace GUI diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 491a255e..26436022 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -32,7 +32,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -PropertiesWindow::PropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) +PropertiesWindow::PropertiesWindow(BaseObjectType* cobject, + const Glib::RefPtr& glade_xml) : Window(cobject) { glade_xml->get_widget("properties_vbox", _vbox); @@ -74,11 +75,18 @@ PropertiesWindow::reset() _model.reset(); } +void +PropertiesWindow::present(SharedPtr model) +{ + set_object(model); + Gtk::Window::present(); +} + /** Set the node this window is associated with. * This function MUST be called before using this object in any way. */ void -PropertiesWindow::set_object(SharedPtr model) +PropertiesWindow::set_object(SharedPtr model) { reset(); _model = model; diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp index 17968c89..cdde7495 100644 --- a/src/gui/PropertiesWindow.hpp +++ b/src/gui/PropertiesWindow.hpp @@ -38,10 +38,11 @@ namespace GUI { class PropertiesWindow : public Window { public: - PropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + PropertiesWindow(BaseObjectType* cobject, + const Glib::RefPtr& refGlade); - void present(SharedPtr model) { set_object(model); Gtk::Window::present(); } - void set_object(SharedPtr model); + void present(SharedPtr model); + void set_object(SharedPtr model); private: /** Record of a property (row in the table) */ @@ -83,14 +84,14 @@ private: TypeColumns _type_cols; Glib::RefPtr _type_choices; - SharedPtr _model; - sigc::connection _property_connection; - Gtk::VBox* _vbox; - Gtk::ScrolledWindow* _scrolledwindow; - Gtk::Table* _table; - Gtk::Button* _cancel_button; - Gtk::Button* _apply_button; - Gtk::Button* _ok_button; + SharedPtr _model; + sigc::connection _property_connection; + Gtk::VBox* _vbox; + Gtk::ScrolledWindow* _scrolledwindow; + Gtk::Table* _table; + Gtk::Button* _cancel_button; + Gtk::Button* _apply_button; + Gtk::Button* _ok_button; }; } // namespace GUI diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 7b8844f1..0ca8b7d0 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -30,7 +30,8 @@ using namespace Raul; namespace Ingen { namespace GUI { -RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) +RenameWindow::RenameWindow(BaseObjectType* cobject, + const Glib::RefPtr& glade_xml) : Window(cobject) { glade_xml->get_widget("rename_symbol_entry", _symbol_entry); @@ -39,10 +40,14 @@ RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtrget_widget("rename_cancel_button", _cancel_button); glade_xml->get_widget("rename_ok_button", _ok_button); - _symbol_entry->signal_changed().connect(sigc::mem_fun(this, &RenameWindow::values_changed)); - _label_entry->signal_changed().connect(sigc::mem_fun(this, &RenameWindow::values_changed)); - _cancel_button->signal_clicked().connect(sigc::mem_fun(this, &RenameWindow::cancel_clicked)); - _ok_button->signal_clicked().connect(sigc::mem_fun(this, &RenameWindow::ok_clicked)); + _symbol_entry->signal_changed().connect( + sigc::mem_fun(this, &RenameWindow::values_changed)); + _label_entry->signal_changed().connect( + sigc::mem_fun(this, &RenameWindow::values_changed)); + _cancel_button->signal_clicked().connect( + sigc::mem_fun(this, &RenameWindow::cancel_clicked)); + _ok_button->signal_clicked().connect( + sigc::mem_fun(this, &RenameWindow::ok_clicked)); _ok_button->property_sensitive() = false; } @@ -51,7 +56,7 @@ RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr object) +RenameWindow::set_object(SharedPtr object) { _object = object; _symbol_entry->set_text(object->path().symbol()); @@ -61,7 +66,7 @@ RenameWindow::set_object(SharedPtr object) } void -RenameWindow::present(SharedPtr object) +RenameWindow::present(SharedPtr object) { set_object(object); _symbol_entry->grab_focus(); @@ -79,7 +84,7 @@ RenameWindow::values_changed() } else if (!Path::is_valid_name(symbol)) { _message_label->set_text("Symbol contains invalid characters"); _ok_button->property_sensitive() = false; - } else if (App::instance().store()->object(_object->parent()->path().base() + symbol)) { + } else if (App::instance().store()->object(_object->parent()->path().child(symbol))) { _message_label->set_text("An object already exists with that path"); _ok_button->property_sensitive() = false; } else if (label.empty()) { diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp index 756af189..ede09f4b 100644 --- a/src/gui/RenameWindow.hpp +++ b/src/gui/RenameWindow.hpp @@ -36,24 +36,25 @@ namespace GUI { class RenameWindow : public Window { public: - RenameWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + RenameWindow(BaseObjectType* cobject, + const Glib::RefPtr& refGlade); - void present(SharedPtr object); + void present(SharedPtr object); private: - void set_object(SharedPtr object); + void set_object(SharedPtr object); void values_changed(); void cancel_clicked(); void ok_clicked(); - SharedPtr _object; + SharedPtr _object; - Gtk::Entry* _symbol_entry; - Gtk::Entry* _label_entry; - Gtk::Label* _message_label; - Gtk::Button* _cancel_button; - Gtk::Button* _ok_button; + Gtk::Entry* _symbol_entry; + Gtk::Entry* _label_entry; + Gtk::Label* _message_label; + Gtk::Button* _cancel_button; + Gtk::Button* _ok_button; }; } // namespace GUI diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index e2347bdd..b0f43fa7 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -30,7 +30,8 @@ namespace Ingen { namespace GUI { -SubpatchModule::SubpatchModule(boost::shared_ptr canvas, SharedPtr patch) +SubpatchModule::SubpatchModule(boost::shared_ptr canvas, + SharedPtr patch) : NodeModule(canvas, patch) , _patch(patch) { diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index e5fb87c9..7eba97a2 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -46,7 +46,8 @@ class NodeControlWindow; class SubpatchModule : public NodeModule { public: - SubpatchModule(boost::shared_ptr canvas, SharedPtr controller); + SubpatchModule(boost::shared_ptr canvas, + SharedPtr controller); virtual ~SubpatchModule() {} void on_double_click(GdkEventButton* ev); @@ -54,10 +55,10 @@ public: void browse_to_patch(); void menu_remove(); - SharedPtr patch() { return _patch; } + SharedPtr patch() const { return _patch; } protected: - SharedPtr _patch; + SharedPtr _patch; }; } // namespace GUI diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 7a7a3ede..31f77893 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -101,7 +101,8 @@ ThreadedLoader::load_patch(bool merge, } void -ThreadedLoader::save_patch(SharedPtr model, const string& filename) +ThreadedLoader::save_patch(SharedPtr model, + const string& filename) { _mutex.lock(); @@ -115,7 +116,8 @@ ThreadedLoader::save_patch(SharedPtr model, const string& filename) } void -ThreadedLoader::save_patch_event(SharedPtr model, const string& filename) +ThreadedLoader::save_patch_event(SharedPtr model, + const string& filename) { if (App::instance().serialiser()) { if (filename.find(INGEN_BUNDLE_EXT) != string::npos) diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index c35da81f..41f56340 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -62,13 +62,12 @@ public: optional engine_symbol, optional engine_data); - void save_patch(SharedPtr model, const string& filename); + void save_patch(SharedPtr model, const string& filename); SharedPtr parser(); private: - - void save_patch_event(SharedPtr model, const string& filename); + void save_patch_event(SharedPtr model, const string& filename); /** Returns nothing and takes no parameters (because they have all been bound) */ typedef sigc::slot Closure; diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index c0f53ee7..56f4dd74 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -63,10 +63,12 @@ WindowFactory::WindowFactory() WindowFactory::~WindowFactory() { - for (PatchWindowMap::iterator i = _patch_windows.begin(); i != _patch_windows.end(); ++i) + for (PatchWindowMap::iterator i = _patch_windows.begin(); + i != _patch_windows.end(); ++i) delete i->second; - for (ControlWindowMap::iterator i = _control_windows.begin(); i != _control_windows.end(); ++i) + for (ControlWindowMap::iterator i = _control_windows.begin(); + i != _control_windows.end(); ++i) delete i->second; } @@ -74,12 +76,14 @@ WindowFactory::~WindowFactory() void WindowFactory::clear() { - for (PatchWindowMap::iterator i = _patch_windows.begin(); i != _patch_windows.end(); ++i) + for (PatchWindowMap::iterator i = _patch_windows.begin(); + i != _patch_windows.end(); ++i) delete i->second; _patch_windows.clear(); - for (ControlWindowMap::iterator i = _control_windows.begin(); i != _control_windows.end(); ++i) + for (ControlWindowMap::iterator i = _control_windows.begin(); + i != _control_windows.end(); ++i) delete i->second; _control_windows.clear(); @@ -91,7 +95,8 @@ size_t WindowFactory::num_open_patch_windows() { size_t ret = 0; - for (PatchWindowMap::iterator i = _patch_windows.begin(); i != _patch_windows.end(); ++i) + for (PatchWindowMap::iterator i = _patch_windows.begin(); + i != _patch_windows.end(); ++i) if (i->second->is_visible()) ++ret; @@ -99,7 +104,7 @@ WindowFactory::num_open_patch_windows() } PatchWindow* -WindowFactory::patch_window(SharedPtr patch) +WindowFactory::patch_window(SharedPtr patch) { if (!patch) return NULL; @@ -110,7 +115,7 @@ WindowFactory::patch_window(SharedPtr patch) } PatchWindow* -WindowFactory::parent_patch_window(SharedPtr node) +WindowFactory::parent_patch_window(SharedPtr node) { if (!node) return NULL; @@ -119,7 +124,7 @@ WindowFactory::parent_patch_window(SharedPtr node) } NodeControlWindow* -WindowFactory::control_window(SharedPtr node) +WindowFactory::control_window(SharedPtr node) { ControlWindowMap::iterator w = _control_windows.find(node->path()); @@ -129,11 +134,13 @@ WindowFactory::control_window(SharedPtr node) /** Present a PatchWindow for a Patch. * * If @a preferred is not NULL, it will be set to display @a patch if the patch - * does not already have a visible window, otherwise that window will be presented and - * @a preferred left unmodified. + * does not already have a visible window, otherwise that window will be + * presented and @a preferred left unmodified. */ void -WindowFactory::present_patch(SharedPtr patch, PatchWindow* preferred, SharedPtr view) +WindowFactory::present_patch(SharedPtr patch, + PatchWindow* preferred, + SharedPtr view) { assert( !view || view->patch() == patch); @@ -157,7 +164,8 @@ WindowFactory::present_patch(SharedPtr patch, PatchWindow* preferred } PatchWindow* -WindowFactory::new_patch_window(SharedPtr patch, SharedPtr view) +WindowFactory::new_patch_window(SharedPtr patch, + SharedPtr view) { assert( !view || view->patch() == patch); @@ -193,7 +201,7 @@ WindowFactory::remove_patch_window(PatchWindow* win, GdkEventAny* ignored) } void -WindowFactory::present_controls(SharedPtr node) +WindowFactory::present_controls(SharedPtr node) { NodeControlWindow* win = control_window(node); @@ -206,7 +214,7 @@ WindowFactory::present_controls(SharedPtr node) } NodeControlWindow* -WindowFactory::new_control_window(SharedPtr node) +WindowFactory::new_control_window(SharedPtr node) { uint32_t poly = 1; if (node->polyphonic() && node->parent()) @@ -236,7 +244,8 @@ WindowFactory::remove_control_window(NodeControlWindow* win, GdkEventAny* ignore } void -WindowFactory::present_load_plugin(SharedPtr patch, GraphObject::Properties data) +WindowFactory::present_load_plugin(SharedPtr patch, + GraphObject::Properties data) { PatchWindowMap::iterator w = _patch_windows.find(patch->path()); @@ -248,12 +257,14 @@ WindowFactory::present_load_plugin(SharedPtr patch, GraphObject::Pro int width, height; w->second->get_size(width, height); _load_plugin_win->set_default_size(width - width / 8, height / 2); - _load_plugin_win->set_title(string("Load Plugin - ") + patch->path().chop_scheme() + " - Ingen"); + _load_plugin_win->set_title( + string("Load Plugin - ") + patch->path().chop_scheme() + " - Ingen"); _load_plugin_win->present(patch, data); } void -WindowFactory::present_load_patch(SharedPtr patch, GraphObject::Properties data) +WindowFactory::present_load_patch(SharedPtr patch, + GraphObject::Properties data) { PatchWindowMap::iterator w = _patch_windows.find(patch->path()); @@ -264,7 +275,8 @@ WindowFactory::present_load_patch(SharedPtr patch, GraphObject::Prop } void -WindowFactory::present_load_subpatch(SharedPtr patch, GraphObject::Properties data) +WindowFactory::present_load_subpatch(SharedPtr patch, + GraphObject::Properties data) { PatchWindowMap::iterator w = _patch_windows.find(patch->path()); @@ -275,7 +287,8 @@ WindowFactory::present_load_subpatch(SharedPtr patch, GraphObject::P } void -WindowFactory::present_load_remote_patch(SharedPtr patch, GraphObject::Properties data) +WindowFactory::present_load_remote_patch(SharedPtr patch, + GraphObject::Properties data) { PatchWindowMap::iterator w = _patch_windows.find(patch->path()); @@ -286,7 +299,7 @@ WindowFactory::present_load_remote_patch(SharedPtr patch, GraphObjec } void -WindowFactory::present_upload_patch(SharedPtr patch) +WindowFactory::present_upload_patch(SharedPtr patch) { #ifdef HAVE_CURL PatchWindowMap::iterator w = _patch_windows.find(patch->path()); @@ -299,7 +312,8 @@ WindowFactory::present_upload_patch(SharedPtr patch) } void -WindowFactory::present_new_subpatch(SharedPtr patch, GraphObject::Properties data) +WindowFactory::present_new_subpatch(SharedPtr patch, + GraphObject::Properties data) { PatchWindowMap::iterator w = _patch_windows.find(patch->path()); @@ -310,7 +324,7 @@ WindowFactory::present_new_subpatch(SharedPtr patch, GraphObject::Pr } void -WindowFactory::present_rename(SharedPtr object) +WindowFactory::present_rename(SharedPtr object) { PatchWindowMap::iterator w = _patch_windows.find(object->path()); if (w == _patch_windows.end()) @@ -323,7 +337,7 @@ WindowFactory::present_rename(SharedPtr object) } void -WindowFactory::present_properties(SharedPtr object) +WindowFactory::present_properties(SharedPtr object) { PatchWindowMap::iterator w = _patch_windows.find(object->path()); if (w == _patch_windows.end()) diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index d07c7dba..46445ffb 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -60,26 +60,26 @@ public: size_t num_open_patch_windows(); - PatchWindow* patch_window(SharedPtr patch); - PatchWindow* parent_patch_window(SharedPtr node); - NodeControlWindow* control_window(SharedPtr node); + PatchWindow* patch_window(SharedPtr patch); + PatchWindow* parent_patch_window(SharedPtr node); + NodeControlWindow* control_window(SharedPtr node); - void present_patch(SharedPtr model, + void present_patch(SharedPtr model, PatchWindow* preferred = NULL, SharedPtr view = SharedPtr()); - void present_controls(SharedPtr node); + void present_controls(SharedPtr node); typedef GraphObject::Properties Properties; - void present_load_plugin(SharedPtr patch, Properties data=Properties()); - void present_load_patch(SharedPtr patch, Properties data=Properties()); - void present_load_subpatch(SharedPtr patch, Properties data=Properties()); - void present_load_remote_patch(SharedPtr patch, Properties data=Properties()); - void present_upload_patch(SharedPtr patch); - void present_new_subpatch(SharedPtr patch, Properties data=Properties()); - void present_rename(SharedPtr object); - void present_properties(SharedPtr object); + void present_load_plugin(SharedPtr patch, Properties data=Properties()); + void present_load_patch(SharedPtr patch, Properties data=Properties()); + void present_load_subpatch(SharedPtr patch, Properties data=Properties()); + void present_load_remote_patch(SharedPtr patch, Properties data=Properties()); + void present_upload_patch(SharedPtr patch); + void present_new_subpatch(SharedPtr patch, Properties data=Properties()); + void present_rename(SharedPtr object); + void present_properties(SharedPtr object); bool remove_patch_window(PatchWindow* win, GdkEventAny* ignored = NULL); @@ -89,10 +89,12 @@ private: typedef std::map PatchWindowMap; typedef std::map ControlWindowMap; - PatchWindow* new_patch_window(SharedPtr patch, SharedPtr view); + PatchWindow* new_patch_window(SharedPtr patch, + SharedPtr view); - NodeControlWindow* new_control_window(SharedPtr node); - bool remove_control_window(NodeControlWindow* win, GdkEventAny* ignored); + NodeControlWindow* new_control_window(SharedPtr node); + bool remove_control_window(NodeControlWindow* win, + GdkEventAny* ignored); PatchWindowMap _patch_windows; ControlWindowMap _control_windows; -- cgit v1.2.1