[cec] Fixed PeripheralCecAdapter application exit code handling.

Introduced new field "exitcode" for "OnQuit" message (@pdf).
spiroid · Nov 24, 2014 · d7df798 · d7df798
1 parent 9f35a93
commit d7df798
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3481,7 +3481,8 @@ void CApplication::Stop(int exitCode)
 {
   try
   {
-    CVariant vExitCode(exitCode);
+    CVariant vExitCode(CVariant::VariantTypeObject);
+    vExitCode["exitcode"] = exitCode;
     CAnnouncementManager::Get().Announce(System, "xbmc", "OnQuit", vExitCode);
 
     SaveFileState(true);

diff --git a/xbmc/interfaces/json-rpc/schema/notifications.json b/xbmc/interfaces/json-rpc/schema/notifications.json
@@ -248,7 +248,11 @@
     "description": "XBMC will be closed.",
     "params": [
       { "name": "sender", "type": "string", "required": true },
-      { "name": "data", "type": "null", "required": true }
+      { "name": "data", "type": "object", "required": true,
+        "properties": {
+          "exitcode": { "type": "integer", "minimum": 0, "required": true }
+        }
+      }
     ],
     "returns": null
   },

diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-6.20.1
+6.21.0
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -126,7 +126,7 @@ void CPeripheralCecAdapter::ResetMembers(void)
   m_strMenuLanguage          = "???";
   m_lastKeypress             = 0;
   m_lastChange               = VOLUME_CHANGE_NONE;
-  m_iExitCode                = 0;
+  m_iExitCode                = EXITCODE_QUIT;
   m_bIsMuted                 = false; // TODO fetch the correct initial value when system audiostatus is implemented in libCEC
   m_bGoingToStandby          = false;
   m_bIsRunning               = false;
@@ -149,7 +149,7 @@ void CPeripheralCecAdapter::Announce(AnnouncementFlag flag, const char *sender,
   if (flag == System && !strcmp(sender, "xbmc") && !strcmp(message, "OnQuit") && m_bIsReady)
   {
     CSingleLock lock(m_critSection);
-    m_iExitCode = (int)data["shuttingdown"].asInteger(0);
+    m_iExitCode = static_cast<int>(data["exitcode"].asInteger(EXITCODE_QUIT));
     CAnnouncementManager::Get().RemoveAnnouncer(this);
     StopThread(false);
   }