From f016914ac1d3414e6351bfe7b8aa540a092fa781 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Dec 2013 21:34:54 +0800 Subject: [PATCH] rename SrsReloadHandler to ISrsReloadHandler --- trunk/src/core/srs_core_config.cpp | 14 +++++++------- trunk/src/core/srs_core_config.hpp | 6 +++--- trunk/src/core/srs_core_pithy_print.cpp | 2 +- trunk/src/core/srs_core_reload.cpp | 8 ++++---- trunk/src/core/srs_core_reload.hpp | 6 +++--- trunk/src/core/srs_core_server.hpp | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/trunk/src/core/srs_core_config.cpp b/trunk/src/core/srs_core_config.cpp index cd910b21b..5338021a5 100644 --- a/trunk/src/core/srs_core_config.cpp +++ b/trunk/src/core/srs_core_config.cpp @@ -452,12 +452,12 @@ int SrsConfig::reload() conf.root = NULL; // merge config. - std::vector::iterator it; + std::vector::iterator it; // merge config: listen if (!srs_directive_equals(root->get("listen"), old_root->get("listen"))) { for (it = subscribes.begin(); it != subscribes.end(); ++it) { - SrsReloadHandler* subscribe = *it; + ISrsReloadHandler* subscribe = *it; if ((ret = subscribe->on_reload_listen()) != ERROR_SUCCESS) { srs_error("notify subscribes reload listen failed. ret=%d", ret); return ret; @@ -468,7 +468,7 @@ int SrsConfig::reload() // merge config: pithy_print if (!srs_directive_equals(root->get("pithy_print"), old_root->get("pithy_print"))) { for (it = subscribes.begin(); it != subscribes.end(); ++it) { - SrsReloadHandler* subscribe = *it; + ISrsReloadHandler* subscribe = *it; if ((ret = subscribe->on_reload_pithy_print()) != ERROR_SUCCESS) { srs_error("notify subscribes pithy_print listen failed. ret=%d", ret); return ret; @@ -482,9 +482,9 @@ int SrsConfig::reload() return ret; } -void SrsConfig::subscribe(SrsReloadHandler* handler) +void SrsConfig::subscribe(ISrsReloadHandler* handler) { - std::vector::iterator it; + std::vector::iterator it; it = std::find(subscribes.begin(), subscribes.end(), handler); if (it != subscribes.end()) { @@ -494,9 +494,9 @@ void SrsConfig::subscribe(SrsReloadHandler* handler) subscribes.push_back(handler); } -void SrsConfig::unsubscribe(SrsReloadHandler* handler) +void SrsConfig::unsubscribe(ISrsReloadHandler* handler) { - std::vector::iterator it; + std::vector::iterator it; it = std::find(subscribes.begin(), subscribes.end(), handler); if (it == subscribes.end()) { diff --git a/trunk/src/core/srs_core_config.hpp b/trunk/src/core/srs_core_config.hpp index f5acb48c6..076b5e09c 100644 --- a/trunk/src/core/srs_core_config.hpp +++ b/trunk/src/core/srs_core_config.hpp @@ -96,14 +96,14 @@ private: bool show_version; std::string config_file; SrsConfDirective* root; - std::vector subscribes; + std::vector subscribes; public: SrsConfig(); virtual ~SrsConfig(); public: virtual int reload(); - virtual void subscribe(SrsReloadHandler* handler); - virtual void unsubscribe(SrsReloadHandler* handler); + virtual void subscribe(ISrsReloadHandler* handler); + virtual void unsubscribe(ISrsReloadHandler* handler); public: virtual int parse_options(int argc, char** argv); private: diff --git a/trunk/src/core/srs_core_pithy_print.cpp b/trunk/src/core/srs_core_pithy_print.cpp index 4e3431ba6..abb568596 100644 --- a/trunk/src/core/srs_core_pithy_print.cpp +++ b/trunk/src/core/srs_core_pithy_print.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_STAGE_DEFAULT_INTERVAL_MS 1200 -struct SrsStageInfo : public SrsReloadHandler +struct SrsStageInfo : public ISrsReloadHandler { int stage_id; int pithy_print_time_ms; diff --git a/trunk/src/core/srs_core_reload.cpp b/trunk/src/core/srs_core_reload.cpp index 684f3c2df..a29cdfbe8 100644 --- a/trunk/src/core/srs_core_reload.cpp +++ b/trunk/src/core/srs_core_reload.cpp @@ -25,20 +25,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -SrsReloadHandler::SrsReloadHandler() +ISrsReloadHandler::ISrsReloadHandler() { } -SrsReloadHandler::~SrsReloadHandler() +ISrsReloadHandler::~ISrsReloadHandler() { } -int SrsReloadHandler::on_reload_listen() +int ISrsReloadHandler::on_reload_listen() { return ERROR_SUCCESS; } -int SrsReloadHandler::on_reload_pithy_print() +int ISrsReloadHandler::on_reload_pithy_print() { return ERROR_SUCCESS; } diff --git a/trunk/src/core/srs_core_reload.hpp b/trunk/src/core/srs_core_reload.hpp index 68813a3fa..2b48b7009 100644 --- a/trunk/src/core/srs_core_reload.hpp +++ b/trunk/src/core/srs_core_reload.hpp @@ -32,11 +32,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /** * the handler for config reload. */ -class SrsReloadHandler +class ISrsReloadHandler { public: - SrsReloadHandler(); - virtual ~SrsReloadHandler(); + ISrsReloadHandler(); + virtual ~ISrsReloadHandler(); public: virtual int on_reload_listen(); virtual int on_reload_pithy_print(); diff --git a/trunk/src/core/srs_core_server.hpp b/trunk/src/core/srs_core_server.hpp index fcc9d61b8..79664657d 100644 --- a/trunk/src/core/srs_core_server.hpp +++ b/trunk/src/core/srs_core_server.hpp @@ -65,7 +65,7 @@ public: virtual int cycle(); }; -class SrsServer : public SrsReloadHandler +class SrsServer : public ISrsReloadHandler { friend class SrsListener; private: