正在显示
2 个修改的文件
包含
0 行增加
和
17 行删除
| @@ -522,21 +522,6 @@ int SrsConfig::reload() | @@ -522,21 +522,6 @@ int SrsConfig::reload() | ||
| 522 | return ret; | 522 | return ret; |
| 523 | } | 523 | } |
| 524 | 524 | ||
| 525 | -SrsConfDirective* SrsConfig::get_or_create(SrsConfDirective* node, string name) | ||
| 526 | -{ | ||
| 527 | - srs_assert(node); | ||
| 528 | - | ||
| 529 | - SrsConfDirective* conf = node->get(name); | ||
| 530 | - | ||
| 531 | - if (!conf) { | ||
| 532 | - conf = new SrsConfDirective(); | ||
| 533 | - conf->name = name; | ||
| 534 | - node->directives.push_back(conf); | ||
| 535 | - } | ||
| 536 | - | ||
| 537 | - return conf; | ||
| 538 | -} | ||
| 539 | - | ||
| 540 | int SrsConfig::reload_http_api(SrsConfDirective* old_root) | 525 | int SrsConfig::reload_http_api(SrsConfDirective* old_root) |
| 541 | { | 526 | { |
| 542 | int ret = ERROR_SUCCESS; | 527 | int ret = ERROR_SUCCESS; |
| @@ -142,8 +142,6 @@ public: | @@ -142,8 +142,6 @@ public: | ||
| 142 | virtual void unsubscribe(ISrsReloadHandler* handler); | 142 | virtual void unsubscribe(ISrsReloadHandler* handler); |
| 143 | virtual int reload(); | 143 | virtual int reload(); |
| 144 | private: | 144 | private: |
| 145 | - virtual SrsConfDirective* get_or_create(SrsConfDirective* node, std::string name); | ||
| 146 | -private: | ||
| 147 | virtual int reload_http_api(SrsConfDirective* old_root); | 145 | virtual int reload_http_api(SrsConfDirective* old_root); |
| 148 | virtual int reload_http_stream(SrsConfDirective* old_root); | 146 | virtual int reload_http_stream(SrsConfDirective* old_root); |
| 149 | virtual int reload_vhost(SrsConfDirective* old_root); | 147 | virtual int reload_vhost(SrsConfDirective* old_root); |
-
请 注册 或 登录 后发表评论