refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp
正在显示
12 个修改的文件
包含
16 行增加
和
16 行删除
| @@ -440,7 +440,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}" | @@ -440,7 +440,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}" | ||
| 440 | MODULE_ID="APP" | 440 | MODULE_ID="APP" |
| 441 | MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") | 441 | MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") |
| 442 | ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) | 442 | ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) |
| 443 | -MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socket" "srs_app_source" | 443 | +MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" |
| 444 | "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" | 444 | "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" |
| 445 | "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" | 445 | "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" |
| 446 | "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" | 446 | "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" |
| @@ -36,12 +36,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -36,12 +36,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 36 | #include <srs_app_config.hpp> | 36 | #include <srs_app_config.hpp> |
| 37 | #include <srs_protocol_utility.hpp> | 37 | #include <srs_protocol_utility.hpp> |
| 38 | #include <srs_protocol_rtmp.hpp> | 38 | #include <srs_protocol_rtmp.hpp> |
| 39 | -#include <srs_app_socket.hpp> | 39 | +#include <srs_app_st_socket.hpp> |
| 40 | #include <srs_protocol_stack.hpp> | 40 | #include <srs_protocol_stack.hpp> |
| 41 | #include <srs_app_source.hpp> | 41 | #include <srs_app_source.hpp> |
| 42 | #include <srs_app_pithy_print.hpp> | 42 | #include <srs_app_pithy_print.hpp> |
| 43 | #include <srs_core_autofree.hpp> | 43 | #include <srs_core_autofree.hpp> |
| 44 | -#include <srs_app_socket.hpp> | 44 | +#include <srs_app_st_socket.hpp> |
| 45 | #include <srs_app_kbps.hpp> | 45 | #include <srs_app_kbps.hpp> |
| 46 | #include <srs_kernel_utility.hpp> | 46 | #include <srs_kernel_utility.hpp> |
| 47 | #include <srs_protocol_msg_array.hpp> | 47 | #include <srs_protocol_msg_array.hpp> |
| @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 30 | 30 | ||
| 31 | #include <srs_app_source.hpp> | 31 | #include <srs_app_source.hpp> |
| 32 | #include <srs_core_autofree.hpp> | 32 | #include <srs_core_autofree.hpp> |
| 33 | -#include <srs_app_socket.hpp> | 33 | +#include <srs_app_st_socket.hpp> |
| 34 | #include <srs_kernel_error.hpp> | 34 | #include <srs_kernel_error.hpp> |
| 35 | #include <srs_kernel_log.hpp> | 35 | #include <srs_kernel_log.hpp> |
| 36 | #include <srs_app_config.hpp> | 36 | #include <srs_app_config.hpp> |
| @@ -31,7 +31,7 @@ using namespace std; | @@ -31,7 +31,7 @@ using namespace std; | ||
| 31 | 31 | ||
| 32 | #include <srs_kernel_error.hpp> | 32 | #include <srs_kernel_error.hpp> |
| 33 | #include <srs_kernel_log.hpp> | 33 | #include <srs_kernel_log.hpp> |
| 34 | -#include <srs_app_socket.hpp> | 34 | +#include <srs_app_st_socket.hpp> |
| 35 | #include <srs_app_http_api.hpp> | 35 | #include <srs_app_http_api.hpp> |
| 36 | #include <srs_app_http_conn.hpp> | 36 | #include <srs_app_http_conn.hpp> |
| 37 | #include <srs_app_json.hpp> | 37 | #include <srs_app_json.hpp> |
| @@ -31,7 +31,7 @@ using namespace std; | @@ -31,7 +31,7 @@ using namespace std; | ||
| 31 | #include <srs_kernel_log.hpp> | 31 | #include <srs_kernel_log.hpp> |
| 32 | #include <srs_kernel_error.hpp> | 32 | #include <srs_kernel_error.hpp> |
| 33 | #include <srs_app_http.hpp> | 33 | #include <srs_app_http.hpp> |
| 34 | -#include <srs_app_socket.hpp> | 34 | +#include <srs_app_st_socket.hpp> |
| 35 | #include <srs_core_autofree.hpp> | 35 | #include <srs_core_autofree.hpp> |
| 36 | #include <srs_app_json.hpp> | 36 | #include <srs_app_json.hpp> |
| 37 | #include <srs_app_config.hpp> | 37 | #include <srs_app_config.hpp> |
| @@ -32,7 +32,7 @@ using namespace std; | @@ -32,7 +32,7 @@ using namespace std; | ||
| 32 | #include <srs_app_http.hpp> | 32 | #include <srs_app_http.hpp> |
| 33 | #include <srs_kernel_error.hpp> | 33 | #include <srs_kernel_error.hpp> |
| 34 | #include <srs_kernel_log.hpp> | 34 | #include <srs_kernel_log.hpp> |
| 35 | -#include <srs_app_socket.hpp> | 35 | +#include <srs_app_st_socket.hpp> |
| 36 | #include <srs_kernel_utility.hpp> | 36 | #include <srs_kernel_utility.hpp> |
| 37 | #include <srs_app_utility.hpp> | 37 | #include <srs_app_utility.hpp> |
| 38 | 38 |
| @@ -35,7 +35,7 @@ using namespace std; | @@ -35,7 +35,7 @@ using namespace std; | ||
| 35 | 35 | ||
| 36 | #include <srs_kernel_log.hpp> | 36 | #include <srs_kernel_log.hpp> |
| 37 | #include <srs_kernel_error.hpp> | 37 | #include <srs_kernel_error.hpp> |
| 38 | -#include <srs_app_socket.hpp> | 38 | +#include <srs_app_st_socket.hpp> |
| 39 | #include <srs_app_http.hpp> | 39 | #include <srs_app_http.hpp> |
| 40 | #include <srs_core_autofree.hpp> | 40 | #include <srs_core_autofree.hpp> |
| 41 | #include <srs_app_json.hpp> | 41 | #include <srs_app_json.hpp> |
| @@ -31,7 +31,7 @@ using namespace std; | @@ -31,7 +31,7 @@ using namespace std; | ||
| 31 | #include <srs_kernel_error.hpp> | 31 | #include <srs_kernel_error.hpp> |
| 32 | #include <srs_protocol_rtmp.hpp> | 32 | #include <srs_protocol_rtmp.hpp> |
| 33 | #include <srs_kernel_log.hpp> | 33 | #include <srs_kernel_log.hpp> |
| 34 | -#include <srs_app_socket.hpp> | 34 | +#include <srs_app_st_socket.hpp> |
| 35 | #include <srs_app_http.hpp> | 35 | #include <srs_app_http.hpp> |
| 36 | #include <srs_app_json.hpp> | 36 | #include <srs_app_json.hpp> |
| 37 | #include <srs_app_dvr.hpp> | 37 | #include <srs_app_dvr.hpp> |
| @@ -43,7 +43,7 @@ using namespace std; | @@ -43,7 +43,7 @@ using namespace std; | ||
| 43 | #include <srs_app_hls.hpp> | 43 | #include <srs_app_hls.hpp> |
| 44 | #include <srs_app_http.hpp> | 44 | #include <srs_app_http.hpp> |
| 45 | #include <srs_app_bandwidth.hpp> | 45 | #include <srs_app_bandwidth.hpp> |
| 46 | -#include <srs_app_socket.hpp> | 46 | +#include <srs_app_st_socket.hpp> |
| 47 | #include <srs_app_http_hooks.hpp> | 47 | #include <srs_app_http_hooks.hpp> |
| 48 | #include <srs_app_edge.hpp> | 48 | #include <srs_app_edge.hpp> |
| 49 | #include <srs_app_kbps.hpp> | 49 | #include <srs_app_kbps.hpp> |
| @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | -#include <srs_app_socket.hpp> | 24 | +#include <srs_app_st_socket.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_kernel_error.hpp> | 26 | #include <srs_kernel_error.hpp> |
| 27 | #include <srs_kernel_utility.hpp> | 27 | #include <srs_kernel_utility.hpp> |
| @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | -#ifndef SRS_APP_SOCKET_HPP | ||
| 25 | -#define SRS_APP_SOCKET_HPP | 24 | +#ifndef SRS_APP_ST_SOCKET_HPP |
| 25 | +#define SRS_APP_ST_SOCKET_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | -#include <srs_app_socket.hpp> | 28 | +#include <srs_app_st_socket.hpp> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <srs_core.hpp> | 31 | #include <srs_core.hpp> |
| @@ -104,8 +104,8 @@ file | @@ -104,8 +104,8 @@ file | ||
| 104 | ..\app\srs_app_server.cpp, | 104 | ..\app\srs_app_server.cpp, |
| 105 | ..\app\srs_app_st.hpp, | 105 | ..\app\srs_app_st.hpp, |
| 106 | ..\app\srs_app_st.cpp, | 106 | ..\app\srs_app_st.cpp, |
| 107 | - ..\app\srs_app_socket.hpp, | ||
| 108 | - ..\app\srs_app_socket.cpp, | 107 | + ..\app\srs_app_st_socket.hpp, |
| 108 | + ..\app\srs_app_st_socket.cpp, | ||
| 109 | ..\app\srs_app_source.hpp, | 109 | ..\app\srs_app_source.hpp, |
| 110 | ..\app\srs_app_source.cpp, | 110 | ..\app\srs_app_source.cpp, |
| 111 | ..\app\srs_app_thread.hpp, | 111 | ..\app\srs_app_thread.hpp, |
-
请 注册 或 登录 后发表评论