"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/dvb/dvbdevice.cpp" between
kaffeine-2.0.16.tar.gz and kaffeine-2.0.17.tar.gz

About: Kaffeine is a full featured Multimedia-Player for KDE (default backend is xine).

dvbdevice.cpp  (kaffeine-2.0.16):dvbdevice.cpp  (kaffeine-2.0.17)
skipping to change at line 299 skipping to change at line 299
if ((transmissionType != DvbTransponderBase::DvbS) && if ((transmissionType != DvbTransponderBase::DvbS) &&
(transmissionType != DvbTransponderBase::DvbS2)) { (transmissionType != DvbTransponderBase::DvbS2)) {
if (backend->tune(transponder)) { if (backend->tune(transponder)) {
setDeviceState(DeviceTuning); setDeviceState(DeviceTuning);
frontendTimeout = config->timeout; frontendTimeout = config->timeout;
frontendTimer.start(100); frontendTimer.start(100);
discardBuffers(); discardBuffers();
} else { } else {
setDeviceState(DeviceTuning); setDeviceState(DeviceTuning);
setDeviceState(DeviceIdle);
autoTransponder.setTransmissionType(DvbTransponderBase::I nvalid); autoTransponder.setTransmissionType(DvbTransponderBase::I nvalid);
setDeviceState(DeviceIdle);
} }
return; return;
} }
bool moveRotor = false; bool moveRotor = false;
DvbTransponder intermediate = transponder; DvbTransponder intermediate = transponder;
// DVB LNBf IF and DiSeqC switch settings // DVB LNBf IF and DiSeqC switch settings
skipping to change at line 398 skipping to change at line 398
frontendTimeout = config->timeout; frontendTimeout = config->timeout;
} else { } else {
setDeviceState(DeviceRotorMoving); setDeviceState(DeviceRotorMoving);
frontendTimeout = 15000; frontendTimeout = 15000;
} }
frontendTimer.start(100); frontendTimer.start(100);
discardBuffers(); discardBuffers();
} else { } else {
setDeviceState(DeviceTuning); setDeviceState(DeviceTuning);
setDeviceState(DeviceIdle);
autoTransponder.setTransmissionType(DvbTransponderBase::Invalid); autoTransponder.setTransmissionType(DvbTransponderBase::Invalid);
setDeviceState(DeviceIdle);
} }
} }
void DvbDevice::autoTune(const DvbTransponder &transponder) void DvbDevice::autoTune(const DvbTransponder &transponder)
{ {
DvbTransponderBase::TransmissionType transmissionType = transponder.getTr ansmissionType(); DvbTransponderBase::TransmissionType transmissionType = transponder.getTr ansmissionType();
autoTransponder = transponder; autoTransponder = transponder;
if (transmissionType == DvbTransponderBase::DvbT) { if (transmissionType == DvbTransponderBase::DvbT) {
skipping to change at line 628 skipping to change at line 628
// FIXME query back information like frequency - tuning parameters - ... // FIXME query back information like frequency - tuning parameters - ...
return autoTransponder; return autoTransponder;
} }
bool DvbDevice::acquire(const DvbConfigBase *config_) bool DvbDevice::acquire(const DvbConfigBase *config_)
{ {
Q_ASSERT(deviceState == DeviceReleased); Q_ASSERT(deviceState == DeviceReleased);
if (backend->acquire()) { if (backend->acquire()) {
config = config_; config = config_;
setDeviceState(DeviceIdle);
autoTransponder.setTransmissionType(DvbTransponderBase::Invalid); autoTransponder.setTransmissionType(DvbTransponderBase::Invalid);
setDeviceState(DeviceIdle);
return true; return true;
} }
return false; return false;
} }
void DvbDevice::reacquire(const DvbConfigBase *config_) void DvbDevice::reacquire(const DvbConfigBase *config_)
{ {
Q_ASSERT(deviceState != DeviceReleased); Q_ASSERT(deviceState != DeviceReleased);
setDeviceState(DeviceReleased); setDeviceState(DeviceReleased);
stop(); stop();
config = config_; config = config_;
setDeviceState(DeviceIdle);
autoTransponder.setTransmissionType(DvbTransponderBase::Invalid); autoTransponder.setTransmissionType(DvbTransponderBase::Invalid);
setDeviceState(DeviceIdle);
} }
void DvbDevice::release() void DvbDevice::release()
{ {
setDeviceState(DeviceReleased); setDeviceState(DeviceReleased);
stop(); stop();
backend->release(); backend->release();
} }
void DvbDevice::enableDvbDump() void DvbDevice::enableDvbDump()
skipping to change at line 692 skipping to change at line 692
// FIXME progress bar when moving rotor // FIXME progress bar when moving rotor
frontendTimeout -= 100; frontendTimeout -= 100;
if (frontendTimeout <= 0) { if (frontendTimeout <= 0) {
frontendTimer.stop(); frontendTimer.stop();
if (!isAuto) { if (!isAuto) {
qCDebug(logDvb, "tuning failed on %.2f MHz", backend->get FrqMHz()); qCDebug(logDvb, "tuning failed on %.2f MHz", backend->get FrqMHz());
setDeviceState(DeviceIdle);
autoTransponder.setTransmissionType(DvbTransponderBase::I nvalid); autoTransponder.setTransmissionType(DvbTransponderBase::I nvalid);
setDeviceState(DeviceIdle);
return; return;
} }
bool carry = true; bool carry = true;
/* /*
* As ISDB-T always support auto-scan, we only need to simulate * As ISDB-T always support auto-scan, we only need to simulate
* it for DVB-T * it for DVB-T
*/ */
if (transmissionType == DvbTransponderBase::DvbT) { if (transmissionType == DvbTransponderBase::DvbT) {
skipping to change at line 720 skipping to change at line 720
// signal too weak // signal too weak
qCInfo(logDev, "Signal too weak on %.2f MHz", bac kend->getFrqMHz()); qCInfo(logDev, "Signal too weak on %.2f MHz", bac kend->getFrqMHz());
/* /*
* FIXME: ignoring a too weak signal is not so easy, * FIXME: ignoring a too weak signal is not so easy,
* as it depends on the scale, and scale is broken on * as it depends on the scale, and scale is broken on
* several drivers. Also, signal itself is not a good * several drivers. Also, signal itself is not a good
* indicator of the quality. Better to just print a * indicator of the quality. Better to just print a
* warning, and not fail. * warning, and not fail.
*/ */
#if 0 #if 0
setDeviceState(DeviceIdle);
autoTransponder.setTransmissionType(DvbTransponde rBase::Invalid); autoTransponder.setTransmissionType(DvbTransponde rBase::Invalid);
setDeviceState(DeviceIdle);
return; return;
#endif #endif
} }
if (carry && ((capabilities & DvbTFecAuto) == 0)) { if (carry && ((capabilities & DvbTFecAuto) == 0)) {
switch (autoTTransponder->fecRateHigh) { switch (autoTTransponder->fecRateHigh) {
case DvbTTransponder::Fec2_3: case DvbTTransponder::Fec2_3:
autoTTransponder->fecRateHigh = DvbTTrans ponder::Fec3_4; autoTTransponder->fecRateHigh = DvbTTrans ponder::Fec3_4;
carry = false; carry = false;
break; break;
 End of changes. 12 change blocks. 
6 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)