diff --git a/src/common/appstate.cpp b/src/common/appstate.cpp index 8d4bfbf92..9b0a459ae 100644 --- a/src/common/appstate.cpp +++ b/src/common/appstate.cpp @@ -153,7 +153,7 @@ namespace lumiera { typedef AppState::ExitCode ExitCode; - /** @par + /** @remark * This function is executed at the end of main(), after the necessary subsystems * have been started, typically in separate threads. Thus, the main thread will * enter a blocking wait, until all activated subsystems have signalled shutdown. @@ -239,7 +239,7 @@ namespace lumiera { /** anything which should be closed as late as possible and after * the normal shutdown sequence can be placed into the AppState dtor. * But note though, when the application is halted unconditionally, - * not dtors will be executed. + * no dtors will be executed. */ AppState::~AppState() { diff --git a/src/lumiera/main.cpp b/src/lumiera/main.cpp index 855b9efbb..27bfa12a3 100644 --- a/src/lumiera/main.cpp +++ b/src/lumiera/main.cpp @@ -65,15 +65,14 @@ main (int argc, const char* argv[]) netNode.depends (session); netNode.depends (engine); // playOut.depends (engine); -// playOut.depends (session); -// lumigui.depends (session); ////////////////////////////////////////////TICKET #318 : need to activate this again, after implementing minimal Session subsystem + playOut.depends (session); + lumigui.depends (session); // lumigui.depends (engine); player.depends (playOut); //////TODO dummy player, until we're able to render lumigui.depends (player); script.depends (session); script.depends (engine); - application.maybeStart (session); application.maybeStart (playOut); application.maybeStart (netNode); application.maybeStart (lumigui); diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 68e8bfc09..1b9a85480 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -438,11 +438,17 @@ - - + + + + + + + + + + - - @@ -675,6 +681,30 @@ + + + + + + +

+ Einfachen Aufruf +

+

+ implementieren +

+ + + + + + + + + + + +