Merge pull request #420 from phunkyfish/multiple-instances

Support Multiple Enigma2 Backends - Nexus
kodi-pvr · Feb 12, 2023 · 5bf6b21 · 5bf6b21
2 parents 10bed85 + 0821df5
commit 5bf6b21
Show file tree

Hide file tree

Showing 63 changed files with 2,209 additions and 1,288 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,15 +13,16 @@ include_directories(${NLOHMANNJSON_INCLUDE_DIRS}
 
 set(VUPLUS_SOURCES src/addon.cpp
                    src/Enigma2.cpp
+                   src/enigma2/AddonSettings.cpp
                    src/enigma2/Admin.cpp
                    src/enigma2/Channels.cpp
                    src/enigma2/ChannelGroups.cpp
                    src/enigma2/ConnectionManager.cpp
                    src/enigma2/Epg.cpp
+                   src/enigma2/InstanceSettings.cpp
                    src/enigma2/Providers.cpp
                    src/enigma2/RecordingReader.cpp
                    src/enigma2/Recordings.cpp
-                   src/enigma2/Settings.cpp
                    src/enigma2/StreamReader.cpp
                    src/enigma2/Timers.cpp
                    src/enigma2/TimeshiftBuffer.cpp
@@ -40,22 +41,24 @@ set(VUPLUS_SOURCES src/addon.cpp
                    src/enigma2/utilities/CurlFile.cpp
                    src/enigma2/utilities/FileUtils.cpp
                    src/enigma2/utilities/Logger.cpp
+                   src/enigma2/utilities/SettingsMigration.cpp
                    src/enigma2/utilities/StreamUtils.cpp
                    src/enigma2/utilities/WebUtils.cpp)
 
 set(VUPLUS_HEADERS src/addon.h
                    src/Enigma2.h
+                   src/enigma2/AddonSettings.h
                    src/enigma2/Admin.h
                    src/enigma2/Channels.h
                    src/enigma2/ChannelGroups.h
                    src/enigma2/ConnectionManager.h
                    src/enigma2/Epg.h
                    src/enigma2/IConnectionListener.h
+                   src/enigma2/InstanceSettings.h
                    src/enigma2/IStreamReader.h
                    src/enigma2/Providers.h
                    src/enigma2/RecordingReader.h
                    src/enigma2/Recordings.h
-                   src/enigma2/Settings.h
                    src/enigma2/StreamReader.h
                    src/enigma2/Timers.h
                    src/enigma2/TimeshiftBuffer.h
@@ -82,6 +85,7 @@ set(VUPLUS_HEADERS src/addon.h
                    src/enigma2/utilities/UpdateState.h
                    src/enigma2/utilities/FileUtils.h
                    src/enigma2/utilities/Logger.h
+                   src/enigma2/utilities/SettingsMigration.h
                    src/enigma2/utilities/SignalStatus.h
                    src/enigma2/utilities/StreamStatus.h
                    src/enigma2/utilities/StreamUtils.h

diff --git a/pvr.vuplus/addon.xml.in b/pvr.vuplus/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vuplus"
-  version="20.4.2"
+  version="20.5.0"
   name="Enigma2 Client"
   provider-name="Joerg Dembski and Ross Nicholson">
   <requires>@ADDON_DEPENDS@

diff --git a/pvr.vuplus/changelog.txt b/pvr.vuplus/changelog.txt
@@ -1,3 +1,6 @@
+v20.5.0
+- Support Multiple Enigma2 Backends
+
 v20.4.2
 - Support Kodi filesystem API 1.1.8, which fixes a buffer overrun (https://github.com/xbmc/xbmc/pull/22593)