forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 15:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2022-07-29 13:44:48 +03:00
parent d2bef81b03
commit df1e4eaa06
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ustreamer/main.c
View File

@@ -40,12 +40,9 @@
#endif #endif
typedef struct { static us_stream_s *_g_stream = NULL;
us_stream_s *stream; static us_server_s *_g_server = NULL;
us_server_s *server;
} _main_context_s;
static _main_context_s *_ctx;
static void _block_thread_signals(void) { static void _block_thread_signals(void) {
sigset_t mask; sigset_t mask;
@@ -58,14 +55,14 @@ static void _block_thread_signals(void) {
static void *_stream_loop_thread(UNUSED void *arg) { static void *_stream_loop_thread(UNUSED void *arg) {
US_THREAD_RENAME("stream"); US_THREAD_RENAME("stream");
_block_thread_signals(); _block_thread_signals();
us_stream_loop(_ctx->stream); us_stream_loop(_g_stream);
return NULL; return NULL;
} }
static void *_server_loop_thread(UNUSED void *arg) { static void *_server_loop_thread(UNUSED void *arg) {
US_THREAD_RENAME("http"); US_THREAD_RENAME("http");
_block_thread_signals(); _block_thread_signals();
us_server_loop(_ctx->server); us_server_loop(_g_server);
return NULL; return NULL;
} }
@@ -75,8 +72,8 @@ static void _signal_handler(int signum) {
case SIGINT: US_LOG_INFO_NOLOCK("===== Stopping by SIGINT ====="); break; case SIGINT: US_LOG_INFO_NOLOCK("===== Stopping by SIGINT ====="); break;
default: US_LOG_INFO_NOLOCK("===== Stopping by %d =====", signum); break; default: US_LOG_INFO_NOLOCK("===== Stopping by %d =====", signum); break;
} }
us_stream_loop_break(_ctx->stream); us_stream_loop_break(_g_stream);
us_server_loop_break(_ctx->server); us_server_loop_break(_g_server);
} }
static void _install_signal_handlers(void) { static void _install_signal_handlers(void) {
@@ -107,22 +104,17 @@ int main(int argc, char *argv[]) {
us_options_s *options = us_options_init(argc, argv); us_options_s *options = us_options_init(argc, argv);
us_device_s *dev = us_device_init(); us_device_s *dev = us_device_init();
us_encoder_s *enc = us_encoder_init(); us_encoder_s *enc = us_encoder_init();
us_stream_s *stream = us_stream_init(dev, enc); _g_stream = us_stream_init(dev, enc);
us_server_s *server = us_server_init(stream); _g_server = us_server_init(_g_stream);
if ((exit_code = options_parse(options, dev, enc, stream, server)) == 0) { if ((exit_code = options_parse(options, dev, enc, _g_stream, _g_server)) == 0) {
# ifdef WITH_GPIO # ifdef WITH_GPIO
us_gpio_init(); us_gpio_init();
# endif # endif
_install_signal_handlers(); _install_signal_handlers();
_main_context_s ctx; if ((exit_code = us_server_listen(_g_server)) == 0) {
ctx.stream = stream;
ctx.server = server;
_ctx = &ctx;
if ((exit_code = us_server_listen(server)) == 0) {
# ifdef WITH_GPIO # ifdef WITH_GPIO
us_gpio_set_prog_running(true); us_gpio_set_prog_running(true);
# endif # endif
@@ -141,8 +133,8 @@ int main(int argc, char *argv[]) {
# endif # endif
} }
us_server_destroy(server); us_server_destroy(_g_server);
us_stream_destroy(stream); us_stream_destroy(_g_stream);
us_encoder_destroy(enc); us_encoder_destroy(enc);
us_device_destroy(dev); us_device_destroy(dev);
us_options_destroy(options); us_options_destroy(options);