diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index a1768130c..9494b431d 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -36,6 +36,7 @@ using namespace std; #include #include #include +#include #define SRS_DEFAULT_HTTP_PORT 80 diff --git a/trunk/src/rtmp/srs_protocol_buffer.cpp b/trunk/src/rtmp/srs_protocol_buffer.cpp index b371e2f04..b3e15bf3b 100644 --- a/trunk/src/rtmp/srs_protocol_buffer.cpp +++ b/trunk/src/rtmp/srs_protocol_buffer.cpp @@ -34,14 +34,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // @see https://github.com/winlinvip/simple-rtmp-server/issues/241 #define SOCKET_READ_SIZE 4096 -ISrsBufferReader::ISrsBufferReader() -{ -} - -ISrsBufferReader::~ISrsBufferReader() -{ -} - SrsBuffer::SrsBuffer() { buffer = new char[SOCKET_READ_SIZE]; diff --git a/trunk/src/rtmp/srs_protocol_buffer.hpp b/trunk/src/rtmp/srs_protocol_buffer.hpp index ff6ac02c7..13622d96e 100644 --- a/trunk/src/rtmp/srs_protocol_buffer.hpp +++ b/trunk/src/rtmp/srs_protocol_buffer.hpp @@ -21,8 +21,8 @@ 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_BUFFER_HPP -#define SRS_KERNEL_BUFFER_HPP +#ifndef SRS_PROTOCOL_BUFFER_HPP +#define SRS_PROTOCOL_BUFFER_HPP /* #include @@ -32,18 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -/** -* the reader for the buffer to read from whatever channel. -*/ -class ISrsBufferReader -{ -public: - ISrsBufferReader(); - virtual ~ISrsBufferReader(); -// for protocol/amf0/msg-codec -public: - virtual int read(void* buf, size_t size, ssize_t* nread) = 0; -}; +#include /** * the buffer provices bytes cache for protocol. generally, diff --git a/trunk/src/rtmp/srs_protocol_io.cpp b/trunk/src/rtmp/srs_protocol_io.cpp index a0dd8999c..723e9d995 100644 --- a/trunk/src/rtmp/srs_protocol_io.cpp +++ b/trunk/src/rtmp/srs_protocol_io.cpp @@ -23,6 +23,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +ISrsBufferReader::ISrsBufferReader() +{ +} + +ISrsBufferReader::~ISrsBufferReader() +{ +} + ISrsBufferWriter::ISrsBufferWriter() { } diff --git a/trunk/src/rtmp/srs_protocol_io.hpp b/trunk/src/rtmp/srs_protocol_io.hpp index f4b2d4603..41215fd56 100644 --- a/trunk/src/rtmp/srs_protocol_io.hpp +++ b/trunk/src/rtmp/srs_protocol_io.hpp @@ -35,8 +35,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #endif -#include - /** * the system io reader/writer architecture: +---------------+ +--------------------+ +---------------+ @@ -62,6 +60,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +----------------------------------+ */ +/** +* the reader for the buffer to read from whatever channel. +*/ +class ISrsBufferReader +{ +public: + ISrsBufferReader(); + virtual ~ISrsBufferReader(); +// for protocol/amf0/msg-codec +public: + virtual int read(void* buf, size_t size, ssize_t* nread) = 0; +}; + /** * the writer for the buffer to write to whatever channel. */ diff --git a/trunk/src/rtmp/srs_protocol_stack.cpp b/trunk/src/rtmp/srs_protocol_stack.cpp index 6f79e202b..94d75ced7 100644 --- a/trunk/src/rtmp/srs_protocol_stack.cpp +++ b/trunk/src/rtmp/srs_protocol_stack.cpp @@ -28,6 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include using namespace std;