external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60

Browse source
This commit is contained in:
winlin 2014-12-05 23:03:52 +08:00
parent 528ae1e9b1
commit f9b9a60de7
21 changed files with 502 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/app/srs_app_recv_thread.cpp
View file

@ -81,7 +81,7 @@ int SrsRecvThread::cycle()
continue;
}
SrsMessage* msg = NULL;
SrsCommonMessage* msg = NULL;
// recv and handle message
ret = rtmp->recv_message(&msg);
@ -145,9 +145,9 @@ SrsQueueRecvThread::~SrsQueueRecvThread()
trd.stop();
// clear all messages.
std::vector<SrsMessage*>::iterator it;
std::vector<SrsCommonMessage*>::iterator it;
for (it = queue.begin(); it != queue.end(); ++it) {
SrsMessage* msg = *it;
SrsCommonMessage* msg = *it;
srs_freep(msg);
}
queue.clear();
@ -173,11 +173,11 @@ int SrsQueueRecvThread::size()
return (int)queue.size();
}
SrsMessage* SrsQueueRecvThread::pump()
SrsCommonMessage* SrsQueueRecvThread::pump()
{
srs_assert(!queue.empty());
SrsMessage* msg = *queue.begin();
SrsCommonMessage* msg = *queue.begin();
queue.erase(queue.begin());
@ -198,7 +198,7 @@ bool SrsQueueRecvThread::can_handle()
return empty();
}
int SrsQueueRecvThread::handle(SrsMessage* msg)
int SrsQueueRecvThread::handle(SrsCommonMessage* msg)
{
// put into queue, the send thread will get and process it,
// @see SrsRtmpConn::process_play_control_msg
@ -335,7 +335,7 @@ bool SrsPublishRecvThread::can_handle()
return true;
}
int SrsPublishRecvThread::handle(SrsMessage* msg)
int SrsPublishRecvThread::handle(SrsCommonMessage* msg)
{
int ret = ERROR_SUCCESS;