external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refactor SRT, using reverse dependency, SRT depends on APP.

Browse source
This commit is contained in:
winlin 2020-01-23 19:40:40 +08:00
parent 87ba204a42
commit 33c6bf1f8f
8 changed files with 194 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/main/srs_main_server.cpp
View file

@ -50,6 +50,10 @@ using namespace std;
#include <srs_core_autofree.hpp>
#include <srs_app_hybrid.hpp>
#ifdef SRS_AUTO_SRT
#include <srt_server.hpp>
#endif
// pre-declare
srs_error_t run_directly_or_daemon();
srs_error_t run_hybrid_server();
@ -411,14 +415,16 @@ srs_error_t run_hybrid_server()
{
srs_error_t err = srs_success;
SrsHybridServer* svr = new SrsHybridServer();
SrsAutoFree(SrsHybridServer, svr);
_srs_hybrid->register_server(new SrsServerAdapter());
#ifdef SRS_AUTO_SRT
_srs_hybrid->register_server(new SrtServerAdapter());
#endif
if ((err = svr->initialize()) != srs_success) {
if ((err = _srs_hybrid->initialize()) != srs_success) {
return srs_error_wrap(err, "hybrid initialize");
}
if ((err = svr->run()) != srs_success) {
if ((err = _srs_hybrid->run()) != srs_success) {
return srs_error_wrap(err, "hybrid run");
}