morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Server now restarts on losing all connections

Browse Source
This commit is contained in:
Sergey Sofeychuk
2021-08-24 18:17:29 +03:00
parent f01932ec4d
commit 17dfed27ee
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1 +1,2 @@
build/ build/
.vscode/

11
uxplay.cpp
View File

@@ -48,6 +48,8 @@ static int start_server (std::vector<char> hw_addr, std::string name, unsigned s
static int stop_server (); static int stop_server ();
static bool running = false; static bool running = false;
static uint open_connections = 0;
static bool had_connection = false;
static dnssd_t *dnssd = NULL; static dnssd_t *dnssd = NULL;
static raop_t *raop = NULL; static raop_t *raop = NULL;
static video_renderer_t *video_renderer = NULL; static video_renderer_t *video_renderer = NULL;
@@ -346,14 +348,16 @@ int main (int argc, char *argv[]) {
mac_address.clear(); mac_address.clear();
relaunch: relaunch:
had_connection = false;
if (start_server(server_hw_addr, server_name, display, tcp, udp, if (start_server(server_hw_addr, server_name, display, tcp, udp,
videoflip,use_audio, debug_log, videosink)) { videoflip,use_audio, debug_log, videosink)) {
return 1; return 1;
} }
running = true; running = true;
while (running) { while (running) {
if ((video_renderer_listen(video_renderer))) { if ((video_renderer_listen(video_renderer))||(had_connection&&(!open_connections))) {
stop_server(); stop_server();
LOGI("Re-launching server...");
goto relaunch; goto relaunch;
} }
} }
@@ -364,11 +368,16 @@ int main (int argc, char *argv[]) {
// Server callbacks // Server callbacks
extern "C" void conn_init (void *cls) { extern "C" void conn_init (void *cls) {
open_connections++;
had_connection = true;
LOGI("Open connections: %i", open_connections);
video_renderer_update_background(video_renderer, 1); video_renderer_update_background(video_renderer, 1);
} }
extern "C" void conn_destroy (void *cls) { extern "C" void conn_destroy (void *cls) {
video_renderer_update_background(video_renderer, -1); video_renderer_update_background(video_renderer, -1);
open_connections--;
LOGI("Open connections: %i", open_connections);
} }
extern "C" void audio_process (void *cls, raop_ntp_t *ntp, aac_decode_struct *data) { extern "C" void audio_process (void *cls, raop_ntp_t *ntp, aac_decode_struct *data) {