"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/dvb/dvbmanager.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).

dvbmanager.cpp  (kaffeine-2.0.16):dvbmanager.cpp  (kaffeine-2.0.17)
skipping to change at line 39 skipping to change at line 39
#include <QStandardPaths> #include <QStandardPaths>
#include "dvbconfig.h" #include "dvbconfig.h"
#include "dvbdevice.h" #include "dvbdevice.h"
#include "dvbdevice_linux.h" #include "dvbdevice_linux.h"
#include "dvbepg.h" #include "dvbepg.h"
#include "dvbliveview.h" #include "dvbliveview.h"
#include "dvbmanager.h" #include "dvbmanager.h"
#include "dvbmanager_p.h" #include "dvbmanager_p.h"
#include "dvbsi.h" #include "dvbsi.h"
#include "xmltv.h"
DvbManager::DvbManager(MediaWidget *mediaWidget_, QWidget *parent_) : QObject(pa rent_), DvbManager::DvbManager(MediaWidget *mediaWidget_, QWidget *parent_) : QObject(pa rent_),
parent(parent_), mediaWidget(mediaWidget_), channelView(NULL), dvbDumpEna bled(false) parent(parent_), mediaWidget(mediaWidget_), channelView(NULL), dvbDumpEna bled(false)
{ {
channelModel = DvbChannelModel::createSqlModel(this); channelModel = DvbChannelModel::createSqlModel(this);
recordingModel = new DvbRecordingModel(this, this); recordingModel = new DvbRecordingModel(this, this);
epgModel = new DvbEpgModel(this, this); epgModel = new DvbEpgModel(this, this);
liveView = new DvbLiveView(this, this); liveView = new DvbLiveView(this, this);
xmlTv = new XmlTv(this);
readDeviceConfigs(); readDeviceConfigs();
updateSourceMapping(); updateSourceMapping();
loadDeviceManager(); loadDeviceManager();
DvbSiText::setOverride6937(override6937Charset()); DvbSiText::setOverride6937(override6937Charset());
QString xmlFile = getXmltvFileName();
if (xmlFile != "")
xmlTv->addFile(xmlFile);
} }
DvbManager::~DvbManager() DvbManager::~DvbManager()
{ {
writeDeviceConfigs(); writeDeviceConfigs();
// we need an explicit deletion order (device users ; devices ; device ma nager) // we need an explicit deletion order (device users ; devices ; device ma nager)
delete xmlTv;
delete epgModel; delete epgModel;
epgModel = NULL; epgModel = NULL;
delete recordingModel; delete recordingModel;
foreach (const DvbDeviceConfig &deviceConfig, deviceConfigs) { foreach (const DvbDeviceConfig &deviceConfig, deviceConfigs) {
delete deviceConfig.device; delete deviceConfig.device;
} }
} }
DvbDevice *DvbManager::requestDevice(const QString &source, const DvbTransponder &transponder, DvbDevice *DvbManager::requestDevice(const QString &source, const DvbTransponder &transponder,
skipping to change at line 350 skipping to change at line 358
QString DvbManager::getRecordingFolder() const QString DvbManager::getRecordingFolder() const
{ {
return KSharedConfig::openConfig()->group("DVB").readEntry("RecordingFold er", QDir::homePath()); return KSharedConfig::openConfig()->group("DVB").readEntry("RecordingFold er", QDir::homePath());
} }
QString DvbManager::getTimeShiftFolder() const QString DvbManager::getTimeShiftFolder() const
{ {
return KSharedConfig::openConfig()->group("DVB").readEntry("TimeShiftFold er", QDir::homePath()); return KSharedConfig::openConfig()->group("DVB").readEntry("TimeShiftFold er", QDir::homePath());
} }
QString DvbManager::getXmltvFileName() const
{
return KSharedConfig::openConfig()->group("DVB").readEntry("XmltvFileName
", "");
}
int DvbManager::getBeginMargin() const int DvbManager::getBeginMargin() const
{ {
return KSharedConfig::openConfig()->group("DVB").readEntry("BeginMargin", 300); return KSharedConfig::openConfig()->group("DVB").readEntry("BeginMargin", 300);
} }
int DvbManager::getEndMargin() const int DvbManager::getEndMargin() const
{ {
return KSharedConfig::openConfig()->group("DVB").readEntry("EndMargin", 6 00); return KSharedConfig::openConfig()->group("DVB").readEntry("EndMargin", 6 00);
} }
skipping to change at line 400 skipping to change at line 413
bool DvbManager::isScanWhenIdle() const bool DvbManager::isScanWhenIdle() const
{ {
return KSharedConfig::openConfig()->group("DVB").readEntry("ScanWhenIdle" , false); return KSharedConfig::openConfig()->group("DVB").readEntry("ScanWhenIdle" , false);
} }
bool DvbManager::createInfoFile() const bool DvbManager::createInfoFile() const
{ {
return KSharedConfig::openConfig()->group("DVB").readEntry("CreateInfoFil e", false); return KSharedConfig::openConfig()->group("DVB").readEntry("CreateInfoFil e", false);
} }
bool DvbManager::disableEpg() const
{
return KSharedConfig::openConfig()->group("DVB").readEntry("DisableEpg",
false);
}
void DvbManager::setRecordingFolder(const QString &path) void DvbManager::setRecordingFolder(const QString &path)
{ {
KSharedConfig::openConfig()->group("DVB").writeEntry("RecordingFolder", p ath); KSharedConfig::openConfig()->group("DVB").writeEntry("RecordingFolder", p ath);
} }
void DvbManager::setTimeShiftFolder(const QString &path) void DvbManager::setTimeShiftFolder(const QString &path)
{ {
KSharedConfig::openConfig()->group("DVB").writeEntry("TimeShiftFolder", p ath); KSharedConfig::openConfig()->group("DVB").writeEntry("TimeShiftFolder", p ath);
} }
void DvbManager::setXmltvFileName(const QString &path)
{
KSharedConfig::openConfig()->group("DVB").writeEntry("XmltvFileName", pat
h);
xmlTv->clear();
xmlTv->addFile(path);
}
void DvbManager::setBeginMargin(int beginMargin) void DvbManager::setBeginMargin(int beginMargin)
{ {
KSharedConfig::openConfig()->group("DVB").writeEntry("BeginMargin", begin Margin); KSharedConfig::openConfig()->group("DVB").writeEntry("BeginMargin", begin Margin);
} }
void DvbManager::setEndMargin(int endMargin) void DvbManager::setEndMargin(int endMargin)
{ {
KSharedConfig::openConfig()->group("DVB").writeEntry("EndMargin", endMarg in); KSharedConfig::openConfig()->group("DVB").writeEntry("EndMargin", endMarg in);
} }
skipping to change at line 501 skipping to change at line 526
void DvbManager::setScanWhenIdle(bool scanWhenIdle) void DvbManager::setScanWhenIdle(bool scanWhenIdle)
{ {
KSharedConfig::openConfig()->group("DVB").writeEntry("ScanWhenIdle", scan WhenIdle); KSharedConfig::openConfig()->group("DVB").writeEntry("ScanWhenIdle", scan WhenIdle);
} }
void DvbManager::setCreateInfoFile(bool createInfoFile) void DvbManager::setCreateInfoFile(bool createInfoFile)
{ {
KSharedConfig::openConfig()->group("DVB").writeEntry("CreateInfoFile", cr eateInfoFile); KSharedConfig::openConfig()->group("DVB").writeEntry("CreateInfoFile", cr eateInfoFile);
} }
void DvbManager::setDisableEpg(bool disableEpg)
{
KSharedConfig::openConfig()->group("DVB").writeEntry("DisableEpg", disabl
eEpg);
}
void DvbManager::enableDvbDump() void DvbManager::enableDvbDump()
{ {
if (dvbDumpEnabled) { if (dvbDumpEnabled) {
return; return;
} }
dvbDumpEnabled = true; dvbDumpEnabled = true;
foreach (const DvbDeviceConfig &deviceConfig, deviceConfigs) { foreach (const DvbDeviceConfig &deviceConfig, deviceConfigs) {
if (deviceConfig.device != NULL) { if (deviceConfig.device != NULL) {
 End of changes. 8 change blocks. 
0 lines changed or deleted 34 lines changed or added

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