final the modularity, rename the app module.

trunk/configure

@@ -185,10 +185,10 @@ RTMP_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="APP" 
 MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") 
 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
-MODULE_FILES=("srs_core_server" "srs_core_conn" "srs_core_client" "srs_core_socket" "srs_core_source" 
-        "srs_core_codec" "srs_core_refer" "srs_core_hls" "srs_core_forward" "srs_core_encoder"
-        "srs_core_http" "srs_core_thread" "srs_core_bandwidth" "srs_core_st" "srs_core_log"
-        "srs_core_config" "srs_core_pithy_print" "srs_core_reload")
+MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_client" "srs_app_socket" "srs_app_source" 
+        "srs_app_codec" "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_pithy_print" "srs_app_reload")
 MODULE_DIR="src/app" . auto/modules.sh
 APP_OBJS="${MODULE_OBJS[@]}"
 #

trunk/src/app/srs_app_bandwidth.cpp

@@ -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.
 */
 
-#include <srs_core_bandwidth.hpp>
+#include <srs_app_bandwidth.hpp>
 
 #include <arpa/inet.h>
 #include <sstream>
@@ -32,7 +32,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_core_config.hpp>
+#include <srs_app_config.hpp>
 #include <srs_core_autofree.hpp>
 
 SrsBandwidth::SrsBandwidth()

trunk/src/app/srs_app_bandwidth.hpp

@@ -21,15 +21,15 @@ 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.
 */
 
-#ifndef SRS_CORE_BANDWIDTH_HPP
-#define SRS_CORE_BANDWIDTH_HPP
+#ifndef SRS_APP_BANDWIDTH_HPP
+#define SRS_APP_BANDWIDTH_HPP
 
 /*
-#include <srs_core_bandwidth.hpp>
+#include <srs_app_bandwidth.hpp>
 */
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 
 class SrsRequest;
 class SrsRtmpServer;

trunk/src/app/srs_app_client.cpp

@@ -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.
 */
 
-#include <srs_core_client.hpp>
+#include <srs_app_client.hpp>
 
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -33,15 +33,15 @@ using namespace std;
 #include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_core_source.hpp>
-#include <srs_core_server.hpp>
-#include <srs_core_pithy_print.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_refer.hpp>
-#include <srs_core_hls.hpp>
-#include <srs_core_http.hpp>
-#include <srs_core_bandwidth.hpp>
-#include <srs_core_socket.hpp>
+#include <srs_app_source.hpp>
+#include <srs_app_server.hpp>
+#include <srs_app_pithy_print.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_refer.hpp>
+#include <srs_app_hls.hpp>
+#include <srs_app_http.hpp>
+#include <srs_app_bandwidth.hpp>
+#include <srs_app_socket.hpp>
 
 SrsClient::SrsClient(SrsServer* srs_server, st_netfd_t client_stfd)
 	: SrsConnection(srs_server, client_stfd)

trunk/src/app/srs_app_client.hpp

@@ -21,18 +21,18 @@ 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.
 */
 
-#ifndef SRS_CORE_CLIENT_HPP
-#define SRS_CORE_CLIENT_HPP
+#ifndef SRS_APP_CLIENT_HPP
+#define SRS_APP_CLIENT_HPP
 
 /*
-#include <srs_core_client.hpp>
+#include <srs_app_client.hpp>
 */
 
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
-#include <srs_core_conn.hpp>
-#include <srs_core_reload.hpp>
+#include <srs_app_st.hpp>
+#include <srs_app_conn.hpp>
+#include <srs_app_reload.hpp>
 
 class SrsRtmpServer;
 class SrsRequest;

trunk/src/app/srs_app_codec.cpp

@@ -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.
 */
 
-#include <srs_core_codec.hpp>
+#include <srs_app_codec.hpp>
 
 #include <string.h>
 #include <stdlib.h>

trunk/src/app/srs_app_codec.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.
 */
 
-#ifndef SRS_CORE_CODEC_HPP
-#define SRS_CORE_CODEC_HPP
+#ifndef SRS_APP_CODEC_HPP
+#define SRS_APP_CODEC_HPP
 
 /*
-#include <srs_core_codec.hpp>
+#include <srs_app_codec.hpp>
 */
 
 #include <srs_core.hpp>

trunk/src/app/srs_app_config.cpp

@@ -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.
 */
 
