jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move network server to resource manager

Browse source
This commit is contained in:
Adam Honse 2020-09-21 00:33:56 -05:00
parent 90e6ba88f1
commit c1ac870035
3 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main.cpp
View file

@ -150,7 +150,6 @@ int main(int argc, char* argv[])
std::vector<RGBController*> &rgb_controllers = ResourceManager::get()->GetRGBControllers();
ProfileManager profile_manager(rgb_controllers);
NetworkServer server(rgb_controllers);
if(!AttemptLocalConnection(rgb_controllers))
{
@ -163,7 +162,7 @@ int main(int argc, char* argv[])
unsigned int ret_flags = RET_FLAG_START_GUI;
if(argc > 1)
{
ret_flags = cli_main(argc, argv, rgb_controllers, &profile_manager, &server, clients);
ret_flags = cli_main(argc, argv, rgb_controllers, &profile_manager, ResourceManager::get()->GetServer(), clients);
}
/*---------------------------------------------------------*\
@ -185,7 +184,7 @@ int main(int argc, char* argv[])
if(clients.size() == 0)
{
dlg.AddServerTab(&server);
dlg.AddServerTab(ResourceManager::get()->GetServer());
}
dlg.AddClientTab();