正在显示
3 个修改的文件
包含
5 行增加
和
2 行删除
| @@ -605,7 +605,7 @@ function apply_user_presets() { | @@ -605,7 +605,7 @@ function apply_user_presets() { | ||
| 605 | SRS_HTTP_API=YES | 605 | SRS_HTTP_API=YES |
| 606 | SRS_LIBRTMP=YES | 606 | SRS_LIBRTMP=YES |
| 607 | SRS_RESEARCH=NO | 607 | SRS_RESEARCH=NO |
| 608 | - SRS_UTEST=NO | 608 | + SRS_UTEST=YES |
| 609 | SRS_GPERF=NO | 609 | SRS_GPERF=NO |
| 610 | SRS_GPERF_MC=NO | 610 | SRS_GPERF_MC=NO |
| 611 | SRS_GPERF_MP=NO | 611 | SRS_GPERF_MP=NO |
| @@ -436,7 +436,6 @@ SrsConfDirective* SrsConfDirective::copy() | @@ -436,7 +436,6 @@ SrsConfDirective* SrsConfDirective::copy() | ||
| 436 | cp->conf_line = conf_line; | 436 | cp->conf_line = conf_line; |
| 437 | cp->name = name; | 437 | cp->name = name; |
| 438 | cp->args = args; | 438 | cp->args = args; |
| 439 | - cp->create_time = create_time; | ||
| 440 | 439 | ||
| 441 | for (int i = 0; i < (int)directives.size(); i++) { | 440 | for (int i = 0; i < (int)directives.size(); i++) { |
| 442 | SrsConfDirective* directive = directives.at(i); | 441 | SrsConfDirective* directive = directives.at(i); |
| @@ -190,6 +190,10 @@ private: | @@ -190,6 +190,10 @@ private: | ||
| 190 | */ | 190 | */ |
| 191 | virtual int parse_conf(_srs_internal::SrsConfigBuffer* buffer, SrsDirectiveType type); | 191 | virtual int parse_conf(_srs_internal::SrsConfigBuffer* buffer, SrsDirectiveType type); |
| 192 | /** | 192 | /** |
| 193 | + * deep copy the directive. | ||
| 194 | + */ | ||
| 195 | + virtual SrsConfDirective* copy(); | ||
| 196 | + /** | ||
| 193 | * read a token from buffer. | 197 | * read a token from buffer. |
| 194 | * a token, is the directive args and a flag indicates whether has child-directives. | 198 | * a token, is the directive args and a flag indicates whether has child-directives. |
| 195 | * @param args, the output directive args, the first is the directive name, left is the args. | 199 | * @param args, the output directive args, the first is the directive name, left is the args. |
-
请 注册 或 登录 后发表评论