From 2fbaba6af50cf22b83c6aad239640b886c3bb84d Mon Sep 17 00:00:00 2001 From: "Castillo, Gerard" Date: Thu, 19 Dec 2013 10:33:11 +0100 Subject: [PATCH] cleanups --- src/rtsp/BasicRTSPOnlyServer.hh | 2 -- src/rtsp/BasicRTSPOnlySubsession.cpp | 4 ++-- src/rtsp/BasicRTSPOnlySubsession.hh | 9 --------- src/rtsp/c_basicRTSPOnlyServer.cpp | 9 --------- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/rtsp/BasicRTSPOnlyServer.hh b/src/rtsp/BasicRTSPOnlyServer.hh index 42e5a7524..d3efe5909 100644 --- a/src/rtsp/BasicRTSPOnlyServer.hh +++ b/src/rtsp/BasicRTSPOnlyServer.hh @@ -1,5 +1,3 @@ - - #ifndef _BASIC_RTSP_ONLY_SERVER_HH #define _BASIC_RTSP_ONLY_SERVER_HH diff --git a/src/rtsp/BasicRTSPOnlySubsession.cpp b/src/rtsp/BasicRTSPOnlySubsession.cpp index 64011f3ee..da9bdaebf 100644 --- a/src/rtsp/BasicRTSPOnlySubsession.cpp +++ b/src/rtsp/BasicRTSPOnlySubsession.cpp @@ -1,7 +1,7 @@ +#include "rtsp/BasicRTSPOnlySubsession.hh" #include #include #include -#include "rtsp/BasicRTSPOnlySubsession.hh" #include "messaging.h" @@ -22,7 +22,7 @@ BasicRTSPOnlySubsession destination = NULL; gethostname(fCNAME, sizeof fCNAME); this->fmod = mod; - fCNAME[sizeof fCNAME-1] = '\0'; // just in case + fCNAME[sizeof fCNAME-1] = '\0'; } BasicRTSPOnlySubsession::~BasicRTSPOnlySubsession() { diff --git a/src/rtsp/BasicRTSPOnlySubsession.hh b/src/rtsp/BasicRTSPOnlySubsession.hh index 90f04fa56..ef3ef88dc 100644 --- a/src/rtsp/BasicRTSPOnlySubsession.hh +++ b/src/rtsp/BasicRTSPOnlySubsession.hh @@ -9,16 +9,7 @@ extern "C" { #endif -//#include "c_basicRTSPOnlyServer.h" -//#include "transmitter.h" -//#include "participants.h" -//#include -//#include "config_unix.h" -//#include "video.h" #include "module.h" - -//#include "debug.h" - #include "control_socket.h" #ifdef __cplusplus diff --git a/src/rtsp/c_basicRTSPOnlyServer.cpp b/src/rtsp/c_basicRTSPOnlyServer.cpp index 450ecd534..1aac49686 100644 --- a/src/rtsp/c_basicRTSPOnlyServer.cpp +++ b/src/rtsp/c_basicRTSPOnlyServer.cpp @@ -1,5 +1,4 @@ #include "rtsp/c_basicRTSPOnlyServer.h" - #include "rtsp/BasicRTSPOnlyServer.hh" int c_start_server(rtsp_serv_t* server){ @@ -30,11 +29,3 @@ void c_stop_server(rtsp_serv_t* server){ pthread_join(server->server_th, NULL); } } - -//int c_update_server(rtsp_serv_t* server){ -// BasicRTSPOnlyServer *srv = BasicRTSPOnlyServer::getInstance(); -// if (srv == NULL){ -// exit(1); -// } -// return srv->update_server(); -//}