From 439c67018d74e4ba678ed46fdc2cbf0fd005cdfa Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 9 Dec 2016 15:58:59 +0800 Subject: [PATCH] remove unused macros. --- trunk/src/app/srs_app_http_api.cpp | 2 -- trunk/src/core/srs_core.hpp | 19 +------------------ trunk/src/main/srs_main_server.cpp | 1 - trunk/src/protocol/srs_rtmp_stack.hpp | 2 -- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 041c68d43..04be1ae4c 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -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())); diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 4a11a3383..99e13e083 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -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")" @@ -115,18 +110,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 diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index b698bd90c..88b0f23e5 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -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()); } diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index 583be52fb..8d89ac278 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -1658,8 +1658,6 @@ protected: */ class SrsBandwidthPacket : public SrsPacket { -private: - disable_default_copy(SrsBandwidthPacket); public: /** * Name of command.