Merge pull request xbmc#21972 from notspiff/header_cleanups

Some header cleanups

xbmc/XBDateTime.h

@@ -9,70 +9,13 @@
 #pragma once
 
 #include "utils/IArchivable.h"
+#include "utils/TimeFormat.h"
 #include "utils/XTimeUtils.h"
 
 #include <string>
 
 #include "PlatformDefs.h"
 
-/*! \brief TIME_FORMAT enum/bitmask used for formatting time strings
- Note the use of bitmasking, e.g.
-  TIME_FORMAT_HH_MM_SS = TIME_FORMAT_HH | TIME_FORMAT_MM | TIME_FORMAT_SS
- \sa StringUtils::SecondsToTimeString
- \note For InfoLabels use the equivalent value listed (bold)
-  on the description of each enum value.
- \note<b>Example:</b> 3661 seconds => h=1, hh=01, m=1, mm=01, ss=01, hours=1, mins=61, secs=3661
- <p><hr>
- @skinning_v18 **[Infolabels Updated]** Added <b>secs</b>, <b>mins</b>, <b>hours</b> (total time) and **m** as possible formats for
- InfoLabels that support the definition of a time format. Examples are:
-   - \link Player_SeekOffset_format `Player.SeekOffset(format)`\endlink
-   - \link Player_TimeRemaining_format `Player.TimeRemaining(format)`\endlink
-   - \link Player_Time_format `Player.Time(format)`\endlink
-   - \link Player_Duration_format `Player.Duration(format)`\endlink
-   - \link Player_FinishTime_format `Player.FinishTime(format)`\endlink
-   - \link Player_StartTime_format `Player.StartTime(format)` \endlink
-   - \link Player_SeekNumeric_format `Player.SeekNumeric(format)`\endlink
-   - \link ListItem_Duration_format `ListItem.Duration(format)`\endlink
-   - \link PVR_EpgEventDuration_format `PVR.EpgEventDuration(format)`\endlink
-   - \link PVR_EpgEventElapsedTime_format `PVR.EpgEventElapsedTime(format)`\endlink
-   - \link PVR_EpgEventRemainingTime_format `PVR.EpgEventRemainingTime(format)`\endlink
-   - \link PVR_EpgEventSeekTime_format `PVR.EpgEventSeekTime(format)`\endlink
-   - \link PVR_EpgEventFinishTime_format `PVR.EpgEventFinishTime(format)`\endlink
-   - \link PVR_TimeShiftStart_format `PVR.TimeShiftStart(format)`\endlink
-   - \link PVR_TimeShiftEnd_format `PVR.TimeShiftEnd(format)`\endlink
-   - \link PVR_TimeShiftCur_format `PVR.TimeShiftCur(format)`\endlink
-   - \link PVR_TimeShiftOffset_format `PVR.TimeShiftOffset(format)`\endlink
-   - \link PVR_TimeshiftProgressDuration_format `PVR.TimeshiftProgressDuration(format)`\endlink
-   - \link PVR_TimeshiftProgressEndTime `PVR.TimeshiftProgressEndTime`\endlink
-   - \link PVR_TimeshiftProgressEndTime_format `PVR.TimeshiftProgressEndTime(format)`\endlink
-   - \link ListItem_NextDuration_format `ListItem.NextDuration(format)` \endlink
-  <p>
- */
-enum TIME_FORMAT
-{
-  TIME_FORMAT_GUESS = 0, ///< usually used as the fallback value if the format value is empty
-  TIME_FORMAT_SS = 1, ///< <b>ss</b> - seconds only
-  TIME_FORMAT_MM = 2, ///< <b>mm</b> - minutes only (2-digit)
-  TIME_FORMAT_MM_SS = 3, ///< <b>mm:ss</b> - minutes and seconds
-  TIME_FORMAT_HH = 4, ///< <b>hh</b> - hours only (2-digit)
-  TIME_FORMAT_HH_SS = 5, ///< <b>hh:ss</b> - hours and seconds (this is not particularly useful)
-  TIME_FORMAT_HH_MM = 6, ///< <b>hh:mm</b> - hours and minutes
-  TIME_FORMAT_HH_MM_SS = 7, ///< <b>hh:mm:ss</b> - hours, minutes and seconds
-  TIME_FORMAT_XX = 8, ///<  <b>xx</b> - returns AM/PM for a 12-hour clock
-  TIME_FORMAT_HH_MM_XX =
-      14, ///< <b>hh:mm xx</b> - returns hours and minutes in a 12-hour clock format (AM/PM)
-  TIME_FORMAT_HH_MM_SS_XX =
-      15, ///< <b>hh:mm:ss xx</b> - returns hours (2-digit), minutes and seconds in a 12-hour clock format (AM/PM)
-  TIME_FORMAT_H = 16, ///< <b>h</b> - hours only (1-digit)
-  TIME_FORMAT_H_MM_SS = 19, ///< <b>hh:mm:ss</b> - hours, minutes and seconds
-  TIME_FORMAT_H_MM_SS_XX =
-      27, ///< <b>hh:mm:ss xx</b> - returns hours (1-digit), minutes and seconds in a 12-hour clock format (AM/PM)
-  TIME_FORMAT_SECS = 32, ///<  <b>secs</b> - total time in seconds
-  TIME_FORMAT_MINS = 64, ///<  <b>mins</b> - total time in minutes
-  TIME_FORMAT_HOURS = 128, ///< <b>hours</b> - total time in hours
-  TIME_FORMAT_M = 256 ///< <b>m</b> - minutes only (1-digit)
-};
-
 class CDateTime;
 
 class CDateTimeSpan

