Disconnected backend and suspended client

addons/pvr.mythtv.cmyth/Makefile.am

@@ -30,6 +30,6 @@ libmythtvcmyth_addon_la_SOURCES = src/client.cpp \
                                   src/cppmyth/MythRecorder.cpp \
                                   src/cppmyth/MythStorageGroupFile.cpp \
                                   src/cppmyth/MythSignal.cpp \
-                                  src/cppmyth/MythTimer.cpp \
+                                  src/cppmyth/MythRecordingRule.cpp \
                                   src/cppmyth/MythTimestamp.cpp
 

addons/pvr.mythtv.cmyth/addon/resources/language/English/strings.po

@@ -49,3 +49,17 @@ msgstr ""
 msgctxt "#30007"
 msgid "Allow Live TV to move scheduled shows"
 msgstr ""
+
+# Systeminformation labels
+msgctxt "#30100"
+msgid "Protocol version: %i - Database version: %i"
+msgstr ""
+
+# Notifications
+msgctxt "#30300"
+msgid "Failed to connect to MythTV backend"
+msgstr ""
+
+msgctxt "#30301"
+msgid "Failed to connect to MythTV database"
+msgstr ""

addons/pvr.mythtv.cmyth/addon/resources/settings.xml

@@ -5,6 +5,8 @@
   <setting id="db_user" type="text" label="30002" default="mythtv" />
   <setting id="db_password" type="text" label="30003" default="mythtv" />
   <setting id="db_name" type="text" label="30004" default="mythconverg" />
+  <setting id="db_host" type="text" visible="false" />
+  <setting id="db_port" type="number" visible="false" default="3306" />
   <setting id="extradebug" type="bool" label="30005" default="false" />
   <setting id="livetv" type="bool" label="30006" default="true" />
   <setting id="livetv_priority" type="bool" label="30007" default="false" />

addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj

@@ -20,9 +20,9 @@
     <ClCompile Include="..\..\src\cppmyth\MythFile.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythProgramInfo.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythRecorder.cpp" />
+    <ClCompile Include="..\..\src\cppmyth\MythRecordingRule.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythStorageGroupFile.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythSignal.cpp" />
-    <ClCompile Include="..\..\src\cppmyth\MythTimer.cpp" />
     <ClCompile Include="..\..\src\cppmyth\MythTimestamp.cpp" />
     <ClCompile Include="..\..\src\fileOps.cpp" />
     <ClCompile Include="..\..\src\pvrclient-mythtv.cpp" />
@@ -39,9 +39,9 @@
     <ClInclude Include="..\..\src\cppmyth\MythPointer.h" />
     <ClInclude Include="..\..\src\cppmyth\MythProgramInfo.h" />
     <ClInclude Include="..\..\src\cppmyth\MythRecorder.h" />
+    <ClInclude Include="..\..\src\cppmyth\MythRecordingRule.h" />
     <ClInclude Include="..\..\src\cppmyth\MythStorageGroupFile.h" />
     <ClInclude Include="..\..\src\cppmyth\MythSignal.h" />
-    <ClInclude Include="..\..\src\cppmyth\MythTimer.h" />
     <ClInclude Include="..\..\src\cppmyth\MythTimestamp.h" />
     <ClInclude Include="..\..\src\fileOps.h" />
     <ClInclude Include="..\..\src\pvrclient-mythtv.h" />

addons/pvr.mythtv.cmyth/project/VS2010Express/pvr.mythtv.cmyth.vcxproj.filters

@@ -28,16 +28,16 @@
     <ClCompile Include="..\..\src\cppmyth\MythSignal.cpp">
       <Filter>cppmyth</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cppmyth\MythTimer.cpp">
-      <Filter>cppmyth</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cppmyth\MythTimestamp.cpp">
       <Filter>cppmyth</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\cppmyth\MythStorageGroupFile.cpp">
       <Filter>cppmyth</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\categories.cpp" />
+    <ClCompile Include="..\..\src\cppmyth\MythRecordingRule.cpp">
+      <Filter>cppmyth</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\client.h" />
@@ -75,13 +75,13 @@
     <ClInclude Include="..\..\src\cppmyth\MythSignal.h">
       <Filter>cppmyth</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cppmyth\MythTimer.h">
-      <Filter>cppmyth</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cppmyth\MythStorageGroupFile.h">
       <Filter>cppmyth</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\categories.h" />
