Rev 1644 | Rev 1651 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1644 | Rev 1647 | ||
|---|---|---|---|
| Line 40... | Line 40... | ||
| 40 | #include "vm/plugin/System.h" |
40 | #include "vm/plugin/System.h" |
| 41 | #include "vm/plugin/Timer.h" |
41 | #include "vm/plugin/Timer.h" |
| 42 | #include "vm/plugin/Module.h" |
42 | #include "vm/plugin/Module.h" |
| 43 | #include "vm/plugin/Console.h" |
43 | #include "vm/plugin/Console.h" |
| 44 | #include "vm/plugin/Storage.h" |
44 | #include "vm/plugin/Storage.h" |
| - | 45 | #include "vm/plugin/Xorg.h" |
|
| 45 | 46 | ||
| 46 | using namespace atom; |
47 | using namespace atom; |
| 47 | 48 | ||
| 48 | logging::Logger LOG("Main"); |
49 | logging::Logger LOG("Main"); |
| 49 | std::vector<broker::Subscriber::Pointer> subscribers; |
50 | std::vector<broker::Subscriber::Pointer> subscribers; |
| Line 119... | Line 120... | ||
| 119 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::System(vm::Manager::Instance()->GetIoService()))); |
120 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::System(vm::Manager::Instance()->GetIoService()))); |
| 120 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Console(vm::Manager::Instance()->GetIoService(), config::Manager::Instance()->GetAsInt("CommandPort")))); |
121 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Console(vm::Manager::Instance()->GetIoService(), config::Manager::Instance()->GetAsInt("CommandPort")))); |
| 121 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Storage(vm::Manager::Instance()->GetIoService()))); |
122 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Storage(vm::Manager::Instance()->GetIoService()))); |
| 122 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Timer(vm::Manager::Instance()->GetIoService()))); |
123 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Timer(vm::Manager::Instance()->GetIoService()))); |
| 123 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Module(vm::Manager::Instance()->GetIoService()))); |
124 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Module(vm::Manager::Instance()->GetIoService()))); |
| - | 125 | vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::Xorg(vm::Manager::Instance()->GetIoService()))); |
|
| - | 126 | ||
| - | 127 | ||
| 124 | 128 | ||
| 125 | vm::Manager::Instance()->Start(config::Manager::Instance()->GetAsString("ScriptPath")); |
129 | vm::Manager::Instance()->Start(config::Manager::Instance()->GetAsString("ScriptPath")); |
| 126 | 130 | ||
| 127 | if (config::Manager::Instance()->Exist("CanNet")) |
131 | if (config::Manager::Instance()->Exist("CanNet")) |
| 128 | { |
132 | { |