Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 05:14:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed deleting/stopping video devices

Browse source
This commit is contained in:
csoler 2015-09-02 22:14:04 -04:00
parent b1572c2924
commit 77c0d562fb
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/VOIP/gui/QVideoDevice.cpp
View file

@ -15,6 +15,11 @@ QVideoInputDevice::QVideoInputDevice(QWidget *parent)
_echo_output_device = NULL ;
}
bool QVideoInputDevice::stopped()
{
return _timer == NULL ;
}
void QVideoInputDevice::stop()
{
if(_timer != NULL)
@ -54,6 +59,9 @@ void QVideoInputDevice::start()
void QVideoInputDevice::grabFrame()
{
if(!_timer)
return ;
IplImage *img=cvQueryFrame(_capture_device);
if(img == NULL)
@ -87,6 +95,9 @@ void QVideoInputDevice::grabFrame()
bool QVideoInputDevice::getNextEncodedPacket(RsVOIPDataChunk& chunk)
{
if(!_timer)
return false ;
if(_video_processor)
return _video_processor->nextEncodedPacket(chunk) ;
else
@ -100,7 +111,8 @@ uint32_t QVideoInputDevice::currentBandwidth() const
QVideoInputDevice::~QVideoInputDevice()
{
stop() ;
stop() ;
_video_processor = NULL ;
}