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_hls.hpp
View file

@ -175,7 +175,7 @@ public:
/**
* initialize the hls muxer.
*/
virtual int initialize();
virtual srs_error_t initialize();
/**
* when publish, update the config for muxer.
*/
@ -248,7 +248,7 @@ public:
SrsHlsController();
virtual ~SrsHlsController();
public:
virtual int initialize();
virtual srs_error_t initialize();
virtual void dispose();
virtual int sequence_no();
virtual std::string ts_url();
@ -313,12 +313,12 @@ public:
virtual ~SrsHls();
public:
virtual void dispose();
virtual int cycle();
virtual srs_error_t cycle();
public:
/**
* initialize the hls by handler and source.
*/
virtual int initialize(SrsOriginHub* h, SrsRequest* r);
virtual srs_error_t initialize(SrsOriginHub* h, SrsRequest* r);
/**
* publish stream event, continue to write the m3u8,
* for the muxer object not destroyed.