refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp

pull/133/head
winlin 11 years ago
parent 13abb0d768
commit b19d2e8e2d

2
trunk/configure vendored

@ -440,7 +440,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="APP" MODULE_ID="APP"
MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") MODULE_DEPENDS=("CORE" "KERNEL" "RTMP")
ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socket" "srs_app_source" MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source"
"srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http"
"srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config"
"srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" "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.
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_protocol_utility.hpp> #include <srs_protocol_utility.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_protocol_rtmp.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_protocol_stack.hpp> #include <srs_protocol_stack.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_kbps.hpp> #include <srs_app_kbps.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_protocol_msg_array.hpp> #include <srs_protocol_msg_array.hpp>

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>

@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_http_api.hpp> #include <srs_app_http_api.hpp>
#include <srs_app_http_conn.hpp> #include <srs_app_http_conn.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>

@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_app_http.hpp> #include <srs_app_http.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>

@ -32,7 +32,7 @@ using namespace std;
#include <srs_app_http.hpp> #include <srs_app_http.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>

@ -35,7 +35,7 @@ using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_http.hpp> #include <srs_app_http.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>

@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp> #include <srs_protocol_rtmp.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_http.hpp> #include <srs_app_http.hpp>
#include <srs_app_json.hpp> #include <srs_app_json.hpp>
#include <srs_app_dvr.hpp> #include <srs_app_dvr.hpp>

@ -43,7 +43,7 @@ using namespace std;
#include <srs_app_hls.hpp> #include <srs_app_hls.hpp>
#include <srs_app_http.hpp> #include <srs_app_http.hpp>
#include <srs_app_bandwidth.hpp> #include <srs_app_bandwidth.hpp>
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_app_http_hooks.hpp> #include <srs_app_http_hooks.hpp>
#include <srs_app_edge.hpp> #include <srs_app_edge.hpp>
#include <srs_app_kbps.hpp> #include <srs_app_kbps.hpp>

@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>

@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef SRS_APP_SOCKET_HPP #ifndef SRS_APP_ST_SOCKET_HPP
#define SRS_APP_SOCKET_HPP #define SRS_APP_ST_SOCKET_HPP
/* /*
#include <srs_app_socket.hpp> #include <srs_app_st_socket.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

@ -104,8 +104,8 @@ file
..\app\srs_app_server.cpp, ..\app\srs_app_server.cpp,
..\app\srs_app_st.hpp, ..\app\srs_app_st.hpp,
..\app\srs_app_st.cpp, ..\app\srs_app_st.cpp,
..\app\srs_app_socket.hpp, ..\app\srs_app_st_socket.hpp,
..\app\srs_app_socket.cpp, ..\app\srs_app_st_socket.cpp,
..\app\srs_app_source.hpp, ..\app\srs_app_source.hpp,
..\app\srs_app_source.cpp, ..\app\srs_app_source.cpp,
..\app\srs_app_thread.hpp, ..\app\srs_app_thread.hpp,

Loading…
Cancel
Save