diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in index d6088165..08d92f2f 100644 --- a/pvr.iptvsimple/addon.xml.in +++ b/pvr.iptvsimple/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt index 59003d94..3890e5db 100644 --- a/pvr.iptvsimple/changelog.txt +++ b/pvr.iptvsimple/changelog.txt @@ -1,4 +1,7 @@ -v20.9.1 +v20.9.2 +- Revert async connect support + +v20.9.2 - Don't URL encode paths using resource:// or special:// protocols v20.9.0 diff --git a/src/IptvSimple.cpp b/src/IptvSimple.cpp index 86fe3f06..c19c0a50 100644 --- a/src/IptvSimple.cpp +++ b/src/IptvSimple.cpp @@ -35,8 +35,6 @@ bool IptvSimple::Initialise() { std::lock_guard lock(m_mutex); - ConnectionStateChange("", PVR_CONNECTION_STATE_CONNECTING, ""); - m_channels.Init(); m_channelGroups.Init(); m_providers.Init(); @@ -45,11 +43,6 @@ bool IptvSimple::Initialise() { m_channels.ChannelsLoadFailed(); m_channelGroups.ChannelGroupsLoadFailed(); - ConnectionStateChange("", PVR_CONNECTION_STATE_DISCONNECTED, ""); - } - else - { - ConnectionStateChange("", PVR_CONNECTION_STATE_CONNECTED, ""); } m_epg.Init(EpgMaxPastDays(), EpgMaxFutureDays()); @@ -123,8 +116,7 @@ void IptvSimple::Process() std::this_thread::sleep_for(std::chrono::milliseconds(1000)); m_settings->ReloadAddonInstanceSettings(); - if (m_playlistLoader.ReloadPlayList()) - ConnectionStateChange("", PVR_CONNECTION_STATE_CONNECTED, ""); + m_playlistLoader.ReloadPlayList(); m_epg.ReloadEPG(); // Reloading EPG also updates media m_reloadChannelsGroupsAndEPG = false; diff --git a/src/iptvsimple/PlaylistLoader.cpp b/src/iptvsimple/PlaylistLoader.cpp index ccf29d74..75e32a71 100644 --- a/src/iptvsimple/PlaylistLoader.cpp +++ b/src/iptvsimple/PlaylistLoader.cpp @@ -517,7 +517,7 @@ void PlaylistLoader::ParseSinglePropertyIntoChannel(const std::string& line, Cha } } -bool PlaylistLoader::ReloadPlayList() +void PlaylistLoader::ReloadPlayList() { m_m3uLocation = m_settings->GetM3ULocation(); @@ -532,15 +532,11 @@ bool PlaylistLoader::ReloadPlayList() m_client->TriggerChannelGroupsUpdate(); m_client->TriggerProvidersUpdate(); m_client->TriggerRecordingUpdate(); - - return true; } else { m_channels.ChannelsLoadFailed(); m_channelGroups.ChannelGroupsLoadFailed(); - - return false; } } diff --git a/src/iptvsimple/PlaylistLoader.h b/src/iptvsimple/PlaylistLoader.h index 8d2009f9..593c93ef 100644 --- a/src/iptvsimple/PlaylistLoader.h +++ b/src/iptvsimple/PlaylistLoader.h @@ -71,7 +71,7 @@ namespace iptvsimple bool Init(); bool LoadPlayList(); - bool ReloadPlayList(); + void ReloadPlayList(); private: static std::string ReadMarkerValue(const std::string& line, const std::string& markerName);