Merge branch 'dvbsi++' of ssh://coolstreamtech.de/cst-public-gui-neutrino into dvbsi++

This commit is contained in:
satbaby
2012-05-06 14:12:39 +02:00
2 changed files with 5 additions and 1 deletions

View File

@@ -73,7 +73,10 @@ CMotorControl::CMotorControl(int tnum)
CMotorControl::~CMotorControl() CMotorControl::~CMotorControl()
{ {
printf("CMotorControl::~CMotorControl\n"); printf("CMotorControl::~CMotorControl\n");
delete sigscale;
delete snrscale;
} }
void CMotorControl::Init(void) void CMotorControl::Init(void)
{ {
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();

View File

@@ -253,6 +253,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
uint8_t list = CCam::CAPMT_FIRST; uint8_t list = CCam::CAPMT_FIRST;
for (it = channel_map.begin(); it != channel_map.end(); /*++it*/) for (it = channel_map.begin(); it != channel_map.end(); /*++it*/)
{ {
cam = it->second;
channel = CServiceManager::getInstance()->FindChannel(it->first); channel = CServiceManager::getInstance()->FindChannel(it->first);
++it; ++it;
if(!channel) if(!channel)