diff --git a/trunk/auto/rename.sh b/trunk/auto/rename.sh new file mode 100755 index 000000000..07ce59bbc --- /dev/null +++ b/trunk/auto/rename.sh @@ -0,0 +1,3 @@ +from=$1 +to=$2 +echo "rename from $from to $to" diff --git a/trunk/configure b/trunk/configure index 1126c3371..b0c552132 100755 --- a/trunk/configure +++ b/trunk/configure @@ -134,7 +134,7 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" "srs_core_config" "srs_core_refer" "srs_core_reload" "srs_core_hls" "srs_core_forward" "srs_core_encoder" "srs_core_http" "srs_core_thread" "srs_core_bandwidth") -MODULE_DIR="src/core" . auto/modules.sh +MODULE_DIR="src/app" . auto/modules.sh CORE_OBJS="${MODULE_OBJS[@]}" # #Main Module diff --git a/trunk/src/core/srs_core.cpp b/trunk/src/app/srs_core.cpp similarity index 100% rename from trunk/src/core/srs_core.cpp rename to trunk/src/app/srs_core.cpp diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/app/srs_core.hpp similarity index 100% rename from trunk/src/core/srs_core.hpp rename to trunk/src/app/srs_core.hpp diff --git a/trunk/src/core/srs_core_amf0.cpp b/trunk/src/app/srs_core_amf0.cpp similarity index 100% rename from trunk/src/core/srs_core_amf0.cpp rename to trunk/src/app/srs_core_amf0.cpp diff --git a/trunk/src/core/srs_core_amf0.hpp b/trunk/src/app/srs_core_amf0.hpp similarity index 100% rename from trunk/src/core/srs_core_amf0.hpp rename to trunk/src/app/srs_core_amf0.hpp diff --git a/trunk/src/core/srs_core_autofree.cpp b/trunk/src/app/srs_core_autofree.cpp similarity index 100% rename from trunk/src/core/srs_core_autofree.cpp rename to trunk/src/app/srs_core_autofree.cpp diff --git a/trunk/src/core/srs_core_autofree.hpp b/trunk/src/app/srs_core_autofree.hpp similarity index 100% rename from trunk/src/core/srs_core_autofree.hpp rename to trunk/src/app/srs_core_autofree.hpp diff --git a/trunk/src/core/srs_core_bandwidth.cpp b/trunk/src/app/srs_core_bandwidth.cpp similarity index 100% rename from trunk/src/core/srs_core_bandwidth.cpp rename to trunk/src/app/srs_core_bandwidth.cpp diff --git a/trunk/src/core/srs_core_bandwidth.hpp b/trunk/src/app/srs_core_bandwidth.hpp similarity index 100% rename from trunk/src/core/srs_core_bandwidth.hpp rename to trunk/src/app/srs_core_bandwidth.hpp diff --git a/trunk/src/core/srs_core_buffer.cpp b/trunk/src/app/srs_core_buffer.cpp similarity index 100% rename from trunk/src/core/srs_core_buffer.cpp rename to trunk/src/app/srs_core_buffer.cpp diff --git a/trunk/src/core/srs_core_buffer.hpp b/trunk/src/app/srs_core_buffer.hpp similarity index 100% rename from trunk/src/core/srs_core_buffer.hpp rename to trunk/src/app/srs_core_buffer.hpp diff --git a/trunk/src/core/srs_core_client.cpp b/trunk/src/app/srs_core_client.cpp similarity index 100% rename from trunk/src/core/srs_core_client.cpp rename to trunk/src/app/srs_core_client.cpp diff --git a/trunk/src/core/srs_core_client.hpp b/trunk/src/app/srs_core_client.hpp similarity index 100% rename from trunk/src/core/srs_core_client.hpp rename to trunk/src/app/srs_core_client.hpp diff --git a/trunk/src/core/srs_core_codec.cpp b/trunk/src/app/srs_core_codec.cpp similarity index 100% rename from trunk/src/core/srs_core_codec.cpp rename to trunk/src/app/srs_core_codec.cpp diff --git a/trunk/src/core/srs_core_codec.hpp b/trunk/src/app/srs_core_codec.hpp similarity index 100% rename from trunk/src/core/srs_core_codec.hpp rename to trunk/src/app/srs_core_codec.hpp diff --git a/trunk/src/core/srs_core_config.cpp b/trunk/src/app/srs_core_config.cpp similarity index 100% rename from trunk/src/core/srs_core_config.cpp rename to trunk/src/app/srs_core_config.cpp diff --git a/trunk/src/core/srs_core_config.hpp b/trunk/src/app/srs_core_config.hpp similarity index 100% rename from trunk/src/core/srs_core_config.hpp rename to trunk/src/app/srs_core_config.hpp diff --git a/trunk/src/core/srs_core_conn.cpp b/trunk/src/app/srs_core_conn.cpp similarity index 100% rename from trunk/src/core/srs_core_conn.cpp rename to trunk/src/app/srs_core_conn.cpp diff --git a/trunk/src/core/srs_core_conn.hpp b/trunk/src/app/srs_core_conn.hpp similarity index 100% rename from trunk/src/core/srs_core_conn.hpp rename to trunk/src/app/srs_core_conn.hpp diff --git a/trunk/src/core/srs_core_encoder.cpp b/trunk/src/app/srs_core_encoder.cpp similarity index 100% rename from trunk/src/core/srs_core_encoder.cpp rename to trunk/src/app/srs_core_encoder.cpp diff --git a/trunk/src/core/srs_core_encoder.hpp b/trunk/src/app/srs_core_encoder.hpp similarity index 100% rename from trunk/src/core/srs_core_encoder.hpp rename to trunk/src/app/srs_core_encoder.hpp diff --git a/trunk/src/core/srs_core_error.cpp b/trunk/src/app/srs_core_error.cpp similarity index 100% rename from trunk/src/core/srs_core_error.cpp rename to trunk/src/app/srs_core_error.cpp diff --git a/trunk/src/core/srs_core_error.hpp b/trunk/src/app/srs_core_error.hpp similarity index 100% rename from trunk/src/core/srs_core_error.hpp rename to trunk/src/app/srs_core_error.hpp diff --git a/trunk/src/core/srs_core_forward.cpp b/trunk/src/app/srs_core_forward.cpp similarity index 100% rename from trunk/src/core/srs_core_forward.cpp rename to trunk/src/app/srs_core_forward.cpp diff --git a/trunk/src/core/srs_core_forward.hpp b/trunk/src/app/srs_core_forward.hpp similarity index 100% rename from trunk/src/core/srs_core_forward.hpp rename to trunk/src/app/srs_core_forward.hpp diff --git a/trunk/src/core/srs_core_handshake.cpp b/trunk/src/app/srs_core_handshake.cpp similarity index 100% rename from trunk/src/core/srs_core_handshake.cpp rename to trunk/src/app/srs_core_handshake.cpp diff --git a/trunk/src/core/srs_core_handshake.hpp b/trunk/src/app/srs_core_handshake.hpp similarity index 100% rename from trunk/src/core/srs_core_handshake.hpp rename to trunk/src/app/srs_core_handshake.hpp diff --git a/trunk/src/core/srs_core_hls.cpp b/trunk/src/app/srs_core_hls.cpp similarity index 100% rename from trunk/src/core/srs_core_hls.cpp rename to trunk/src/app/srs_core_hls.cpp diff --git a/trunk/src/core/srs_core_hls.hpp b/trunk/src/app/srs_core_hls.hpp similarity index 100% rename from trunk/src/core/srs_core_hls.hpp rename to trunk/src/app/srs_core_hls.hpp diff --git a/trunk/src/core/srs_core_http.cpp b/trunk/src/app/srs_core_http.cpp similarity index 100% rename from trunk/src/core/srs_core_http.cpp rename to trunk/src/app/srs_core_http.cpp diff --git a/trunk/src/core/srs_core_http.hpp b/trunk/src/app/srs_core_http.hpp similarity index 100% rename from trunk/src/core/srs_core_http.hpp rename to trunk/src/app/srs_core_http.hpp diff --git a/trunk/src/core/srs_core_log.cpp b/trunk/src/app/srs_core_log.cpp similarity index 100% rename from trunk/src/core/srs_core_log.cpp rename to trunk/src/app/srs_core_log.cpp diff --git a/trunk/src/core/srs_core_log.hpp b/trunk/src/app/srs_core_log.hpp similarity index 100% rename from trunk/src/core/srs_core_log.hpp rename to trunk/src/app/srs_core_log.hpp diff --git a/trunk/src/core/srs_core_pithy_print.cpp b/trunk/src/app/srs_core_pithy_print.cpp similarity index 100% rename from trunk/src/core/srs_core_pithy_print.cpp rename to trunk/src/app/srs_core_pithy_print.cpp diff --git a/trunk/src/core/srs_core_pithy_print.hpp b/trunk/src/app/srs_core_pithy_print.hpp similarity index 100% rename from trunk/src/core/srs_core_pithy_print.hpp rename to trunk/src/app/srs_core_pithy_print.hpp diff --git a/trunk/src/core/srs_core_protocol.cpp b/trunk/src/app/srs_core_protocol.cpp similarity index 100% rename from trunk/src/core/srs_core_protocol.cpp rename to trunk/src/app/srs_core_protocol.cpp diff --git a/trunk/src/core/srs_core_protocol.hpp b/trunk/src/app/srs_core_protocol.hpp similarity index 100% rename from trunk/src/core/srs_core_protocol.hpp rename to trunk/src/app/srs_core_protocol.hpp diff --git a/trunk/src/core/srs_core_refer.cpp b/trunk/src/app/srs_core_refer.cpp similarity index 100% rename from trunk/src/core/srs_core_refer.cpp rename to trunk/src/app/srs_core_refer.cpp diff --git a/trunk/src/core/srs_core_refer.hpp b/trunk/src/app/srs_core_refer.hpp similarity index 100% rename from trunk/src/core/srs_core_refer.hpp rename to trunk/src/app/srs_core_refer.hpp diff --git a/trunk/src/core/srs_core_reload.cpp b/trunk/src/app/srs_core_reload.cpp similarity index 100% rename from trunk/src/core/srs_core_reload.cpp rename to trunk/src/app/srs_core_reload.cpp diff --git a/trunk/src/core/srs_core_reload.hpp b/trunk/src/app/srs_core_reload.hpp similarity index 100% rename from trunk/src/core/srs_core_reload.hpp rename to trunk/src/app/srs_core_reload.hpp diff --git a/trunk/src/core/srs_core_rtmp.cpp b/trunk/src/app/srs_core_rtmp.cpp similarity index 100% rename from trunk/src/core/srs_core_rtmp.cpp rename to trunk/src/app/srs_core_rtmp.cpp diff --git a/trunk/src/core/srs_core_rtmp.hpp b/trunk/src/app/srs_core_rtmp.hpp similarity index 100% rename from trunk/src/core/srs_core_rtmp.hpp rename to trunk/src/app/srs_core_rtmp.hpp diff --git a/trunk/src/core/srs_core_server.cpp b/trunk/src/app/srs_core_server.cpp similarity index 100% rename from trunk/src/core/srs_core_server.cpp rename to trunk/src/app/srs_core_server.cpp diff --git a/trunk/src/core/srs_core_server.hpp b/trunk/src/app/srs_core_server.hpp similarity index 100% rename from trunk/src/core/srs_core_server.hpp rename to trunk/src/app/srs_core_server.hpp diff --git a/trunk/src/core/srs_core_socket.cpp b/trunk/src/app/srs_core_socket.cpp similarity index 100% rename from trunk/src/core/srs_core_socket.cpp rename to trunk/src/app/srs_core_socket.cpp diff --git a/trunk/src/core/srs_core_socket.hpp b/trunk/src/app/srs_core_socket.hpp similarity index 100% rename from trunk/src/core/srs_core_socket.hpp rename to trunk/src/app/srs_core_socket.hpp diff --git a/trunk/src/core/srs_core_source.cpp b/trunk/src/app/srs_core_source.cpp similarity index 100% rename from trunk/src/core/srs_core_source.cpp rename to trunk/src/app/srs_core_source.cpp diff --git a/trunk/src/core/srs_core_source.hpp b/trunk/src/app/srs_core_source.hpp similarity index 100% rename from trunk/src/core/srs_core_source.hpp rename to trunk/src/app/srs_core_source.hpp diff --git a/trunk/src/core/srs_core_stream.cpp b/trunk/src/app/srs_core_stream.cpp similarity index 100% rename from trunk/src/core/srs_core_stream.cpp rename to trunk/src/app/srs_core_stream.cpp diff --git a/trunk/src/core/srs_core_stream.hpp b/trunk/src/app/srs_core_stream.hpp similarity index 100% rename from trunk/src/core/srs_core_stream.hpp rename to trunk/src/app/srs_core_stream.hpp diff --git a/trunk/src/core/srs_core_thread.cpp b/trunk/src/app/srs_core_thread.cpp similarity index 100% rename from trunk/src/core/srs_core_thread.cpp rename to trunk/src/app/srs_core_thread.cpp diff --git a/trunk/src/core/srs_core_thread.hpp b/trunk/src/app/srs_core_thread.hpp similarity index 100% rename from trunk/src/core/srs_core_thread.hpp rename to trunk/src/app/srs_core_thread.hpp diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index fca1a86ca..e415e216a 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -4,59 +4,59 @@ file ..\main\srs_main_bandcheck.cpp, auto readonly separator, ..\..\objs\srs_auto_headers.hpp, - core readonly separator, - ..\core\srs_core.hpp, - ..\core\srs_core.cpp, - ..\core\srs_core_amf0.hpp, - ..\core\srs_core_amf0.cpp, - ..\core\srs_core_autofree.hpp, - ..\core\srs_core_autofree.cpp, - ..\core\srs_core_bandwidth.hpp, - ..\core\srs_core_bandwidth.cpp, - ..\core\srs_core_buffer.hpp, - ..\core\srs_core_buffer.cpp, - ..\core\srs_core_client.hpp, - ..\core\srs_core_client.cpp, - ..\core\srs_core_codec.hpp, - ..\core\srs_core_codec.cpp, - ..\core\srs_core_config.hpp, - ..\core\srs_core_config.cpp, - ..\core\srs_core_conn.hpp, - ..\core\srs_core_conn.cpp, - ..\core\srs_core_encoder.hpp, - ..\core\srs_core_encoder.cpp, - ..\core\srs_core_error.hpp, - ..\core\srs_core_error.cpp, - ..\core\srs_core_forward.hpp, - ..\core\srs_core_forward.cpp, - ..\core\srs_core_handshake.hpp, - ..\core\srs_core_handshake.cpp, - ..\core\srs_core_hls.hpp, - ..\core\srs_core_hls.cpp, - ..\core\srs_core_http.hpp, - ..\core\srs_core_http.cpp, - ..\core\srs_core_log.hpp, - ..\core\srs_core_log.cpp, - ..\core\srs_core_pithy_print.hpp, - ..\core\srs_core_pithy_print.cpp, - ..\core\srs_core_protocol.hpp, - ..\core\srs_core_protocol.cpp, - ..\core\srs_core_refer.hpp, - ..\core\srs_core_refer.cpp, - ..\core\srs_core_reload.hpp, - ..\core\srs_core_reload.cpp, - ..\core\srs_core_rtmp.hpp, - ..\core\srs_core_rtmp.cpp, - ..\core\srs_core_thread.hpp, - ..\core\srs_core_thread.cpp, - ..\core\srs_core_server.hpp, - ..\core\srs_core_server.cpp, - ..\core\srs_core_stream.hpp, - ..\core\srs_core_stream.cpp, - ..\core\srs_core_socket.hpp, - ..\core\srs_core_socket.cpp, - ..\core\srs_core_source.hpp, - ..\core\srs_core_source.cpp, + app readonly separator, + ..\app\srs_core.hpp, + ..\app\srs_core.cpp, + ..\app\srs_core_amf0.hpp, + ..\app\srs_core_amf0.cpp, + ..\app\srs_core_autofree.hpp, + ..\app\srs_core_autofree.cpp, + ..\app\srs_core_bandwidth.hpp, + ..\app\srs_core_bandwidth.cpp, + ..\app\srs_core_buffer.hpp, + ..\app\srs_core_buffer.cpp, + ..\app\srs_core_client.hpp, + ..\app\srs_core_client.cpp, + ..\app\srs_core_codec.hpp, + ..\app\srs_core_codec.cpp, + ..\app\srs_core_config.hpp, + ..\app\srs_core_config.cpp, + ..\app\srs_core_conn.hpp, + ..\app\srs_core_conn.cpp, + ..\app\srs_core_encoder.hpp, + ..\app\srs_core_encoder.cpp, + ..\app\srs_core_error.hpp, + ..\app\srs_core_error.cpp, + ..\app\srs_core_forward.hpp, + ..\app\srs_core_forward.cpp, + ..\app\srs_core_handshake.hpp, + ..\app\srs_core_handshake.cpp, + ..\app\srs_core_hls.hpp, + ..\app\srs_core_hls.cpp, + ..\app\srs_core_http.hpp, + ..\app\srs_core_http.cpp, + ..\app\srs_core_log.hpp, + ..\app\srs_core_log.cpp, + ..\app\srs_core_pithy_print.hpp, + ..\app\srs_core_pithy_print.cpp, + ..\app\srs_core_protocol.hpp, + ..\app\srs_core_protocol.cpp, + ..\app\srs_core_refer.hpp, + ..\app\srs_core_refer.cpp, + ..\app\srs_core_reload.hpp, + ..\app\srs_core_reload.cpp, + ..\app\srs_core_rtmp.hpp, + ..\app\srs_core_rtmp.cpp, + ..\app\srs_core_thread.hpp, + ..\app\srs_core_thread.cpp, + ..\app\srs_core_server.hpp, + ..\app\srs_core_server.cpp, + ..\app\srs_core_stream.hpp, + ..\app\srs_core_stream.cpp, + ..\app\srs_core_socket.hpp, + ..\app\srs_core_socket.cpp, + ..\app\srs_core_source.hpp, + ..\app\srs_core_source.cpp, research readonly separator, ..\..\research\hls\ts_info.cc;