From ac1d6d135bda8d739fdb8bf564f89c38b664c097 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 22 Oct 2011 03:08:06 +0000 Subject: De-singleton-ify GUI. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3584 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/LoadPluginWindow.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/gui/LoadPluginWindow.cpp') diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index c94fac30..c89b4c46 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -132,7 +132,7 @@ LoadPluginWindow::name_changed() string name = _node_name_entry->get_text(); if (!Path::is_valid_name(name)) { _add_button->property_sensitive() = false; - } else if (App::instance().store()->find_child(_patch, name)) { + } else if (_app->store()->find_child(_patch, name)) { _add_button->property_sensitive() = false; } else if (name.length() == 0) { _add_button->property_sensitive() = false; @@ -181,13 +181,13 @@ void LoadPluginWindow::on_show() { if (!_has_shown) { - App::instance().store()->signal_new_plugin().connect( + _app->store()->signal_new_plugin().connect( sigc::mem_fun(this, &LoadPluginWindow::add_plugin)); _has_shown = true; } if (_refresh_list) { - set_plugins(App::instance().store()->plugins()); + set_plugins(_app->store()->plugins()); _refresh_list = false; } @@ -224,7 +224,7 @@ void LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr plugin) { - const URIs& uris = App::instance().uris(); + const URIs& uris = _app->uris(); const Atom& name = plugin->get_property(uris.doap_name); if (name.is_valid() && name.type() == Atom::STRING) row[_plugins_columns._col_name] = name.get_string(); @@ -290,7 +290,7 @@ LoadPluginWindow::plugin_selection_changed() Gtk::TreeModel::Row row = *iter; boost::shared_ptr p = row.get_value( _plugins_columns._col_plugin); - _name_offset = App::instance().store()->child_name_offset( + _name_offset = _app->store()->child_name_offset( _patch->path(), p->default_node_symbol()); _node_name_entry->set_text(generate_module_name(p, _name_offset)); _node_name_entry->set_sensitive(true); @@ -325,7 +325,7 @@ LoadPluginWindow::generate_module_name(SharedPtr plugin, void LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) { - const URIs& uris = App::instance().uris(); + const URIs& uris = _app->uris(); Gtk::TreeModel::Row row = *iter; SharedPtr plugin = row.get_value(_plugins_columns._col_plugin); bool polyphonic = _polyphonic_checkbutton->get_active(); @@ -346,7 +346,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) props.insert(make_pair(uris.rdf_type, uris.ingen_Node)); props.insert(make_pair(uris.rdf_instanceOf, plugin->uri())); props.insert(make_pair(uris.ingen_polyphonic, polyphonic)); - App::instance().engine()->put(path, props); + _app->engine()->put(path, props); if (_selection->get_selected_rows().size() == 1) { _name_offset = (_name_offset == 0) ? 2 : _name_offset + 1; @@ -386,10 +386,10 @@ LoadPluginWindow::filter_changed() Gtk::TreeModel::Row model_row; Gtk::TreeModel::iterator model_iter; size_t num_visible = 0; - const URIs& uris = App::instance().uris(); + const URIs& uris = _app->uris(); - for (ClientStore::Plugins::const_iterator i = App::instance().store()->plugins()->begin(); - i != App::instance().store()->plugins()->end(); ++i) { + for (ClientStore::Plugins::const_iterator i = _app->store()->plugins()->begin(); + i != _app->store()->plugins()->end(); ++i) { const SharedPtr plugin = (*i).second; const Atom& name = plugin->get_property(uris.doap_name); @@ -439,7 +439,7 @@ LoadPluginWindow::plugin_property_changed(const URI& plugin, const URI& predicate, const Atom& value) { - const URIs& uris = App::instance().uris(); + const URIs& uris = _app->uris(); if (predicate == uris.doap_name) { Rows::const_iterator i = _rows.find(plugin); if (i != _rows.end() && value.type() == Atom::STRING) -- cgit v1.2.1