+    <ClInclude Include="..\..\src\cppmyth\MythRecordingRule.h">
+      <Filter>cppmyth</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cppmyth">

addons/pvr.mythtv.cmyth/src/client.cpp

@@ -33,11 +33,13 @@ using namespace ADDON;
  * Default values are defined inside client.h
  * and exported to the other source files.
  */
-CStdString   g_szHostname             = DEFAULT_HOST;             ///< The Host name or IP of the mythtv server
+CStdString   g_szMythHostname         = DEFAULT_HOST;             ///< The Host name or IP of the mythtv server
 int          g_iMythPort              = DEFAULT_PORT;             ///< The mythtv Port (default is 6543)
-CStdString   g_szMythDBuser           = DEFAULT_DB_USER;          ///< The mythtv sql username (default is mythtv)
-CStdString   g_szMythDBpassword       = DEFAULT_DB_PASSWORD;      ///< The mythtv sql password (default is mythtv)
-CStdString   g_szMythDBname           = DEFAULT_DB_NAME;          ///< The mythtv sql database name (default is mythconverg)
+CStdString   g_szDBUser               = DEFAULT_DB_USER;          ///< The mythtv sql username (default is mythtv)
+CStdString   g_szDBPassword           = DEFAULT_DB_PASSWORD;      ///< The mythtv sql password (default is mythtv)
+CStdString   g_szDBName               = DEFAULT_DB_NAME;          ///< The mythtv sql database name (default is mythconverg)
+CStdString   g_szDBHostname           = DEFAULT_HOST;             ///< The mythtv sql database host name or IP of the database server (default is same as mythtv backend hostname)
+int          g_iDBPort                = DEFAULT_DB_PORT;          ///< The mythtv sql database port (default is 3306)
 bool         g_bExtraDebug            = DEFAULT_EXTRA_DEBUG;      ///< Output extensive debug information to the log
 bool         g_bLiveTV                = DEFAULT_LIVETV;           ///< LiveTV support (or recordings only)
 bool         g_bLiveTVPriority        = DEFAULT_LIVETV_PRIORITY;  ///< MythTV Backend setting to allow live TV to move scheduled shows
@@ -80,6 +82,8 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
 
   XBMC->Log(LOG_DEBUG, "Creating MythTV cmyth PVR-Client");
 
+  XBMC->Log(LOG_DEBUG, "Addon compiled with XBMC_PVR_API_VERSION: %s and XBMC_PVR_MIN_API_VERSION: %s", GetPVRAPIVersion(), GetMininumPVRAPIVersion());
+
   XBMC->Log(LOG_DEBUG, "Register handle @ libXBMC_addon...done");
 
   XBMC->Log(LOG_DEBUG, "Checking props...");
@@ -121,12 +125,12 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
 
   /* Read setting "host" from settings.xml */
   if (XBMC->GetSetting("host", buffer))
-    g_szHostname = buffer;
+    g_szMythHostname = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'host' setting, falling back to '%s' as default", DEFAULT_HOST);
-    g_szHostname = DEFAULT_HOST;
+    g_szMythHostname = DEFAULT_HOST;
   }
   buffer[0] = 0;
 
@@ -148,37 +152,58 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
 
   /* Read setting "db_username" from settings.xml */
   if (XBMC->GetSetting("db_user", buffer))
-    g_szMythDBuser = buffer;
+    g_szDBUser = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'db_user' setting, falling back to '%s' as default", DEFAULT_DB_USER);
-    g_szMythDBuser = DEFAULT_DB_USER;
+    g_szDBUser = DEFAULT_DB_USER;
   }
   buffer[0] = 0;
 
   /* Read setting "db_password" from settings.xml */
   if (XBMC->GetSetting("db_password", buffer))
-    g_szMythDBpassword = buffer;
+    g_szDBPassword = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'db_password' setting, falling back to '%s' as default", DEFAULT_DB_PASSWORD);
-    g_szMythDBpassword = DEFAULT_DB_PASSWORD;
+    g_szDBPassword = DEFAULT_DB_PASSWORD;
   }
   buffer[0] = 0;
 
   /* Read setting "db_name" from settings.xml */
   if (XBMC->GetSetting("db_name", buffer))