-#include <srs_core_config.hpp>
+#include <srs_app_config.hpp>
 
 #include <stdio.h>
 #include <stdlib.h>

trunk/src/app/srs_app_config.hpp

@@ -21,18 +21,18 @@ 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.
 */
 
-#ifndef SRS_CORE_CONIFG_HPP
-#define SRS_CORE_CONIFG_HPP
+#ifndef SRS_APP_CONIFG_HPP
+#define SRS_APP_CONIFG_HPP
 
 /*
-#include <srs_core_config.hpp>
+#include <srs_app_config.hpp>
 */
 #include <srs_core.hpp>
 
 #include <vector>
 #include <string>
 
-#include <srs_core_reload.hpp>
+#include <srs_app_reload.hpp>
 
 // default vhost for rtmp
 #define RTMP_VHOST_DEFAULT "__defaultVhost__"

trunk/src/app/srs_app_conn.cpp

@@ -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.
 */
 
-#include <srs_core_conn.hpp>
+#include <srs_app_conn.hpp>
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_core_server.hpp>
+#include <srs_app_server.hpp>
 
 SrsConnection::SrsConnection(SrsServer* srs_server, st_netfd_t client_stfd)
 {

trunk/src/app/srs_app_conn.hpp

@@ -21,16 +21,16 @@ 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.
 */
 
-#ifndef SRS_CORE_CONN_HPP
-#define SRS_CORE_CONN_HPP
+#ifndef SRS_APP_CONN_HPP
+#define SRS_APP_CONN_HPP
 
 /*
-#include <srs_core_conn.hpp>
+#include <srs_app_conn.hpp>
 */
 
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 
 class SrsServer;
 class SrsConnection

trunk/src/app/srs_app_encoder.cpp

@@ -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.
 */
 
-#include <srs_core_encoder.hpp>
+#include <srs_app_encoder.hpp>
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_config.hpp>
+#include <srs_app_config.hpp>
 #include <srs_protocol_rtmp.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_app_pithy_print.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 
 #ifdef SRS_FFMPEG

trunk/src/app/srs_app_encoder.hpp

@@ -21,18 +21,18 @@ 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.
 */
 
-#ifndef SRS_CORE_ENCODER_HPP
-#define SRS_CORE_ENCODER_HPP
+#ifndef SRS_APP_ENCODER_HPP
+#define SRS_APP_ENCODER_HPP
 
 /*
-#include <srs_core_encoder.hpp>
+#include <srs_app_encoder.hpp>
 */
 #include <srs_core.hpp>
 
 #include <string>
 #include <vector>
 
-#include <srs_core_thread.hpp>
+#include <srs_app_thread.hpp>
 
 class SrsConfDirective;
 class SrsRequest;

trunk/src/app/srs_app_forward.cpp

@@ -21,20 +21,20 @@ 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.
 */
 
-#include <srs_core_forward.hpp>
+#include <srs_app_forward.hpp>
 
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <srs_core_source.hpp>
+#include <srs_app_source.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_core_socket.hpp>
+#include <srs_app_socket.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_pithy_print.hpp>
 #include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_utility.hpp>

trunk/src/app/srs_app_forward.hpp

@@ -21,18 +21,18 @@ 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.
 */
 
-#ifndef SRS_CORE_FORWARD_HPP
-#define SRS_CORE_FORWARD_HPP
+#ifndef SRS_APP_FORWARD_HPP
+#define SRS_APP_FORWARD_HPP
 
 /*
-#include <srs_core_forward.hpp>
+#include <srs_app_forward.hpp>
 */
 #include <srs_core.hpp>
 
 #include <string>
 
-#include <srs_core_st.hpp>
-#include <srs_core_thread.hpp>
+#include <srs_app_st.hpp>
+#include <srs_app_thread.hpp>
 
 class ISrsProtocolReaderWriter;
 class SrsSharedPtrMessage;

trunk/src/app/srs_app_hls.cpp

@@ -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.
 */
 
-#include <srs_core_hls.hpp>
+#include <srs_app_hls.hpp>
 
 #ifdef SRS_HLS
 
@@ -34,14 +34,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <algorithm>
 
 #include <srs_kernel_error.hpp>
-#include <srs_core_codec.hpp>
+#include <srs_app_codec.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_source.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_source.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_rtmp.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_app_pithy_print.hpp>
 
 // max PES packets size to flush the video.
 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024

trunk/src/app/srs_app_hls.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.
 */
 
-#ifndef SRS_CORE_HLS_HPP
-#define SRS_CORE_HLS_HPP
+#ifndef SRS_APP_HLS_HPP
+#define SRS_APP_HLS_HPP
 
 /*
-#include <srs_core_hls.hpp>
+#include <srs_app_hls.hpp>
 */
 #include <srs_core.hpp>
 

trunk/src/app/srs_app_http.cpp

@@ -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.
 */
 
-#include <srs_core_http.hpp>
+#include <srs_app_http.hpp>
 
 #ifdef SRS_HTTP
 
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_socket.hpp>
+#include <srs_app_socket.hpp>
 
 #define SRS_DEFAULT_HTTP_PORT 80
 #define SRS_HTTP_RESPONSE_OK "0"

trunk/src/app/srs_app_http.hpp

@@ -21,15 +21,15 @@ 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.
 */
 
-#ifndef SRS_CORE_HTTP_HPP
-#define SRS_CORE_HTTP_HPP
+#ifndef SRS_APP_HTTP_HPP
+#define SRS_APP_HTTP_HPP
 
 /*
-#include <srs_core_http.hpp>
+#include <srs_app_http.hpp>
 */
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 
 #ifdef SRS_HTTP
 

trunk/src/app/srs_app_log.cpp

@@ -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.
 */
 
-#include <srs_core_log.hpp>
+#include <srs_app_log.hpp>
 
 #include <stdarg.h>
 #include <sys/time.h>

trunk/src/app/srs_app_log.hpp

@@ -21,16 +21,16 @@ 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.
 */
 
-#ifndef SRS_CORE_LOG_HPP
-#define SRS_CORE_LOG_HPP
+#ifndef SRS_APP_LOG_HPP
+#define SRS_APP_LOG_HPP
 
 /*
-#include <srs_core_log.hpp>
+#include <srs_app_log.hpp>
 */
 
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 #include <srs_kernel_log.hpp>
 
 #include <string.h>

trunk/src/app/srs_app_pithy_print.cpp

@@ -21,14 +21,14 @@ 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.
 */
 
-#include <srs_core_pithy_print.hpp>
+#include <srs_app_pithy_print.hpp>
 
 #include <stdlib.h>
 #include <map>
 
 #include <srs_kernel_log.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_reload.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_reload.hpp>
 #include <srs_kernel_error.hpp>
 
 #define SRS_STAGE_DEFAULT_INTERVAL_MS 1200

trunk/src/app/srs_app_pithy_print.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.
 */
 
-#ifndef SRS_CORE_PITHY_PRINT_HPP
-#define SRS_CORE_PITHY_PRINT_HPP
+#ifndef SRS_APP_PITHY_PRINT_HPP
+#define SRS_APP_PITHY_PRINT_HPP
 
 /*
-#include <srs_core_pithy_print.hpp>
+#include <srs_app_pithy_print.hpp>
 */
 
 #include <srs_core.hpp>

trunk/src/app/srs_app_refer.cpp

@@ -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.
 */
 
-#include <srs_core_refer.hpp>
+#include <srs_app_refer.hpp>
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_config.hpp>
+#include <srs_app_config.hpp>
 
 int SrsRefer::check(std::string page_url, SrsConfDirective* refer)
 {

trunk/src/app/srs_app_refer.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.
 */
 
-#ifndef SRS_CORE_REFER_HPP
-#define SRS_CORE_REFER_HPP
+#ifndef SRS_APP_REFER_HPP
+#define SRS_APP_REFER_HPP
 
 /*
-#include <srs_core_refer.hpp>
+#include <srs_app_refer.hpp>
 */
 #include <srs_core.hpp>
 

trunk/src/app/srs_app_reload.cpp

@@ -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.
 */
 
-#include <srs_core_reload.hpp>
+#include <srs_app_reload.hpp>
 
 using namespace std;
 

trunk/src/app/srs_app_reload.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.
 */
 
-#ifndef SRS_KERNEL_RELOAD_HPP
-#define SRS_KERNEL_RELOAD_HPP
+#ifndef SRS_APP_RELOAD_HPP
+#define SRS_APP_RELOAD_HPP
 
 /*
-#include <srs_core_reload.hpp>
+#include <srs_app_reload.hpp>
 */
 #include <srs_core.hpp>
 

trunk/src/app/srs_app_server.cpp

@@ -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.
 */
 
-#include <srs_core_server.hpp>
+#include <srs_app_server.hpp>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_core_client.hpp>
-#include <srs_core_config.hpp>
+#include <srs_app_client.hpp>
+#include <srs_app_config.hpp>
 
 #define SERVER_LISTEN_BACKLOG 512
 #define SRS_TIME_RESOLUTION_MS 500

trunk/src/app/srs_app_server.hpp

@@ -21,20 +21,20 @@ 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.
 */
 
-#ifndef SRS_CORE_SERVER_HPP
-#define SRS_CORE_SERVER_HPP
+#ifndef SRS_APP_SERVER_HPP
+#define SRS_APP_SERVER_HPP
 
 /*
-#include <srs_core_server.hpp>
+#include <srs_app_server.hpp>
 */
 
 #include <srs_core.hpp>
 
 #include <vector>
 
-#include <srs_core_st.hpp>
-#include <srs_core_reload.hpp>
-#include <srs_core_thread.hpp>
+#include <srs_app_st.hpp>
+#include <srs_app_reload.hpp>
+#include <srs_app_thread.hpp>
 
 class SrsServer;
 class SrsConnection;

trunk/src/app/srs_app_socket.cpp

@@ -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.
 */
 
-#include <srs_core_socket.hpp>
+#include <srs_app_socket.hpp>
 
 #include <srs_kernel_error.hpp>
 

trunk/src/app/srs_app_socket.hpp

@@ -21,16 +21,16 @@ 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.
 */
 
-#ifndef SRS_CORE_SOCKET_HPP
-#define SRS_CORE_SOCKET_HPP
+#ifndef SRS_APP_SOCKET_HPP
+#define SRS_APP_SOCKET_HPP
 
 /*
-#include <srs_core_socket.hpp>
+#include <srs_app_socket.hpp>
 */
 
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 #include <srs_protocol_io.hpp>
 
 /**

trunk/src/app/srs_app_source.cpp

@@ -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.
 */
 
-#include <srs_core_source.hpp>
+#include <srs_app_source.hpp>
 
 #include <algorithm>
 using namespace std;
@@ -30,11 +30,11 @@ using namespace std;
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_core_codec.hpp>
-#include <srs_core_hls.hpp>
-#include <srs_core_forward.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_encoder.hpp>
+#include <srs_app_codec.hpp>
+#include <srs_app_hls.hpp>
+#include <srs_app_forward.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_encoder.hpp>
 #include <srs_protocol_rtmp.hpp>
 
 #define CONST_MAX_JITTER_MS 		500

trunk/src/app/srs_app_source.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.
 */
 
-#ifndef SRS_CORE_SOURCE_HPP
-#define SRS_CORE_SOURCE_HPP
+#ifndef SRS_APP_SOURCE_HPP
+#define SRS_APP_SOURCE_HPP
 
 /*
-#include <srs_core_source.hpp>
+#include <srs_app_source.hpp>
 */
 
 #include <srs_core.hpp>
@@ -34,8 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <vector>
 #include <string>
 
-#include <srs_core_st.hpp>
-#include <srs_core_reload.hpp>
+#include <srs_app_st.hpp>
+#include <srs_app_reload.hpp>
 
 class SrsSource;
 class SrsCommonMessage;

trunk/src/app/srs_app_st.cpp

@@ -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.
 */
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 
 void srs_close_stfd(st_netfd_t& stfd)
 {

trunk/src/app/srs_app_st.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.
 */
 
-#ifndef SRS_CORE_ST_HPP
-#define SRS_CORE_ST_HPP
+#ifndef SRS_APP_ST_HPP
+#define SRS_APP_ST_HPP
 
 /*
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 */
 
 #include <srs_core.hpp>

trunk/src/app/srs_app_thread.cpp

@@ -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.
 */
 
-#include <srs_core_thread.hpp>
+#include <srs_app_thread.hpp>
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>

trunk/src/app/srs_app_thread.hpp

@@ -21,15 +21,15 @@ 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.
 */
 
-#ifndef SRS_CORE_THREAD_HPP
-#define SRS_CORE_THREAD_HPP
+#ifndef SRS_APP_THREAD_HPP
+#define SRS_APP_THREAD_HPP
 
 /*
-#include <srs_core_thread.hpp>
+#include <srs_app_thread.hpp>
 */
 #include <srs_core.hpp>
 
-#include <srs_core_st.hpp>
+#include <srs_app_st.hpp>
 
 /**
 * the handler for the thread, callback interface.

trunk/src/main/srs_main_bandcheck.cpp

@@ -34,10 +34,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_stream.hpp>
-#include <srs_core_socket.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_log.hpp>
-#include <srs_core_server.hpp>
+#include <srs_app_socket.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_log.hpp>
+#include <srs_app_server.hpp>
 
 // kernel module.
 ISrsLog* _srs_log = new SrsFastLog();

trunk/src/main/srs_main_server.cpp

@@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_core_server.hpp>
-#include <srs_core_config.hpp>
-#include <srs_core_log.hpp>
+#include <srs_app_server.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_log.hpp>
 
 // kernel module.
 ISrsLog* _srs_log = new SrsFastLog();

trunk/src/srs/srs.upp

@@ -37,42 +37,42 @@ file
     ..\rtmp\srs_protocol_utility.hpp,
     ..\rtmp\srs_protocol_utility.cpp,
     app readonly separator,
-    ..\app\srs_core_bandwidth.hpp,
-    ..\app\srs_core_bandwidth.cpp,
-    ..\app\srs_core_client.hpp,
-    ..\app\srs_core_client.cpp,
-    ..\app\srs_core_codec.hpp,
-    ..\app\srs_core_codec.cpp,
-    ..\app\srs_core_conn.hpp,
-    ..\app\srs_core_conn.cpp,
-    ..\app\srs_core_config.hpp,
-    ..\app\srs_core_config.cpp,
-    ..\app\srs_core_encoder.hpp,
-    ..\app\srs_core_encoder.cpp,
-    ..\app\srs_core_forward.hpp,
-    ..\app\srs_core_forward.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_refer.hpp,
-    ..\app\srs_core_refer.cpp,
-    ..\app\srs_core_reload.hpp,
-    ..\app\srs_core_reload.cpp,
-    ..\app\srs_core_pithy_print.hpp,
-    ..\app\srs_core_pithy_print.cpp,
-    ..\app\srs_core_thread.hpp,
-    ..\app\srs_core_thread.cpp,
-    ..\app\srs_core_server.hpp,
-    ..\app\srs_core_server.cpp,
-    ..\app\srs_core_st.hpp,
-    ..\app\srs_core_st.cpp,
-    ..\app\srs_core_socket.hpp,
-    ..\app\srs_core_socket.cpp,
-    ..\app\srs_core_source.hpp,
-    ..\app\srs_core_source.cpp,
+    ..\app\srs_app_bandwidth.hpp,
+    ..\app\srs_app_bandwidth.cpp,
+    ..\app\srs_app_client.hpp,
+    ..\app\srs_app_client.cpp,
+    ..\app\srs_app_codec.hpp,
+    ..\app\srs_app_codec.cpp,
+    ..\app\srs_app_conn.hpp,
+    ..\app\srs_app_conn.cpp,
+    ..\app\srs_app_config.hpp,
+    ..\app\srs_app_config.cpp,
+    ..\app\srs_app_encoder.hpp,
+    ..\app\srs_app_encoder.cpp,
+    ..\app\srs_app_forward.hpp,
+    ..\app\srs_app_forward.cpp,
+    ..\app\srs_app_hls.hpp,
+    ..\app\srs_app_hls.cpp,
+    ..\app\srs_app_http.hpp,
+    ..\app\srs_app_http.cpp,
+    ..\app\srs_app_log.hpp,
+    ..\app\srs_app_log.cpp,
+    ..\app\srs_app_refer.hpp,
+    ..\app\srs_app_refer.cpp,
+    ..\app\srs_app_reload.hpp,
+    ..\app\srs_app_reload.cpp,
+    ..\app\srs_app_pithy_print.hpp,
+    ..\app\srs_app_pithy_print.cpp,
+    ..\app\srs_app_thread.hpp,
+    ..\app\srs_app_thread.cpp,
+    ..\app\srs_app_server.hpp,
+    ..\app\srs_app_server.cpp,
+    ..\app\srs_app_st.hpp,
+    ..\app\srs_app_st.cpp,
+    ..\app\srs_app_socket.hpp,
+    ..\app\srs_app_socket.cpp,
+    ..\app\srs_app_source.hpp,
+    ..\app\srs_app_source.cpp,
     research readonly separator,
     ..\..\research\librtmp\srs_play.c,
     ..\..\research\librtmp\srs_publish.c,