Merge pull request #701 from phunkyfish/multiple-instances-omega

Add support for multiple M3Us/EPGs via instances
kodi-pvr · Feb 12, 2023 · 958963f · 958963f
2 parents 972c798 + ebddcf0
commit 958963f
Show file tree

Hide file tree

Showing 41 changed files with 1,974 additions and 1,042 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,15 +21,17 @@ message(STATUS "PUGIXML_LIBRARIES: ${PUGIXML_LIBRARIES}")
 message(STATUS "ZLIB_LIBRARIES: ${ZLIB_LIBRARIES}")
 message(STATUS "LZMA_LIBRARIES: ${LZMA_LIBRARIES}")
 
-set(IPTV_SOURCES src/PVRIptvData.cpp
+set(IPTV_SOURCES src/addon.cpp
+                 src/IptvSimple.cpp
+                 src/iptvsimple/AddonSettings.cpp
                  src/iptvsimple/CatchupController.cpp
                  src/iptvsimple/Channels.cpp
                  src/iptvsimple/ChannelGroups.cpp
-                 src/iptvsimple/Providers.cpp
                  src/iptvsimple/Epg.cpp
+                 src/iptvsimple/InstanceSettings.cpp
                  src/iptvsimple/Media.cpp
                  src/iptvsimple/PlaylistLoader.cpp
-                 src/iptvsimple/Settings.cpp
+                 src/iptvsimple/Providers.cpp
                  src/iptvsimple/StreamManager.cpp
                  src/iptvsimple/data/Channel.cpp
                  src/iptvsimple/data/ChannelEpg.cpp
@@ -40,18 +42,21 @@ set(IPTV_SOURCES src/PVRIptvData.cpp
                  src/iptvsimple/data/MediaEntry.cpp
                  src/iptvsimple/utilities/FileUtils.cpp
                  src/iptvsimple/utilities/Logger.cpp
+                 src/iptvsimple/utilities/SettingsMigration.cpp
                  src/iptvsimple/utilities/StreamUtils.cpp
                  src/iptvsimple/utilities/WebUtils.cpp)
 
-set(IPTV_HEADERS src/PVRIptvData.h
+set(IPTV_HEADERS src/addon.h
+                 src/IptvSimple.h
+                 src/iptvsimple/AddonSettings.h
                  src/iptvsimple/CatchupController.h
                  src/iptvsimple/Channels.h
                  src/iptvsimple/ChannelGroups.h
-                 src/iptvsimple/Providers.cpp
                  src/iptvsimple/Epg.h
+                 src/iptvsimple/InstanceSettings.h
                  src/iptvsimple/Media.h
                  src/iptvsimple/PlaylistLoader.h
-                 src/iptvsimple/Settings.h
+                 src/iptvsimple/Providers.cpp
                  src/iptvsimple/StreamManager.h
                  src/iptvsimple/data/BaseEntry.h
                  src/iptvsimple/data/Channel.h
@@ -64,6 +69,7 @@ set(IPTV_HEADERS src/PVRIptvData.h
                  src/iptvsimple/data/StreamEntry.h
                  src/iptvsimple/utilities/FileUtils.h
                  src/iptvsimple/utilities/Logger.h
+                 src/iptvsimple/utilities/SettingsMigration.h
                  src/iptvsimple/utilities/StreamUtils.h
                  src/iptvsimple/utilities/TimeUtils.h
                  src/iptvsimple/utilities/WebUtils.h

diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="21.0.0"
+  version="21.1.0"
   name="IPTV Simple Client"
   provider-name="nightik and Ross Nicholson">
   <requires>@ADDON_DEPENDS@

diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,6 @@
+v21.1.0
+- Add support for multiple instances each supporting their own M3U/XMLTV and settings
+
 v20.7.0
 - Add setting to make matching channel IDs and tvg-id's case sensitive