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

fix bug of edge, refine state to user state.

Browse source
This commit is contained in:
winlin 2014-04-26 22:51:01 +08:00
parent 2bcaeccc51
commit 270b1270af
4 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ class SrsCommonMessage;
class ISrsProtocolReaderWriter;
/**
* the state of edge
* the state of edge, auto machine
*/
enum SrsEdgeState
{
@ -52,8 +52,15 @@ enum SrsEdgeState
SrsEdgeStateIngestConnected,
// publish stream to edge, forward to origin
SrsEdgeStateForwardConnected,
SrsEdgeStateAborting,
SrsEdgeStateReloading,
};
/**
* the state of edge from user, manual machine
*/
enum SrsEdgeUserState
{
SrsEdgeUserStateInit = 0,
SrsEdgeUserStateReloading = 100,
};
/**
@ -96,6 +103,7 @@ class SrsEdge
{
private:
SrsEdgeState state;
SrsEdgeUserState user_state;
SrsEdgeIngester* ingester;
public:
SrsEdge();