Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1923 from nemphys/pvr-channels-userset

pvr: new advanced setting that allows marking channel icons populated by auto scan as "user-set"
  • Loading branch information...
commit aea12804a033163aa54e85d4d6bbf30fda94a6d9 2 parents 7899597 + 63c6186
@opdenkamp opdenkamp authored
View
3  xbmc/pvr/channels/PVRChannelGroup.cpp
@@ -24,6 +24,7 @@
*/
#include "settings/GUISettings.h"
+#include "settings/AdvancedSettings.h"
#include "guilib/GUIWindowManager.h"
#include "dialogs/GUIDialogYesNo.h"
#include "dialogs/GUIDialogOK.h"
@@ -222,7 +223,7 @@ bool CPVRChannelGroup::SetChannelIconPath(CPVRChannelPtr channel, const std::str
{
if (CFile::Exists(strIconPath))
{
- channel->SetIconPath(strIconPath);
+ channel->SetIconPath(strIconPath, g_advancedSettings.m_bPVRAutoScanIconsUserSet);
return true;
}
return false;
View
2  xbmc/settings/AdvancedSettings.cpp
@@ -296,6 +296,7 @@ void CAdvancedSettings::Initialize()
m_iPVRMinAudioCacheLevel = 10;
m_bPVRCacheInDvdPlayer = true;
m_bPVRChannelIconsAutoScan = true;
+ m_bPVRAutoScanIconsUserSet = false;
m_measureRefreshrate = false;
@@ -984,6 +985,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetInt(pPVR, "minaudiocachelevel", m_iPVRMinAudioCacheLevel, 0, 100);
XMLUtils::GetBoolean(pPVR, "cacheindvdplayer", m_bPVRCacheInDvdPlayer);
XMLUtils::GetBoolean(pPVR, "channeliconsautoscan", m_bPVRChannelIconsAutoScan);
+ XMLUtils::GetBoolean(pPVR, "autoscaniconsuserset", m_bPVRAutoScanIconsUserSet);
}
XMLUtils::GetBoolean(pRootElement, "measurerefreshrate", m_measureRefreshrate);
View
1  xbmc/settings/AdvancedSettings.h
@@ -336,6 +336,7 @@ class CAdvancedSettings
int m_iPVRMinAudioCacheLevel; /*!< @brief cache up to this level in the audio buffer before resuming playback if the buffers run dry */
bool m_bPVRCacheInDvdPlayer; /*!< @brief true to use "CACHESTATE_PVR" in CDVDPlayer (default) */
bool m_bPVRChannelIconsAutoScan; /*!< @brief automatically scan user defined folder for channel icons when loading internal channel groups */
+ bool m_bPVRAutoScanIconsUserSet; /*!< @brief mark channel icons populated by auto scan as "user set" */
bool m_measureRefreshrate; //when true the videoreferenceclock will measure the refreshrate when direct3d is used
//otherwise it will use the windows refreshrate

0 comments on commit aea1280

Please sign in to comment.
Something went wrong with that request. Please try again.