From 014a828c63859edad0acf40c438f185b2abb32b2 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 12 Dec 2016 03:45:21 +0100 Subject: [PATCH] next task: implement minimal "Session subsystem" (#318) mark TODOs in code to make that happen. Actually, it is not hard to do so, it just requires to combine all the existing building blocks. When this is done, we can define the "Session" subsystem as prerequisite for "GUI" in main.cpp Unless I've made some (copy-n-paste) mistake with defining the facades, this should be sufficient to pull up "the Session" and automatically let the Gui-Plugin connect against the SessionCommandService --- src/gui/ctrl/core-service.hpp | 5 ++++- src/lumiera/main.cpp | 2 +- src/proc/control/session-command-service.cpp | 2 ++ src/proc/facade.cpp | 1 + wiki/thinkPad.ichthyo.mm | 23 +++++++++++++++++--- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/gui/ctrl/core-service.hpp b/src/gui/ctrl/core-service.hpp index d16fd7f76..de74771c0 100644 --- a/src/gui/ctrl/core-service.hpp +++ b/src/gui/ctrl/core-service.hpp @@ -40,6 +40,7 @@ ** perspective, since they exchange messages in both directions. ** ** @todo initial draft and WIP-WIP-WIP as of 12/2015 + ** @todo implement a minimal version of a "Session subsystem" and instantiate SessionCommandService there ///////////TICKET #318 ** ** @see TODO_abstract-tangible-test.cpp ** @@ -53,6 +54,7 @@ #include "lib/error.hpp" #include "include/logging.h" //#include "lib/idi/entry-id.hpp" +#include "include/session-command-facade.h" #include "gui/notification-service.hpp" #include "gui/ctrl/bus-term.hpp" #include "gui/ctrl/nexus.hpp" @@ -96,6 +98,7 @@ namespace ctrl{ act (GenNode const& command) { UNIMPLEMENTED("receive and handle command invocation"); + ///////////////////////////TICKET #318 : start SessionCommandService. Can then just invoke SessionCommand.facade()... } @@ -111,7 +114,7 @@ namespace ctrl{ CoreService (ID identity =lib::idi::EntryID()) : BusTerm(identity, uiBusBackbone_) , uiBusBackbone_{*this} - , activateNotificationService_() // opens the GuiNotification facade interface + , activateNotificationService_() // opens the GuiNotificationService instance { INFO (gui, "UI-Backbone operative."); } diff --git a/src/lumiera/main.cpp b/src/lumiera/main.cpp index 69b5ecc22..fe4134b35 100644 --- a/src/lumiera/main.cpp +++ b/src/lumiera/main.cpp @@ -68,7 +68,7 @@ main (int argc, const char* argv[]) netNode.depends (engine); // playOut.depends (engine); // playOut.depends (session); -// lumigui.depends (session); //////TODO commented out in order to be able to start up a dummy GuiStarterPlugin +// lumigui.depends (session); ////////////////////////////////////////////TICKET #318 : need to activate this again, after implementing minimal Session subsystem // lumigui.depends (engine); player.depends (playOut); //////TODO dummy player, until we're able to render lumigui.depends (player); diff --git a/src/proc/control/session-command-service.cpp b/src/proc/control/session-command-service.cpp index 39bc8d633..6876690b2 100644 --- a/src/proc/control/session-command-service.cpp +++ b/src/proc/control/session-command-service.cpp @@ -24,6 +24,8 @@ ** Implementation of command invocation on the Session interface. ** This is the actual service implementation and runs within Session subsystem. ** + ** @todo implement a minimal version of a "Session subsystem" and instantiate SessionCommandService there ///////////TICKET #318 + ** */ #include "proc/control/session-command-service.hpp" diff --git a/src/proc/facade.cpp b/src/proc/facade.cpp index 203a5097a..03cea95ee 100644 --- a/src/proc/facade.cpp +++ b/src/proc/facade.cpp @@ -88,6 +88,7 @@ namespace proc { { UNIMPLEMENTED ("load an existing session as denoted by the options and register shutdown hook"); return false; + //////////////////////////////////////////////////////////TICKET #318 : start Thread and instantiate SessionCommandService } void diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 6e6785161..d3f8906fd 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -217,9 +217,26 @@ - - - + + + + + + + + + + + + + + + + + + + +