rename protocol dir to pro. move rtmp stack to protocol module

trunk/configure

@@ -142,8 +142,8 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="PROTOCOL" 
 MODULE_DEPENDS=("CORE" "KERNEL") 
 ModuleLibIncs=(${SRS_OBJS})
-MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io")
+MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack")
-MODULE_DIR="src/protocol" . auto/modules.sh
+MODULE_DIR="src/pro" . auto/modules.sh
 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
 #
 #App Module
@@ -151,10 +151,9 @@ MODULE_ID="APP"
 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") 
 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
 MODULE_FILES=("srs_core_server" 
-         "srs_core_conn" "srs_core_client" 
+        "srs_core_conn" "srs_core_client" 
         "srs_core_rtmp" "srs_core_socket" 
-        "srs_core_protocol" 
+        "srs_core_source" "srs_core_codec"
-         "srs_core_source" "srs_core_codec"
         "srs_core_handshake" "srs_core_refer"
         "srs_core_hls" "srs_core_forward" "srs_core_encoder"
         "srs_core_http" "srs_core_thread" "srs_core_bandwidth"

trunk/src/app/srs_core_bandwidth.cpp

@@ -31,7 +31,7 @@ using namespace std;
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_autofree.hpp>
 

trunk/src/app/srs_core_client.cpp

@@ -31,7 +31,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_core_rtmp.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_server.hpp>

trunk/src/app/srs_core_encoder.cpp

@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_config.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_pithy_print.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 #ifdef SRS_FFMPEG
 

trunk/src/app/srs_core_forward.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_pithy_print.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_config.hpp>

trunk/src/app/srs_core_hls.cpp

@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_core_codec.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/app/srs_core_rtmp.cpp

@@ -26,7 +26,7 @@ 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_protocol_io.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_handshake.hpp>

trunk/src/app/srs_core_source.cpp

@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_kernel_log.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_codec.hpp>

trunk/src/main/srs_main_bandcheck.cpp

@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 
 #include <srs_core_rtmp.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/pro/srs_protocol_rtmp_stack.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_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 #include <srs_kernel_log.hpp>
 #include <srs_protocol_amf0.hpp>

trunk/src/pro/srs_protocol_rtmp_stack.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_PROTOCOL_HPP
+#ifndef SRS_PROTOCOL_RTMP_STACK_HPP
-#define SRS_CORE_PROTOCOL_HPP
+#define SRS_PROTOCOL_RTMP_STACK_HPP
 
 /*
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 */
 
 #include <srs_core.hpp>

trunk/src/srs/srs.upp

@@ -25,10 +25,12 @@ file
     ..\kernel\srs_kernel_stream.hpp,
     ..\kernel\srs_kernel_stream.cpp,
     protocol readonly separator,
-    ..\protocol\srs_protocol_amf0.hpp,
+    ..\pro\srs_protocol_amf0.hpp,
-    ..\protocol\srs_protocol_amf0.cpp,
+    ..\pro\srs_protocol_amf0.cpp,
-    ..\protocol\srs_protocol_io.hpp,
+    ..\pro\srs_protocol_io.hpp,
-    ..\protocol\srs_protocol_io.cpp,
+    ..\pro\srs_protocol_io.cpp,
+    ..\pro\srs_protocol_rtmp_stack.hpp,
+    ..\pro\srs_protocol_rtmp_stack.cpp,
     app readonly separator,
     ..\app\srs_core_bandwidth.hpp,
     ..\app\srs_core_bandwidth.cpp,
@@ -50,8 +52,6 @@ file
     ..\app\srs_core_http.cpp,
     ..\app\srs_core_log_context.hpp,
     ..\app\srs_core_log_context.cpp,
-    ..\app\srs_core_protocol.hpp,
-    ..\app\srs_core_protocol.cpp,
     ..\app\srs_core_refer.hpp,
     ..\app\srs_core_refer.cpp,
     ..\app\srs_core_rtmp.hpp,