diff --git a/trunk/src/app/srs_core_socket.hpp b/trunk/src/app/srs_core_socket.hpp index 17d4dd27a..38f0368e5 100644 --- a/trunk/src/app/srs_core_socket.hpp +++ b/trunk/src/app/srs_core_socket.hpp @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * the socket provides TCP socket over st, * that is, the sync socket mechanism. */ -class SrsSocket : public ISrsReader +class SrsSocket : public ISrsBufferReader { private: int64_t recv_timeout; diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index 3efa5459c..d5dc12f10 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -28,11 +28,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SOCKET_READ_SIZE 4096 -ISrsReader::ISrsReader() +ISrsBufferReader::ISrsBufferReader() { } -ISrsReader::~ISrsReader() +ISrsBufferReader::~ISrsBufferReader() { } @@ -64,7 +64,7 @@ void SrsBuffer::append(char* bytes, int size) data.insert(data.end(), bytes, bytes + size); } -int SrsBuffer::ensure_buffer_bytes(ISrsReader* skt, int required_size) +int SrsBuffer::ensure_buffer_bytes(ISrsBufferReader* skt, int required_size) { int ret = ERROR_SUCCESS; diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index 9b0bf68b6..f652309f0 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -32,11 +32,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -class ISrsReader +/** +* the reader for the buffer to read from whatever channel. +*/ +class ISrsBufferReader { public: - ISrsReader(); - virtual ~ISrsReader(); + ISrsBufferReader(); + virtual ~ISrsBufferReader(); public: virtual int read(const void* buf, size_t size, ssize_t* nread) = 0; }; @@ -60,7 +63,7 @@ public: private: virtual void append(char* bytes, int size); public: - virtual int ensure_buffer_bytes(ISrsReader* skt, int required_size); + virtual int ensure_buffer_bytes(ISrsBufferReader* skt, int required_size); }; #endif \ No newline at end of file