-    g_szMythDBname = buffer;
+    g_szDBName = buffer;
   else
   {
     /* If setting is unknown fallback to defaults */
     XBMC->Log(LOG_ERROR, "Couldn't get 'db_name' setting, falling back to '%s' as default", DEFAULT_DB_NAME);
-    g_szMythDBname = DEFAULT_DB_NAME;
+    g_szDBName = DEFAULT_DB_NAME;
+  }
+  buffer[0] = 0;
+
+  /* Read hidden setting "db_host" from settings.xml */
+  if (XBMC->GetSetting("db_host", buffer))
+    if (strlen(buffer) > 0)
+      g_szDBHostname = buffer;
+    else
+      g_szDBHostname = g_szMythHostname;
+  else
+  {
+    /* If setting is unknown fallback to defaults */
+    XBMC->Log(LOG_ERROR, "Couldn't get 'db_host' setting, falling back to '%s' as default", g_szMythHostname.c_str());
+    g_szDBHostname = g_szMythHostname;
   }
   buffer[0] = 0;
 
+  /* Read hidden setting "db_port" from settings.xml */
+  if (!XBMC->GetSetting("db_port", &g_iDBPort) || g_iDBPort == 0)
+  {
+    /* If setting is unknown fallback to defaults */
+    g_iDBPort = DEFAULT_DB_PORT;
+  }
+
   /* Read setting "LiveTV" from settings.xml */
   if (!XBMC->GetSetting("livetv", &g_bLiveTV))
   {
@@ -275,10 +300,10 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
   if (str == "host")
   {
     string tmp_sHostname;
-    XBMC->Log(LOG_INFO, "Changed Setting 'host' from %s to %s", g_szHostname.c_str(), (const char*)settingValue);
-    tmp_sHostname = g_szHostname;
-    g_szHostname = (const char*)settingValue;
-    if (tmp_sHostname != g_szHostname)
+    XBMC->Log(LOG_INFO, "Changed Setting 'host' from %s to %s", g_szMythHostname.c_str(), (const char*)settingValue);
+    tmp_sHostname = g_szMythHostname;
+    g_szMythHostname = (const char*)settingValue;
+    if (tmp_sHostname != g_szMythHostname)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "port")
@@ -292,29 +317,29 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
   }
   else if (str == "db_user")
   {
-    string tmp_sMythDBuser;
-    XBMC->Log(LOG_INFO, "Changed Setting 'db_user' from %s to %s", g_szMythDBuser.c_str(), (const char*)settingValue);
-    tmp_sMythDBuser = g_szMythDBuser;
-    g_szMythDBuser = (const char*)settingValue;
-    if (tmp_sMythDBuser != g_szMythDBuser)
+    string tmp_sDBUser;
+    XBMC->Log(LOG_INFO, "Changed Setting 'db_user' from %s to %s", g_szDBUser.c_str(), (const char*)settingValue);
+    tmp_sDBUser = g_szDBUser;
+    g_szDBUser = (const char*)settingValue;
+    if (tmp_sDBUser != g_szDBUser)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "db_password")
   {
-    string tmp_sMythDBpassword;
-    XBMC->Log(LOG_INFO, "Changed Setting 'db_password' from %s to %s", g_szMythDBpassword.c_str(), (const char*)settingValue);
-    tmp_sMythDBpassword = g_szMythDBpassword;
-    g_szMythDBpassword = (const char*)settingValue;
-    if (tmp_sMythDBpassword != g_szMythDBpassword)
+    string tmp_sDBPassword;
+    XBMC->Log(LOG_INFO, "Changed Setting 'db_password' from %s to %s", g_szDBPassword.c_str(), (const char*)settingValue);
+    tmp_sDBPassword = g_szDBPassword;
+    g_szDBPassword = (const char*)settingValue;
+    if (tmp_sDBPassword != g_szDBPassword)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "db_name")
   {
-    string tmp_sMythDBname;
-    XBMC->Log(LOG_INFO, "Changed Setting 'db_name' from %s to %s", g_szMythDBname.c_str(), (const char*)settingValue);
-    tmp_sMythDBname = g_szMythDBname;
-    g_szMythDBname = (const char*)settingValue;
-    if (tmp_sMythDBname != g_szMythDBname)
+    string tmp_sDBName;
+    XBMC->Log(LOG_INFO, "Changed Setting 'db_name' from %s to %s", g_szDBName.c_str(), (const char*)settingValue);
+    tmp_sDBName = g_szDBName;
+    g_szDBName = (const char*)settingValue;
+    if (tmp_sDBName != g_szDBName)
       return ADDON_STATUS_NEED_RESTART;
   }
   else if (str == "extradebug")
