Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix default settings #426

Merged
merged 2 commits into from
Feb 13, 2023
Merged

Fix default settings #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f01193
Set default settings correctly and update settings migration
phunkyfish Feb 13, 2023
dc5989b
changelog and version 20.5.1
phunkyfish Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pvr.vuplus/addon.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.vuplus"
version="20.5.0"
version="20.5.1"
name="Enigma2 Client"
provider-name="Joerg Dembski and Ross Nicholson">
<requires>@ADDON_DEPENDS@
Expand Down
3 changes: 3 additions & 0 deletions pvr.vuplus/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v20.5.1
- Set default settings correctly and update settings migration

v20.5.0
- Support Multiple Enigma2 Backends

Expand Down
24 changes: 12 additions & 12 deletions src/enigma2/InstanceSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace enigma2
static const std::string DEFAULT_SHOW_INFO_FILE = ADDON_DATA_BASE_DIR + "/showInfo/English-ShowInfo.xml";
static const std::string DEFAULT_GENRE_ID_MAP_FILE = ADDON_DATA_BASE_DIR + "/genres/genreIdMappings/Sky-UK.xml";
static const std::string DEFAULT_GENRE_TEXT_MAP_FILE = ADDON_DATA_BASE_DIR + "/genres/genreRytecTextMappings/Rytec-UK-Ireland.xml";
static const std::string DEFAULT_CUSTOM_TV_GROUPS_FILE = ADDON_DATA_BASE_DIR + "/channelGroups/customRadioGroups-example.xml";
static const std::string DEFAULT_CUSTOM_TV_GROUPS_FILE = ADDON_DATA_BASE_DIR + "/channelGroups/customTVGroups-example.xml";
static const std::string DEFAULT_CUSTOM_RADIO_GROUPS_FILE = ADDON_DATA_BASE_DIR + "/channelGroups/customRadioGroups-example.xml";
static const int DEFAULT_NUM_GEN_REPEAT_TIMERS = 1;

Expand Down Expand Up @@ -369,23 +369,23 @@ namespace enigma2

//EPG
bool m_extractShowInfo = true;
std::string m_extractShowInfoFile;
std::string m_extractShowInfoFile = DEFAULT_SHOW_INFO_FILE;
bool m_mapGenreIds = true;
std::string m_mapGenreIdsFile;
bool m_mapRytecTextGenres = true;
std::string m_mapRytecTextGenresFile;
std::string m_mapGenreIdsFile = DEFAULT_GENRE_ID_MAP_FILE;
bool m_mapRytecTextGenres = false;
std::string m_mapRytecTextGenresFile = DEFAULT_GENRE_TEXT_MAP_FILE;
bool m_logMissingGenreMappings = true;
int m_epgDelayPerChannel;
int m_epgDelayPerChannel = 0;

//Recordings
bool m_storeLastPlayedAndCount = true;
RecordingLastPlayedMode m_recordingLastPlayedMode = RecordingLastPlayedMode::ACROSS_KODI_INSTANCES;
std::string m_newTimerRecordingPath = "";
bool m_onlyCurrentLocation = false;
bool m_virtualFolders = false;
bool m_keepFolders = false;
bool m_keepFoldersOmitLocation = false;
bool m_recordingsRecursive = false;
bool m_virtualFolders = true;
bool m_keepFolders = true;
bool m_keepFoldersOmitLocation = true;
bool m_recordingsRecursive = true;
bool m_enableRecordingEDLs = false;
int m_edlStartTimePadding = 0;
int m_edlStopTimePadding = 0;
Expand All @@ -396,13 +396,13 @@ namespace enigma2
bool m_automaticTimerlistCleanup = false;
bool m_enableAutoTimers = true;
bool m_limitAnyChannelAutoTimers = true;
bool m_limitAnyChannelAutoTimersToChannelGroups = false;
bool m_limitAnyChannelAutoTimersToChannelGroups = true;

//Timeshift
Timeshift m_timeshift = Timeshift::OFF;
std::string m_timeshiftBufferPath = ADDON_DATA_BASE_DIR;
bool m_enableTimeshiftDiskLimit = false;
float m_timeshiftDiskLimitGB = 0.0f;
float m_timeshiftDiskLimitGB = 4.0f;
bool m_timeshiftEnabledIptv = true;
bool m_useFFmpegReconnect = true;
bool m_useMpegtsForUnknownStreams = true;
Expand Down
10 changes: 5 additions & 5 deletions src/enigma2/utilities/SettingsMigration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const std::vector<std::pair<const char*, const char*>> stringMap = {{"host", "12

const std::vector<std::pair<const char*, int>> intMap = {{"webport", 80},
{"streamport", 8001},
{"connectionchecktimeout", 30},
{"connectioncheckinterval", 1000},
{"connectionchecktimeout", 10},
{"connectioncheckinterval", 1},
{"updateint", 2},
{"updatemode", 0},
{"channelandgroupupdatemode", 2},
Expand Down Expand Up @@ -87,10 +87,10 @@ const std::vector<std::pair<const char*, bool>> boolMap = {{"use_secure", false}
{"retrieveprovidername", true},
{"excludelastscannedtv", true},
{"excludelastscannedradio", true},
{"extractshowinfoenabled", false},
{"genreidmapenabled", false},
{"extractshowinfoenabled", true},
{"genreidmapenabled", true},
{"rytecgenretextmapenabled", false},
{"logmissinggenremapping", false},
{"logmissinggenremapping", true},
{"storeextrarecordinginfo", true},
{"virtualfolders", true},
{"keepfolders", true},
Expand Down