xbmc/addons/RepositoryUpdater.h

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "XBDateTime.h"
 #include "addons/AddonEvents.h"
 #include "addons/Repository.h"
 #include "settings/lib/ISettingCallback.h"
@@ -18,6 +17,8 @@
 
 #include <vector>
 
+class CDateTime;
+
 namespace ADDON
 {
 

xbmc/addons/binary-addons/AddonDll.h

@@ -11,7 +11,6 @@
 #include "BinaryAddonManager.h"
 #include "DllAddon.h"
 #include "addons/Addon.h"
-#include "utils/XMLUtils.h"
 
 // Global addon callback handle classes
 #include "addons/interfaces/AddonBase.h"

xbmc/cores/RetroPlayer/savestates/ISavestate.h

@@ -9,12 +9,13 @@
 #pragma once
 
 #include "SavestateTypes.h"
-#include "XBDateTime.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
+class CDateTime;
+
 namespace KODI
 {
 namespace RETRO

xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.cpp

@@ -8,6 +8,7 @@
 
 #include "SavestateFlatBuffer.h"
 
+#include "XBDateTime.h"
 #include "savestate_generated.h"
 #include "utils/log.h"
 

xbmc/dialogs/GUIDialogNumeric.cpp

@@ -9,6 +9,7 @@
 #include "GUIDialogNumeric.h"
 
 #include "ServiceBroker.h"
+#include "XBDateTime.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUILabelControl.h"
 #include "guilib/GUIWindowManager.h"

xbmc/dialogs/GUIDialogNumeric.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "XBDateTime.h"
 #include "guilib/GUIDialog.h"
+#include "utils/XTimeUtils.h"
 
 #include <cstdint>
 

xbmc/filesystem/SpecialProtocol.cpp

@@ -7,18 +7,21 @@
  */
 
 #include "SpecialProtocol.h"
+
 #include "ServiceBroker.h"
 #include "URL.h"
 #include "Util.h"
-#include "windowing/GraphicContext.h"
 #include "profiles/ProfileManager.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
 
 #include <cassert>
+
+#include "PlatformDefs.h"
 #ifdef TARGET_POSIX
 #include <dirent.h>
 #include "utils/StringUtils.h"

xbmc/guilib/guiinfo/PlayerGUIInfo.cpp

@@ -644,13 +644,13 @@ std::string CPlayerGUIInfo::GetContentRanges(int iInfo) const
   CDataCacheCore& data = CServiceBroker::GetDataCacheCore();
   std::vector<std::pair<float, float>> ranges;
 
-  time_t start;
+  std::time_t start;
   int64_t current;
   int64_t min;
   int64_t max;
   data.GetPlayTimes(start, current, min, max);
 
-  time_t duration = max - start * 1000;
+  std::time_t duration = max - start * 1000;
   if (duration > 0)
   {
     switch (iInfo)
@@ -685,7 +685,7 @@ std::string CPlayerGUIInfo::GetContentRanges(int iInfo) const
 }
 
 std::vector<std::pair<float, float>> CPlayerGUIInfo::GetEditList(const CDataCacheCore& data,
-                                                                 time_t duration) const
+                                                                 std::time_t duration) const
 {
   std::vector<std::pair<float, float>> ranges;
 
@@ -700,7 +700,7 @@ std::vector<std::pair<float, float>> CPlayerGUIInfo::GetEditList(const CDataCach
 }
 
 std::vector<std::pair<float, float>> CPlayerGUIInfo::GetCuts(const CDataCacheCore& data,
-                                                             time_t duration) const
+                                                             std::time_t duration) const
 {
   std::vector<std::pair<float, float>> ranges;
 
@@ -718,7 +718,7 @@ std::vector<std::pair<float, float>> CPlayerGUIInfo::GetCuts(const CDataCacheCor
 }
 
 std::vector<std::pair<float, float>> CPlayerGUIInfo::GetSceneMarkers(const CDataCacheCore& data,
-                                                                     time_t duration) const
+                                                                     std::time_t duration) const
 {
   std::vector<std::pair<float, float>> ranges;
 
@@ -736,7 +736,7 @@ std::vector<std::pair<float, float>> CPlayerGUIInfo::GetSceneMarkers(const CData
 }
 
 std::vector<std::pair<float, float>> CPlayerGUIInfo::GetChapters(const CDataCacheCore& data,
-                                                                 time_t duration) const
+                                                                 std::time_t duration) const
 {
   std::vector<std::pair<float, float>> ranges;
 

xbmc/guilib/guiinfo/PlayerGUIInfo.h

@@ -8,11 +8,12 @@
 
 #pragma once
 
-#include "XBDateTime.h"
 #include "guilib/guiinfo/GUIInfoProvider.h"
 #include "utils/EventStream.h"
+#include "utils/TimeFormat.h"
 
 #include <atomic>
+#include <ctime>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -76,12 +77,13 @@ class CPlayerGUIInfo : public CGUIInfoProvider
 
   std::string GetContentRanges(int iInfo) const;
   std::vector<std::pair<float, float>> GetEditList(const CDataCacheCore& data,
-                                                   time_t duration) const;
-  std::vector<std::pair<float, float>> GetCuts(const CDataCacheCore& data, time_t duration) const;
+                                                   std::time_t duration) const;
+  std::vector<std::pair<float, float>> GetCuts(const CDataCacheCore& data,
+                                               std::time_t duration) const;
   std::vector<std::pair<float, float>> GetSceneMarkers(const CDataCacheCore& data,
-                                                       time_t duration) const;
+                                                       std::time_t duration) const;
   std::vector<std::pair<float, float>> GetChapters(const CDataCacheCore& data,
-                                                   time_t duration) const;
+                                                   std::time_t duration) const;
 };
 
 } // namespace GUIINFO

