Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e89d82c24 |
+5
-1
@@ -32,6 +32,9 @@ NetworkClient::NetworkClient(std::vector<RGBController *>& control) : controller
|
|||||||
port_num = OPENRGB_SDK_PORT;
|
port_num = OPENRGB_SDK_PORT;
|
||||||
server_connected = false;
|
server_connected = false;
|
||||||
server_controller_count = 0;
|
server_controller_count = 0;
|
||||||
|
|
||||||
|
ListenThread = NULL;
|
||||||
|
ConnectionThread = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void NetworkClient::ClientInfoChanged()
|
void NetworkClient::ClientInfoChanged()
|
||||||
@@ -122,7 +125,8 @@ void NetworkClient::StopClient()
|
|||||||
|
|
||||||
shutdown(client_sock, SD_RECEIVE);
|
shutdown(client_sock, SD_RECEIVE);
|
||||||
closesocket(client_sock);
|
closesocket(client_sock);
|
||||||
ListenThread->join();
|
if(ListenThread)
|
||||||
|
ListenThread->join();
|
||||||
ConnectionThread->join();
|
ConnectionThread->join();
|
||||||
|
|
||||||
/*-------------------------------------------------*\
|
/*-------------------------------------------------*\
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
* *
|
* *
|
||||||
\******************************************************************************************/
|
\******************************************************************************************/
|
||||||
|
|
||||||
|
#include "NetworkClient.h"
|
||||||
#include "NetworkServer.h"
|
#include "NetworkServer.h"
|
||||||
#include "OpenRGB.h"
|
#include "OpenRGB.h"
|
||||||
#include "ProfileManager.h"
|
#include "ProfileManager.h"
|
||||||
@@ -17,6 +18,7 @@
|
|||||||
|
|
||||||
#include "OpenRGBDialog2.h"
|
#include "OpenRGBDialog2.h"
|
||||||
|
|
||||||
|
using namespace std::chrono_literals;
|
||||||
|
|
||||||
extern std::vector<i2c_smbus_interface*> busses;
|
extern std::vector<i2c_smbus_interface*> busses;
|
||||||
extern std::vector<RGBController*> rgb_controllers;
|
extern std::vector<RGBController*> rgb_controllers;
|
||||||
@@ -37,7 +39,26 @@ int main(int argc, char* argv[])
|
|||||||
ProfileManager profile_manager(rgb_controllers);
|
ProfileManager profile_manager(rgb_controllers);
|
||||||
NetworkServer server(rgb_controllers);
|
NetworkServer server(rgb_controllers);
|
||||||
|
|
||||||
DetectRGBControllers();
|
NetworkClient * client = new NetworkClient(rgb_controllers);
|
||||||
|
client->StartClient();
|
||||||
|
|
||||||
|
for(int timeout = 0; timeout < 10; timeout++)
|
||||||
|
{
|
||||||
|
if(client->GetOnline())
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
std::this_thread::sleep_for(100ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!client->GetOnline())
|
||||||
|
{
|
||||||
|
client->StopClient();
|
||||||
|
|
||||||
|
delete client;
|
||||||
|
|
||||||
|
DetectRGBControllers();
|
||||||
|
}
|
||||||
|
|
||||||
profile_manager.LoadSizeFromProfile("sizes.ors");
|
profile_manager.LoadSizeFromProfile("sizes.ors");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user