Fix multithreading issues

kodi-pvr · Dec 21, 2017 · ec3974e · ec3974e
1 parent 53f94ec
commit ec3974e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/PVRIptvData.cpp b/src/PVRIptvData.cpp
@@ -573,11 +573,13 @@ bool PVRIptvData::LoadGenres(void)
 
 int PVRIptvData::GetChannelsAmount(void)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   return m_channels.size();
 }
 
 PVR_ERROR PVRIptvData::GetChannels(ADDON_HANDLE handle, bool bRadio)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   for (unsigned int iChannelPtr = 0; iChannelPtr < m_channels.size(); iChannelPtr++)
   {
     PVRIptvChannel &channel = m_channels.at(iChannelPtr);
@@ -603,6 +605,7 @@ PVR_ERROR PVRIptvData::GetChannels(ADDON_HANDLE handle, bool bRadio)
 
 bool PVRIptvData::GetChannel(const PVR_CHANNEL &channel, PVRIptvChannel &myChannel)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   for (unsigned int iChannelPtr = 0; iChannelPtr < m_channels.size(); iChannelPtr++)
   {
     PVRIptvChannel &thisChannel = m_channels.at(iChannelPtr);
@@ -625,11 +628,13 @@ bool PVRIptvData::GetChannel(const PVR_CHANNEL &channel, PVRIptvChannel &myChann
 
 int PVRIptvData::GetChannelGroupsAmount(void)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   return m_groups.size();
 }
 
 PVR_ERROR PVRIptvData::GetChannelGroups(ADDON_HANDLE handle, bool bRadio)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   std::vector<PVRIptvChannelGroup>::iterator it;
   for (it = m_groups.begin(); it != m_groups.end(); ++it)
   {
@@ -651,6 +656,7 @@ PVR_ERROR PVRIptvData::GetChannelGroups(ADDON_HANDLE handle, bool bRadio)
 
 PVR_ERROR PVRIptvData::GetChannelGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP &group)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   PVRIptvChannelGroup *myGroup;
   if ((myGroup = FindGroup(group.strGroupName)) != NULL)
   {
@@ -677,6 +683,7 @@ PVR_ERROR PVRIptvData::GetChannelGroupMembers(ADDON_HANDLE handle, const PVR_CHA
 
 PVR_ERROR PVRIptvData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   std::vector<PVRIptvChannel>::iterator myChannel;
   for (myChannel = m_channels.begin(); myChannel < m_channels.end(); ++myChannel)
   {
@@ -1058,6 +1065,7 @@ void PVRIptvData::ApplyChannelsLogosFromEPG()
 
 void PVRIptvData::ReaplyChannelsLogos(const char * strNewPath)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   if (strlen(strNewPath) > 0)
   {
     m_strLogoPath = strNewPath;
@@ -1070,6 +1078,7 @@ void PVRIptvData::ReaplyChannelsLogos(const char * strNewPath)
 
 void PVRIptvData::ReloadEPG(const char * strNewPath)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   if (strNewPath != m_strXMLTVUrl)
   {
     m_strXMLTVUrl = strNewPath;
@@ -1088,6 +1097,7 @@ void PVRIptvData::ReloadEPG(const char * strNewPath)
 
 void PVRIptvData::ReloadPlayList(const char * strNewPath)
 {
+  P8PLATFORM::CLockObject lock(m_mutex);
   if (strNewPath != m_strM3uUrl)
   {
     m_strM3uUrl = strNewPath;

diff --git a/src/PVRIptvData.h b/src/PVRIptvData.h
@@ -132,4 +132,5 @@ class PVRIptvData : public P8PLATFORM::CThread
   std::vector<PVRIptvChannel>       m_channels;
   std::vector<PVRIptvEpgChannel>    m_epg;
   std::vector<PVRIptvEpgGenre>      m_genres;
+  P8PLATFORM::CMutex                m_mutex;
 };