@@ -677,12 +702,7 @@ bool SwitchChannel(const PVR_CHANNEL &channelinfo)
   if (g_client == NULL)
     return false;
 
-  if (g_client->SwitchChannel(channelinfo))
-    return true;
-  else
-    XBMC->QueueNotification(QUEUE_WARNING, "Failed to change channel. No free tuners?");
-
-  return false;
+  return g_client->SwitchChannel(channelinfo);
 }
 
 PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus)

addons/pvr.mythtv.cmyth/src/client.h

@@ -44,6 +44,7 @@ extern "C" {
 #define DEFAULT_DB_USER         "mythtv"
 #define DEFAULT_DB_PASSWORD     "mythtv"
 #define DEFAULT_DB_NAME         "mythconverg"
+#define DEFAULT_DB_PORT         3306
 
 /*!
  * @brief PVR macros for string exchange
@@ -61,11 +62,13 @@ extern CStdString   g_szUserPath;         ///< The Path to the user directory in
 extern CStdString   g_szClientPath;       ///< The Path where this driver is located
 
 /* Client Settings */
-extern CStdString   g_szHostname;         ///< The Host name or IP of the mythtv server
+extern CStdString   g_szMythHostname;     ///< The Host name or IP of the mythtv server
 extern int          g_iMythPort;          ///< The mythtv Port (default is 6543)
-extern CStdString   g_szMythDBuser;       ///< The mythtv sql username (default is mythtv)
-extern CStdString   g_szMythDBpassword;   ///< The mythtv sql password (default is mythtv)
-extern CStdString   g_szMythDBname;       ///< The mythtv sql database name (default is mythconverg)
+extern CStdString   g_szDBUser;           ///< The mythtv sql username (default is mythtv)
+extern CStdString   g_szDBPassword;       ///< The mythtv sql password (default is mythtv)
+extern CStdString   g_szDBName;           ///< The mythtv sql database name (default is mythconverg)
+extern CStdString   g_szDBHostname;       ///< The mythtv sql database host name or IP of the database server
+extern int          g_iDBPort;            ///< The mythtv sql database port (default is 3306)
 extern bool         g_bExtraDebug;        ///< Debug logging
 extern bool         g_bLiveTV;            ///< LiveTV support (or recordings only)
 extern bool         g_bLiveTVPriority;    ///< MythTV Backend setting to allow live TV to move scheduled shows

addons/pvr.mythtv.cmyth/src/cppmyth.h

@@ -8,5 +8,5 @@
 #include "cppmyth/MythProgramInfo.h"
 #include "cppmyth/MythRecorder.h"
 #include "cppmyth/MythSignal.h"
-#include "cppmyth/MythTimer.h"
+#include "cppmyth/MythRecordingRule.h"
 #include "cppmyth/MythTimestamp.h"

addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.cpp

@@ -41,7 +41,7 @@ bool MythChannel::IsNull() const
   return *m_channel_t == NULL;
 }
 
-int MythChannel::ID()
+unsigned long MythChannel::ID()
 {
   return cmyth_channel_chanid(*m_channel_t);
 }
@@ -54,7 +54,7 @@ CStdString MythChannel::Name()
   return retval;
 }
 
-int MythChannel::NumberInt()
+unsigned long MythChannel::NumberInt()
 {
   return cmyth_channel_channum(*m_channel_t);
 }
@@ -91,12 +91,12 @@ bool MythChannel::IsRadio() const
   return m_radio;
 }
 
-int MythChannel::SourceID()
+unsigned long MythChannel::SourceID()
 {
   return cmyth_channel_sourceid(*m_channel_t);
 }
 
-int MythChannel::MultiplexID()
+unsigned long MythChannel::MultiplexID()
 {
   return cmyth_channel_multiplex(*m_channel_t);
 }

addons/pvr.mythtv.cmyth/src/cppmyth/MythChannel.h

@@ -37,16 +37,16 @@ class MythChannel
 
   bool IsNull() const;
 
-  int ID();
+  unsigned long ID();
   CStdString Name();
-  int NumberInt();
+  unsigned long NumberInt();
   CStdString Number();
   CStdString Callsign();
   CStdString Icon();
   bool Visible();
   bool IsRadio() const;
-  int SourceID();
-  int MultiplexID();
+  unsigned long SourceID();
+  unsigned long MultiplexID();
 
 private:
   boost::shared_ptr<MythPointer<cmyth_channel_t> > m_channel_t;