xbmc/interfaces/json-rpc/CMakeLists.txt

@@ -8,6 +8,7 @@ set(SOURCES AddonsOperations.cpp
             InputOperations.cpp
             JSONRPC.cpp
             JSONServiceDescription.cpp
+            JSONUtils.cpp
             PlayerOperations.cpp
             PlaylistOperations.cpp
             ProfilesOperations.cpp

xbmc/interfaces/json-rpc/JSONUtils.cpp

@@ -0,0 +1,38 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "JSONUtils.h"
+
+#include "XBDateTime.h"
+
+namespace JSONRPC
+{
+
+void CJSONUtils::SetFromDBDate(const CVariant& jsonDate, CDateTime& date)
+{
+  if (!jsonDate.isString())
+    return;
+
+  if (jsonDate.empty())
+    date.Reset();
+  else
+    date.SetFromDBDate(jsonDate.asString());
+}
+
+void CJSONUtils::SetFromDBDateTime(const CVariant& jsonDate, CDateTime& date)
+{
+  if (!jsonDate.isString())
+    return;
+
+  if (jsonDate.empty())
+    date.Reset();
+  else
+    date.SetFromDBDateTime(jsonDate.asString());
+}
+
+} // namespace JSONRPC

xbmc/interfaces/json-rpc/JSONUtils.h

@@ -9,7 +9,6 @@
 #pragma once
 
 #include "JSONRPCUtils.h"
-#include "XBDateTime.h"
 #include "playlists/SmartPlayList.h"
 #include "utils/JSONVariantParser.h"
 #include "utils/JSONVariantWriter.h"
@@ -21,6 +20,8 @@
 #include <string.h>
 #include <vector>
 
+class CDateTime;
+
 namespace JSONRPC
 {
   /*!
@@ -462,27 +463,9 @@ namespace JSONRPC
         stringArray.push_back(it->asString());
     }
 
-    static void SetFromDBDate(const CVariant &jsonDate, CDateTime &date)
-    {
-      if (!jsonDate.isString())
-        return;
-
-      if (jsonDate.empty())
-        date.Reset();
-      else
-        date.SetFromDBDate(jsonDate.asString());
-    }
+    static void SetFromDBDate(const CVariant& jsonDate, CDateTime& date);
 
-    static void SetFromDBDateTime(const CVariant &jsonDate, CDateTime &date)
-    {
-      if (!jsonDate.isString())
-        return;
-
-      if (jsonDate.empty())
-        date.Reset();
-      else
-        date.SetFromDBDateTime(jsonDate.asString());
-    }
+    static void SetFromDBDateTime(const CVariant& jsonDate, CDateTime& date);
 
     static bool GetXspFiltering(const std::string &type, const CVariant &filter, std::string &xsp)
     {

xbmc/peripherals/devices/Peripheral.cpp

@@ -711,3 +711,8 @@ bool CPeripheral::operator!=(const PeripheralScanResult& right) const
 {
   return !(*this == right);
 }
+
+CDateTime CPeripheral::LastActive()
+{
+  return CDateTime();
+}

xbmc/peripherals/devices/Peripheral.h

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "XBDateTime.h"
 #include "games/controllers/ControllerTypes.h"
 #include "input/joysticks/interfaces/IInputProvider.h"
 #include "input/keyboard/interfaces/IKeyboardInputProvider.h"
@@ -21,6 +20,7 @@
 #include <vector>
 
 class TiXmlDocument;
+class CDateTime;
 class CSetting;
 class IKeymap;
 
@@ -250,7 +250,7 @@ class CPeripheral : public KODI::JOYSTICK::IInputProvider,
    *
    * \return The time of last activation, or invalid if unknown/never active
    */
-  virtual CDateTime LastActive() { return CDateTime(); }
+  virtual CDateTime LastActive();
 
   /*!
    * \brief Get the controller profile that best represents this peripheral

xbmc/peripherals/devices/PeripheralCecAdapter.h

@@ -37,6 +37,7 @@ class CPeripheralCecAdapter : public CPeripheral
 #else
 
 #include "PeripheralHID.h"
+#include "XBDateTime.h"
 #include "interfaces/AnnouncementManager.h"
 #include "threads/CriticalSection.h"
 #include "threads/Thread.h"

xbmc/peripherals/devices/PeripheralJoystick.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "Peripheral.h"
+#include "XBDateTime.h"
 #include "input/joysticks/JoystickTypes.h"
 #include "input/joysticks/interfaces/IDriverReceiver.h"
 #include "threads/CriticalSection.h"

xbmc/peripherals/devices/PeripheralKeyboard.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "Peripheral.h"
+#include "XBDateTime.h"
 #include "input/keyboard/interfaces/IKeyboardDriverHandler.h"
 #include "threads/CriticalSection.h"