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

For #1638, #307, extract rtc server to hybrid manager.

Browse source
This commit is contained in:
winlin 2020-03-17 17:56:37 +08:00
parent 4318d989a6
commit 2c4dc0fb3d
9 changed files with 141 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@ using namespace std;
#include <srs_core_autofree.hpp>
#include <srs_kernel_file.hpp>
#include <srs_app_hybrid.hpp>
#include <srs_app_rtc_conn.hpp>
#ifdef SRS_AUTO_SRT
#include <srt_server.hpp>
@ -441,11 +442,15 @@ srs_error_t run_hybrid_server()
{
srs_error_t err = srs_success;
// Create servers and register them.
_srs_hybrid->register_server(new SrsServerAdapter());
#ifdef SRS_AUTO_SRT
_srs_hybrid->register_server(new SrtServerAdapter());
#endif
_srs_hybrid->register_server(new RtcServerAdapter());
// Do some system initialize.
if ((err = _srs_hybrid->initialize()) != srs_success) {
return srs_error_wrap(err, "hybrid initialize");