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

Revert "Fix #2142, Async release bridger when unpublish. 4.0.60"

Browse source 
This reverts commit 06adb9dc42.
This commit is contained in:
winlin 2021-01-15 13:30:52 +08:00
parent 06adb9dc42
commit ed32965aa4
6 changed files with 5 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_source.hpp
View file

@ -34,7 +34,6 @@
#include <srs_app_reload.hpp>
#include <srs_core_performance.hpp>
#include <srs_service_st.hpp>
#include <srs_app_conn.hpp>
class SrsFormat;
class SrsRtmpFormat;
@ -485,7 +484,7 @@ public:
extern SrsSourceManager* _srs_sources;
// For two sources to bridge with each other.
class ISrsSourceBridger : public ISrsResource
class ISrsSourceBridger
{
public:
ISrsSourceBridger();
@ -498,7 +497,7 @@ public:
};
// live streaming source.
class SrsSource : virtual public ISrsReloadHandler, virtual public ISrsDisposingHandler
class SrsSource : public ISrsReloadHandler
{
friend class SrsOriginHub;
private:
@ -560,10 +559,6 @@ public:
virtual srs_error_t initialize(SrsRequest* r, ISrsSourceHandler* h);
// Bridge to other source, forward packets to it.
void bridge_to(ISrsSourceBridger* v);
// interface ISrsDisposingHandler
public:
virtual void on_before_dispose(ISrsResource* c);
virtual void on_disposing(ISrsResource* c);
// Interface ISrsReloadHandler
public:
virtual srs_error_t on_reload_vhost_play(std::string vhost);