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

Log: Change cid from int to string

Browse source
This commit is contained in:
winlin 2020-06-18 11:45:43 +08:00
parent bca4ec1da1
commit 8a0c2e01f8
42 changed files with 301 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_st.cpp
View file

@ -74,14 +74,14 @@ srs_error_t SrsDummyCoroutine::pull()
return srs_error_new(ERROR_THREAD_DUMMY, "dummy pull");
}
int SrsDummyCoroutine::cid()
string SrsDummyCoroutine::cid()
{
return 0;
return "";
}
_ST_THREAD_CREATE_PFN _pfn_st_thread_create = (_ST_THREAD_CREATE_PFN)st_thread_create;
SrsSTCoroutine::SrsSTCoroutine(string n, ISrsCoroutineHandler* h, int cid)
SrsSTCoroutine::SrsSTCoroutine(string n, ISrsCoroutineHandler* h, std::string cid)
{
name = n;
handler = h;
@ -180,7 +180,7 @@ srs_error_t SrsSTCoroutine::pull()
return srs_error_copy(trd_err);
}
int SrsSTCoroutine::cid()
string SrsSTCoroutine::cid()
{
return context;
}
@ -188,7 +188,7 @@ int SrsSTCoroutine::cid()
srs_error_t SrsSTCoroutine::cycle()
{
if (_srs_context) {
if (context) {
if (!context.empty()) {
_srs_context->set_id(context);
} else {
context = _srs_context->generate_id();