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 #913, source cycle error

Browse source
This commit is contained in:
winlin 2017-06-11 09:40:07 +08:00
parent 7275fd5397
commit 7cac35a289
15 changed files with 161 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_edge.hpp
View file

@ -129,7 +129,7 @@ public:
SrsEdgeIngester();
virtual ~SrsEdgeIngester();
public:
virtual int initialize(SrsSource* s, SrsPlayEdge* e, SrsRequest* r);
virtual srs_error_t initialize(SrsSource* s, SrsPlayEdge* e, SrsRequest* r);
virtual int start();
virtual void stop();
virtual std::string get_curr_origin();
@ -172,7 +172,7 @@ public:
public:
virtual void set_queue_size(double queue_size);
public:
virtual int initialize(SrsSource* s, SrsPublishEdge* e, SrsRequest* r);
virtual srs_error_t initialize(SrsSource* s, SrsPublishEdge* e, SrsRequest* r);
virtual int start();
virtual void stop();
// interface ISrsReusableThread2Handler
@ -202,7 +202,7 @@ public:
* for we assume all client to edge is invalid,
* if auth open, edge must valid it from origin, then service it.
*/
virtual int initialize(SrsSource* source, SrsRequest* req);
virtual srs_error_t initialize(SrsSource* source, SrsRequest* req);
/**
* when client play stream on edge.
*/
@ -234,7 +234,7 @@ public:
public:
virtual void set_queue_size(double queue_size);
public:
virtual int initialize(SrsSource* source, SrsRequest* req);
virtual srs_error_t initialize(SrsSource* source, SrsRequest* req);
virtual bool can_publish();
/**
* when client publish stream on edge.