Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2016-12-09 15:58:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
439c67018d74e4ba678ed46fdc2cbf0fd005cdfa
439c6701
1 parent
2955b1fd
remove unused macros.
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
1 行增加
和
23 行删除
trunk/src/app/srs_app_http_api.cpp
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/protocol/srs_rtmp_stack.hpp
trunk/src/app/srs_app_http_api.cpp
查看文件 @
439c670
...
...
@@ -507,7 +507,6 @@ int SrsGoApiAuthors::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
data
->
set
(
"license"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_LICENSE
));
data
->
set
(
"copyright"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_COPYRIGHT
));
data
->
set
(
"authors"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_AUTHROS
));
data
->
set
(
"contributors_link"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_CONTRIBUTORS_URL
));
data
->
set
(
"contributors"
,
SrsJsonAny
::
str
(
SRS_AUTO_CONSTRIBUTORS
));
return
srs_api_response
(
w
,
r
,
obj
->
dumps
());
...
...
@@ -673,7 +672,6 @@ int SrsGoApiRequests::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
data
->
set
(
"headers"
,
server
);
server
->
set
(
"sigature"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_KEY
));
server
->
set
(
"name"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_NAME
));
server
->
set
(
"version"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_VERSION
));
server
->
set
(
"link"
,
SrsJsonAny
::
str
(
RTMP_SIG_SRS_URL
));
server
->
set
(
"time"
,
SrsJsonAny
::
integer
(
srs_get_system_time_ms
()));
...
...
trunk/src/core/srs_core.hpp
查看文件 @
439c670
...
...
@@ -45,16 +45,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
// debug info.
#define RTMP_SIG_SRS_ROLE "cluster"
#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Stream Media Server)"
#define RTMP_SIG_SRS_URL_SHORT "github.com/ossrs/srs"
#define RTMP_SIG_SRS_URL "https://"RTMP_SIG_SRS_URL_SHORT
#define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs"
#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2016 "RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_AUTHROS")"
#define RTMP_SIG_SRS_PRIMARY RTMP_SIG_SRS_KEY"/"VERSION_STABLE_BRANCH
#define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt"
#define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")"
#define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/"VERSION_STABLE_BRANCH".0release"
#define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id
#define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR)"."SRS_XSTR(VERSION_MINOR)"."SRS_XSTR(VERSION_REVISION)
#define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")"
...
...
@@ -116,18 +111,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
(void)0
/**
* disable copy constructor of class,
* to avoid the memory leak or corrupt by copy instance.
*/
#define disable_default_copy(className)\
private:\
/** \
* disable the copy constructor and operator=, donot allow directly copy. \
*/
\
className(const className&); \
className& operator= (const className&)
/**
* important check for st(state-threads),
* only support the following cpus: i386/amd64/x86_64/arm
* @reamrk to patch ST for arm, read https://github.com/ossrs/state-threads/issues/1
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
439c670
...
...
@@ -284,7 +284,6 @@ void show_macro_features()
ss
<<
"enabled:off"
;
#endif
ss
<<
", default:"
<<
SRS_PERF_MR_ENABLED
<<
", sleep:"
<<
SRS_PERF_MR_SLEEP
<<
"ms"
;
ss
<<
", @see "
<<
RTMP_SIG_SRS_ISSUES
(
241
);
srs_trace
(
ss
.
str
().
c_str
());
}
...
...
trunk/src/protocol/srs_rtmp_stack.hpp
查看文件 @
439c670
...
...
@@ -1658,8 +1658,6 @@ protected:
*/
class
SrsBandwidthPacket
:
public
SrsPacket
{
private
:
disable_default_copy
(
SrsBandwidthPacket
);
public
:
/**
* Name of command.
...
...
请
注册
或
登录
后发表评论