From d22e4e86d81d16f06804025d683d16006ae46def Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 24 Jan 2015 16:59:36 +0800
Subject: [PATCH] update projects for rtmp renamed to protocol

---
 trunk/ide/srs_clion/CMakeLists.txt   | 4 ++--
 trunk/ide/srs_qt/srs-qt.pro          | 6 +++---
 trunk/ide/srs_vs2010/srs.vcxproj     | 4 ++--
 trunk/src/app/srs_app_mpegts_udp.cpp | 4 ++++
 trunk/src/app/srs_app_mpegts_udp.hpp | 3 +++
 trunk/src/app/srs_app_server.cpp     | 3 ---
 6 files changed, 14 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 trunk/ide/srs_clion/CMakeLists.txt

diff --git a/trunk/ide/srs_clion/CMakeLists.txt b/trunk/ide/srs_clion/CMakeLists.txt
old mode 100644
new mode 100755
index 089243e09..082ec1370
--- a/trunk/ide/srs_clion/CMakeLists.txt
+++ b/trunk/ide/srs_clion/CMakeLists.txt
@@ -3,12 +3,12 @@ project(srs CXX)
 
 INCLUDE_DIRECTORIES(../../objs 
     ../../objs/st ../../objs/hp ../../objs/openssl/include 
-    ../../src/core ../../src/kernel ../../src/rtmp ../../src/app)
+    ../../src/core ../../src/kernel ../../src/protocol ../../src/app)
 
 set(SOURCE_FILES ../../src/main/srs_main_server.cpp)
 AUX_SOURCE_DIRECTORY(../../src/core SOURCE_FILES)
 AUX_SOURCE_DIRECTORY(../../src/kernel SOURCE_FILES)
-AUX_SOURCE_DIRECTORY(../../src/rtmp SOURCE_FILES)
+AUX_SOURCE_DIRECTORY(../../src/protocol SOURCE_FILES)
 AUX_SOURCE_DIRECTORY(../../src/app SOURCE_FILES)
 
 ADD_DEFINITIONS("-g -O0")
diff --git a/trunk/ide/srs_qt/srs-qt.pro b/trunk/ide/srs_qt/srs-qt.pro
index 80240165e..a1933712d 100755
--- a/trunk/ide/srs_qt/srs-qt.pro
+++ b/trunk/ide/srs_qt/srs-qt.pro
@@ -7,20 +7,20 @@ HEADERS += \
     ../../src/core/*.hpp \
     ../../src/kernel/*.hpp \
     ../../src/app/*.hpp \
-    ../../src/rtmp/*.hpp
+    ../../src/protocol/*.hpp
 
 SOURCES += \
     ../../src/core/*.cpp \
     ../../src/kernel/*.cpp \
     ../../src/app/*.cpp \
-    ../../src/rtmp/*.cpp \
+    ../../src/protocol/*.cpp \
     ../../src/main/*.cpp
 
 INCLUDEPATH += \
     ../../src/core \
     ../../src/kernel \
     ../../src/app \
-    ../../src/rtmp \
+    ../../src/protocol \
     ../../objs \
     ../../objs/st \
     ../../objs/hp \
diff --git a/trunk/ide/srs_vs2010/srs.vcxproj b/trunk/ide/srs_vs2010/srs.vcxproj
index fbebea036..2a435734e 100755
--- a/trunk/ide/srs_vs2010/srs.vcxproj
+++ b/trunk/ide/srs_vs2010/srs.vcxproj
@@ -36,8 +36,8 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)/../../src/core;$(ProjectDir)/../../src/kernel;$(ProjectDir)/../../src/rtmp;$(ProjectDir)/../../src/app;$(ProjectDir)/../../src/libs;$(ProjectDir)/../../objs;$(IncludePath)</IncludePath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
+    <IncludePath>$(ProjectDir)/../../src/core;$(ProjectDir)/../../src/kernel;$(ProjectDir)/../../src/protocol;$(ProjectDir)/../../src/app;$(ProjectDir)/../../src/libs;$(ProjectDir)/../../objs;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/trunk/src/app/srs_app_mpegts_udp.cpp b/trunk/src/app/srs_app_mpegts_udp.cpp
index af05926c6..09e3e6817 100644
--- a/trunk/src/app/srs_app_mpegts_udp.cpp
+++ b/trunk/src/app/srs_app_mpegts_udp.cpp
@@ -26,15 +26,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+using namespace std;
 
 #include <srs_app_config.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
+#include <srs_app_config.hpp>
 
 #ifdef SRS_AUTO_STREAM_CASTER
 
 SrsMpegtsOverUdp::SrsMpegtsOverUdp(SrsConfDirective* c)
 {
+    output = _srs_config->get_stream_caster_output(c);
 }
 
 SrsMpegtsOverUdp::~SrsMpegtsOverUdp()
@@ -49,6 +52,7 @@ int SrsMpegtsOverUdp::on_udp_packet(sockaddr_in* from, char* buf, int nb_buf)
     int peer_port = ntohs(from->sin_port);
 
     srs_info("udp: got %s:%d packet %d bytes", peer_ip.c_str(), peer_port, nb_buf);
+
     // TODO: FIXME: implements it.
 
     return ret;
diff --git a/trunk/src/app/srs_app_mpegts_udp.hpp b/trunk/src/app/srs_app_mpegts_udp.hpp
index 16d7faa0f..8a05acafd 100644
--- a/trunk/src/app/srs_app_mpegts_udp.hpp
+++ b/trunk/src/app/srs_app_mpegts_udp.hpp
@@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core.hpp>
 
 class sockaddr_in;
+#include <string>
 
 class SrsConfDirective;
 
@@ -41,6 +42,8 @@ class SrsConfDirective;
 */
 class SrsMpegtsOverUdp
 {
+private:
+    std::string output;
 public:
     SrsMpegtsOverUdp(SrsConfDirective* c);
     virtual ~SrsMpegtsOverUdp();
diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
index d69c6c066..300b8c528 100644
--- a/trunk/src/app/srs_app_server.cpp
+++ b/trunk/src/app/srs_app_server.cpp
@@ -335,9 +335,6 @@ int SrsUdpListener::cycle()
         }
     }
 
-    // TODO: FIXME: recv udp packet.
-    st_sleep(1);
-
     return ret;
 }
 #endif