external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

update projects for rtmp renamed to protocol

Browse source
This commit is contained in:
winlin 2015-01-24 16:59:36 +08:00
parent 711b6ca277
commit d22e4e86d8
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/ide/srs_clion/CMakeLists.txt Normal file → Executable file
View file

@ -3,12 +3,12 @@ project(srs CXX)
INCLUDE_DIRECTORIES(../../objs INCLUDE_DIRECTORIES(../../objs
../../objs/st ../../objs/hp ../../objs/openssl/include ../../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) set(SOURCE_FILES ../../src/main/srs_main_server.cpp)
AUX_SOURCE_DIRECTORY(../../src/core SOURCE_FILES) AUX_SOURCE_DIRECTORY(../../src/core SOURCE_FILES)
AUX_SOURCE_DIRECTORY(../../src/kernel 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) AUX_SOURCE_DIRECTORY(../../src/app SOURCE_FILES)
ADD_DEFINITIONS("-g -O0") ADD_DEFINITIONS("-g -O0")

6
trunk/ide/srs_qt/srs-qt.pro
View file

@ -7,20 +7,20 @@ HEADERS += \
../../src/core/*.hpp \ ../../src/core/*.hpp \
../../src/kernel/*.hpp \ ../../src/kernel/*.hpp \
../../src/app/*.hpp \ ../../src/app/*.hpp \
../../src/rtmp/*.hpp ../../src/protocol/*.hpp
SOURCES += \ SOURCES += \
../../src/core/*.cpp \ ../../src/core/*.cpp \
../../src/kernel/*.cpp \ ../../src/kernel/*.cpp \
../../src/app/*.cpp \ ../../src/app/*.cpp \
../../src/rtmp/*.cpp \ ../../src/protocol/*.cpp \
../../src/main/*.cpp ../../src/main/*.cpp
INCLUDEPATH += \ INCLUDEPATH += \
../../src/core \ ../../src/core \
../../src/kernel \ ../../src/kernel \
../../src/app \ ../../src/app \
../../src/rtmp \ ../../src/protocol \
../../objs \ ../../objs \
../../objs/st \ ../../objs/st \
../../objs/hp \ ../../objs/hp \

2
trunk/ide/srs_vs2010/srs.vcxproj
View file

@ -37,7 +37,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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> <IncludePath>$(ProjectDir)/../../src/core;$(ProjectDir)/../../src/kernel;$(ProjectDir)/../../src/protocol;$(ProjectDir)/../../src/app;$(ProjectDir)/../../src/libs;$(ProjectDir)/../../objs;$(IncludePath)</IncludePath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>

4
trunk/src/app/srs_app_mpegts_udp.cpp
View file

@ -26,15 +26,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
using namespace std;
#include <srs_app_config.hpp> #include <srs_app_config.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>
#ifdef SRS_AUTO_STREAM_CASTER #ifdef SRS_AUTO_STREAM_CASTER
SrsMpegtsOverUdp::SrsMpegtsOverUdp(SrsConfDirective* c) SrsMpegtsOverUdp::SrsMpegtsOverUdp(SrsConfDirective* c)
{ {
output = _srs_config->get_stream_caster_output(c);
} }
SrsMpegtsOverUdp::~SrsMpegtsOverUdp() 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); int peer_port = ntohs(from->sin_port);
srs_info("udp: got %s:%d packet %d bytes", peer_ip.c_str(), peer_port, nb_buf); srs_info("udp: got %s:%d packet %d bytes", peer_ip.c_str(), peer_port, nb_buf);
// TODO: FIXME: implements it. // TODO: FIXME: implements it.
return ret; return ret;

3
trunk/src/app/srs_app_mpegts_udp.hpp
View file

@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
class sockaddr_in; class sockaddr_in;
#include <string>
class SrsConfDirective; class SrsConfDirective;
@ -41,6 +42,8 @@ class SrsConfDirective;
*/ */
class SrsMpegtsOverUdp class SrsMpegtsOverUdp
{ {
private:
std::string output;
public: public:
SrsMpegtsOverUdp(SrsConfDirective* c); SrsMpegtsOverUdp(SrsConfDirective* c);
virtual ~SrsMpegtsOverUdp(); virtual ~SrsMpegtsOverUdp();

3
trunk/src/app/srs_app_server.cpp
View file

@ -335,9 +335,6 @@ int SrsUdpListener::cycle()
} }
} }
// TODO: FIXME: recv udp packet.
st_sleep(1);
return ret; return ret;
} }
#endif #endif