winlin

remove unused macros.

@@ -507,7 +507,6 @@ int SrsGoApiAuthors::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) @@ -507,7 +507,6 @@ int SrsGoApiAuthors::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
507 data->set("license", SrsJsonAny::str(RTMP_SIG_SRS_LICENSE)); 507 data->set("license", SrsJsonAny::str(RTMP_SIG_SRS_LICENSE));
508 data->set("copyright", SrsJsonAny::str(RTMP_SIG_SRS_COPYRIGHT)); 508 data->set("copyright", SrsJsonAny::str(RTMP_SIG_SRS_COPYRIGHT));
509 data->set("authors", SrsJsonAny::str(RTMP_SIG_SRS_AUTHROS)); 509 data->set("authors", SrsJsonAny::str(RTMP_SIG_SRS_AUTHROS));
510 - data->set("contributors_link", SrsJsonAny::str(RTMP_SIG_SRS_CONTRIBUTORS_URL));  
511 data->set("contributors", SrsJsonAny::str(SRS_AUTO_CONSTRIBUTORS)); 510 data->set("contributors", SrsJsonAny::str(SRS_AUTO_CONSTRIBUTORS));
512 511
513 return srs_api_response(w, r, obj->dumps()); 512 return srs_api_response(w, r, obj->dumps());
@@ -673,7 +672,6 @@ int SrsGoApiRequests::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) @@ -673,7 +672,6 @@ int SrsGoApiRequests::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
673 data->set("headers", server); 672 data->set("headers", server);
674 673
675 server->set("sigature", SrsJsonAny::str(RTMP_SIG_SRS_KEY)); 674 server->set("sigature", SrsJsonAny::str(RTMP_SIG_SRS_KEY));
676 - server->set("name", SrsJsonAny::str(RTMP_SIG_SRS_NAME));  
677 server->set("version", SrsJsonAny::str(RTMP_SIG_SRS_VERSION)); 675 server->set("version", SrsJsonAny::str(RTMP_SIG_SRS_VERSION));
678 server->set("link", SrsJsonAny::str(RTMP_SIG_SRS_URL)); 676 server->set("link", SrsJsonAny::str(RTMP_SIG_SRS_URL));
679 server->set("time", SrsJsonAny::integer(srs_get_system_time_ms())); 677 server->set("time", SrsJsonAny::integer(srs_get_system_time_ms()));
@@ -45,16 +45,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -45,16 +45,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
45 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com" 45 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
46 // debug info. 46 // debug info.
47 #define RTMP_SIG_SRS_ROLE "cluster" 47 #define RTMP_SIG_SRS_ROLE "cluster"
48 -#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Stream Media Server)"  
49 -#define RTMP_SIG_SRS_URL_SHORT "github.com/ossrs/srs"  
50 -#define RTMP_SIG_SRS_URL "https://"RTMP_SIG_SRS_URL_SHORT 48 +#define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs"
51 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" 49 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
52 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2016 "RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_AUTHROS")" 50 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2016 "RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_AUTHROS")"
53 #define RTMP_SIG_SRS_PRIMARY RTMP_SIG_SRS_KEY"/"VERSION_STABLE_BRANCH 51 #define RTMP_SIG_SRS_PRIMARY RTMP_SIG_SRS_KEY"/"VERSION_STABLE_BRANCH
54 -#define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt"  
55 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")" 52 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")"
56 -#define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/"VERSION_STABLE_BRANCH".0release"  
57 -#define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id  
58 #define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR)"."SRS_XSTR(VERSION_MINOR)"."SRS_XSTR(VERSION_REVISION) 53 #define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR)"."SRS_XSTR(VERSION_MINOR)"."SRS_XSTR(VERSION_REVISION)
59 #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")" 54 #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")"
60 55
@@ -116,18 +111,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -116,18 +111,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
116 (void)0 111 (void)0
117 112
118 /** 113 /**
119 -* disable copy constructor of class,  
120 -* to avoid the memory leak or corrupt by copy instance.  
121 -*/  
122 -#define disable_default_copy(className)\  
123 - private:\  
124 - /** \  
125 - * disable the copy constructor and operator=, donot allow directly copy. \  
126 - */ \  
127 - className(const className&); \  
128 - className& operator= (const className&)  
129 -  
130 -/**  
131 * important check for st(state-threads), 114 * important check for st(state-threads),
132 * only support the following cpus: i386/amd64/x86_64/arm 115 * only support the following cpus: i386/amd64/x86_64/arm
133 * @reamrk to patch ST for arm, read https://github.com/ossrs/state-threads/issues/1 116 * @reamrk to patch ST for arm, read https://github.com/ossrs/state-threads/issues/1
@@ -284,7 +284,6 @@ void show_macro_features() @@ -284,7 +284,6 @@ void show_macro_features()
284 ss << "enabled:off"; 284 ss << "enabled:off";
285 #endif 285 #endif
286 ss << ", default:" << SRS_PERF_MR_ENABLED << ", sleep:" << SRS_PERF_MR_SLEEP << "ms"; 286 ss << ", default:" << SRS_PERF_MR_ENABLED << ", sleep:" << SRS_PERF_MR_SLEEP << "ms";
287 - ss << ", @see " << RTMP_SIG_SRS_ISSUES(241);  
288 287
289 srs_trace(ss.str().c_str()); 288 srs_trace(ss.str().c_str());
290 } 289 }
@@ -1658,8 +1658,6 @@ protected: @@ -1658,8 +1658,6 @@ protected:
1658 */ 1658 */
1659 class SrsBandwidthPacket : public SrsPacket 1659 class SrsBandwidthPacket : public SrsPacket
1660 { 1660 {
1661 -private:  
1662 - disable_default_copy(SrsBandwidthPacket);  
1663 public: 1661 public:
1664 /** 1662 /**
1665 * Name of command. 1663 * Name of command.