diff options
| author | David Robillard <d@drobilla.net> | 2008-08-16 03:23:15 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-08-16 03:23:15 +0000 |
| commit | a8b36b5637acb3fa8eb29ef0f45bd11653f412fa (patch) | |
| tree | 3a0f0dbef302269f8e509d9f5c2d4c713e00face /src/libs/gui | |
| parent | 49e8582cb6720d43389e7d2534be11a4fb0b8959 (diff) | |
| download | ingen-a8b36b5637acb3fa8eb29ef0f45bd11653f412fa.tar.gz ingen-a8b36b5637acb3fa8eb29ef0f45bd11653f412fa.tar.bz2 ingen-a8b36b5637acb3fa8eb29ef0f45bd11653f412fa.zip | |
Factor out common store functionality.
Make store is-a Table and ditch store->objects() thing everywhere.
Use a separate store in the client (fix ingen -eg).
git-svn-id: http://svn.drobilla.net/lad/ingen@1397 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui')
| -rw-r--r-- | src/libs/gui/App.cpp | 2 | ||||
| -rw-r--r-- | src/libs/gui/ConnectWindow.cpp | 2 | ||||
| -rw-r--r-- | src/libs/gui/NewSubpatchWindow.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp index 3823b407..a0a877d5 100644 --- a/src/libs/gui/App.cpp +++ b/src/libs/gui/App.cpp @@ -174,9 +174,7 @@ App::attach(SharedPtr<SigClientInterface> client) _world->engine->register_client(client.get()); _client = client; - assert(!_world->store); _store = SharedPtr<ClientStore>(new ClientStore(_world->engine, client)); - _world->store = _store; _loader = SharedPtr<ThreadedLoader>(new ThreadedLoader(_world->engine)); _patch_tree_window->init(*_store); diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp index 9707e5aa..8348126b 100644 --- a/src/libs/gui/ConnectWindow.cpp +++ b/src/libs/gui/ConnectWindow.cpp @@ -417,7 +417,7 @@ ConnectWindow::gtk_callback() _progress_label->set_text(string("Requesting root patch...")); ++_connect_stage; } else if (_connect_stage == 3) { - if (App::instance().store()->objects().size() > 0) { + if (App::instance().store()->size() > 0) { SharedPtr<PatchModel> root = PtrCast<PatchModel>(App::instance().store()->object("/")); if (root) { set_connected_to(App::instance().engine()); diff --git a/src/libs/gui/NewSubpatchWindow.cpp b/src/libs/gui/NewSubpatchWindow.cpp index 02d3e9e0..e33c9f2e 100644 --- a/src/libs/gui/NewSubpatchWindow.cpp +++ b/src/libs/gui/NewSubpatchWindow.cpp @@ -73,7 +73,7 @@ NewSubpatchWindow::name_changed() _message_label->set_text("Name contains invalid characters."); _ok_button->property_sensitive() = false; } else if (App::instance().store()->find(_patch->path().base() + name) - != App::instance().store()->objects().end()) { + != App::instance().store()->end()) { _message_label->set_text("An object already exists with that name."); _ok_button->property_sensitive() = false; } else if (name.length() == 0) { |