[Players][EDL] Use single direction enum class

xbmc/SeekHandler.cpp

@@ -311,12 +311,12 @@ bool CSeekHandler::OnAction(const CAction &action)
  }
  case ACTION_NEXT_SCENE:
  {
- appPlayer->SeekScene(PlayerSeekDirection::FORWARD);
+ appPlayer->SeekScene(Direction::FORWARD);
  return true;
  }
  case ACTION_PREV_SCENE:
  {
- appPlayer->SeekScene(PlayerSeekDirection::BACKWARD);
+ appPlayer->SeekScene(Direction::BACKWARD);
  return true;
  }
  case ACTION_ANALOG_SEEK_FORWARD:

xbmc/application/ApplicationPlayer.cpp

@@ -327,7 +327,7 @@ bool CApplicationPlayer::CanSeek() const
  return (player && player->CanSeek());
 }
 
-bool CApplicationPlayer::SeekScene(PlayerSeekDirection seekDirection)
+bool CApplicationPlayer::SeekScene(Direction seekDirection)
 {
  std::shared_ptr<IPlayer> player = GetInternal();
  return (player && player->SeekScene(seekDirection));

xbmc/application/ApplicationPlayer.h

@@ -144,7 +144,7 @@ class CApplicationPlayer : public IApplicationComponent
  void Seek(bool bPlus = true, bool bLargeStep = false, bool bChapterOverride = false);
  int SeekChapter(int iChapter);
  void SeekPercentage(float fPercent = 0);
- bool SeekScene(PlayerSeekDirection seekDirection);
+ bool SeekScene(Direction seekDirection);
  void SeekTime(int64_t iTime = 0);
  void SeekTimeRelative(int64_t iTime = 0);
  void SetAudioStream(int iStream);

xbmc/cores/Direction.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+#pragma once
+
+/*!
+ * @brief Specifies/Abstracts a direction
+*/
+enum class Direction : bool
+{
+ FORWARD, /*!< Forward */
+ BACKWARD /*!< Backward */
+};

xbmc/cores/EdlEdit.h

@@ -28,13 +28,4 @@ struct Edit
  Action action = Action::CUT;
 };
 
-/*!
- * @brief Specify the search direction for an EDL edit
-*/
-enum class EditDirection
-{
- FORWARD, /*!< Search forward */
- BACKWARD /*!< Search backwards */
-};
-
 } // namespace EDL

xbmc/cores/IPlayer.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "Direction.h"
 #include "IPlayerCallback.h"
 #include "Interface/StreamInfo.h"
 #include "MenuType.h"
@@ -84,15 +85,6 @@ enum ERENDERFEATURE
  RENDERFEATURE_TONEMAP
 };
 
-/*!
- * @brief Specify the Seek Direction
-*/
-enum class PlayerSeekDirection
-{
- FORWARD, /*!< Seek forward */
- BACKWARD /*!< Seek backwards */
-};
-
 class IPlayer
 {
 public:
@@ -114,7 +106,7 @@ class IPlayer
  virtual bool IsPassthrough() const { return false;}
  virtual bool CanSeek() const { return true; }
  virtual void Seek(bool bPlus = true, bool bLargeStep = false, bool bChapterOverride = false) = 0;
- virtual bool SeekScene(PlayerSeekDirection seekDirection) { return false; }
+ virtual bool SeekScene(Direction seekDirection) { return false; }
  virtual void SeekPercentage(float fPercent = 0){}
  virtual float GetCachePercentage() const { return 0; }
  virtual void SetMute(bool bOnOff){}

xbmc/cores/VideoPlayer/Edl.cpp

@@ -884,7 +884,7 @@ EDL::Action CEdl::GetLastEditActionType() const
  return m_lastEditActionType;
 }
 
-bool CEdl::GetNextSceneMarker(EDL::EditDirection direction, int clock, int* sceneMarker)
+bool CEdl::GetNextSceneMarker(Direction direction, int clock, int* sceneMarker)
 {
  if (!HasSceneMarker())
  return false;
@@ -894,7 +894,7 @@ bool CEdl::GetNextSceneMarker(EDL::EditDirection direction, int clock, int* scen
  int diff = 10 * 60 * 60 * 1000; // 10 hours to ms.
  bool found = false;
 
- if (direction == EDL::EditDirection::FORWARD) // Find closest scene forwards
+ if (direction == Direction::FORWARD) // Find closest scene forwards
  {
  for (int i = 0; i < (int)m_vecSceneMarkers.size(); i++)
  {
@@ -906,7 +906,7 @@ bool CEdl::GetNextSceneMarker(EDL::EditDirection direction, int clock, int* scen
  }
  }
  }
- else if (direction == EDL::EditDirection::BACKWARD) // Find closest scene backwards
+ else if (direction == Direction::BACKWARD) // Find closest scene backwards
  {
  for (int i = 0; i < (int)m_vecSceneMarkers.size(); i++)
  {

xbmc/cores/VideoPlayer/Edl.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "cores/Direction.h"
 #include "cores/EdlEdit.h"
 
 #include <string>
@@ -141,7 +142,7 @@ class CEdl
  */
  EDL::Action GetLastEditActionType() const;
 
- bool GetNextSceneMarker(EDL::EditDirection direction, int clock, int* sceneMarker);
+ bool GetNextSceneMarker(Direction direction, int clock, int* sceneMarker);
 
  static std::string MillisecondsToTimeString(int milliSeconds);
 

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3254,7 +3254,7 @@ void CVideoPlayer::Seek(bool bPlus, bool bLargeStep, bool bChapterOverride)
  m_callback.OnPlayBackSeek(seekTarget, seekTarget - time);
 }
 
-bool CVideoPlayer::SeekScene(PlayerSeekDirection seekDirection)
+bool CVideoPlayer::SeekScene(Direction seekDirection)
 {
  if (!m_Edl.HasSceneMarker())
  return false;
@@ -3264,21 +3264,18 @@ bool CVideoPlayer::SeekScene(PlayerSeekDirection seekDirection)
  * grace period applied it is impossible to go backwards past a scene marker.
  */
  int64_t clock = GetTime();
- if (seekDirection == PlayerSeekDirection::BACKWARD && clock > 5 * 1000) // 5 seconds
+ if (seekDirection == Direction::BACKWARD && clock > 5 * 1000) // 5 seconds
  clock -= 5 * 1000;
 
  int iScenemarker;
- if (m_Edl.GetNextSceneMarker(seekDirection == PlayerSeekDirection::FORWARD
- ? EDL::EditDirection::FORWARD
- : EDL::EditDirection::BACKWARD,
- clock, &iScenemarker))
+ if (m_Edl.GetNextSceneMarker(seekDirection, clock, &iScenemarker))
  {
  /*
  * Seeking is flushed and inaccurate, just like Seek()
  */
  CDVDMsgPlayerSeek::CMode mode;
  mode.time = iScenemarker;
- mode.backward = seekDirection == PlayerSeekDirection::BACKWARD;
+ mode.backward = seekDirection == Direction::BACKWARD;
  mode.accurate = false;
  mode.restore = false;
  mode.trickplay = false;
@@ -4530,7 +4527,7 @@ bool CVideoPlayer::OnAction(const CAction &action)
  m_processInfo->SeekFinished(0);
  return true;
  }
- else if (SeekScene(PlayerSeekDirection::FORWARD))
+ else if (SeekScene(Direction::FORWARD))
  return true;
  else
  break;
@@ -4541,7 +4538,7 @@ bool CVideoPlayer::OnAction(const CAction &action)
  m_processInfo->SeekFinished(0);
  return true;
  }
- else if (SeekScene(PlayerSeekDirection::BACKWARD))
+ else if (SeekScene(Direction::BACKWARD))
  return true;
  else
  break;

xbmc/cores/VideoPlayer/VideoPlayer.h

@@ -264,7 +264,7 @@ class CVideoPlayer : public IPlayer, public CThread, public IVideoPlayer,
  bool IsPassthrough() const override;
  bool CanSeek() const override;
  void Seek(bool bPlus, bool bLargeStep, bool bChapterOverride) override;
- bool SeekScene(PlayerSeekDirection seekDirection) override;
+ bool SeekScene(Direction seekDirection) override;
  void SeekPercentage(float iPercent) override;
  float GetCachePercentage() const override;
 

xbmc/cores/VideoPlayer/test/edl/TestEdl.cpp

@@ -86,14 +86,14 @@ TEST_F(TestEdl, TestParsingMplayerTimeBasedEDL)
  // We should have a scenemarker at the commbreak start and another on commbreak end
  int time;
  // lets cycle to the next scenemarker if starting from 1 msec before the start (or end) of the commbreak
- EXPECT_EQ(edl.GetNextSceneMarker(EDL::EditDirection::FORWARD, commbreak.start - 1, &time), true);
+ EXPECT_EQ(edl.GetNextSceneMarker(Direction::FORWARD, commbreak.start - 1, &time), true);
  EXPECT_EQ(edl.GetTimeWithoutCuts(time), commbreak.start);
- EXPECT_EQ(edl.GetNextSceneMarker(EDL::EditDirection::FORWARD, commbreak.end - 1, &time), true);
+ EXPECT_EQ(edl.GetNextSceneMarker(Direction::FORWARD, commbreak.end - 1, &time), true);
  EXPECT_EQ(edl.GetTimeWithoutCuts(time), commbreak.end);
  // same if we cycle backwards
- EXPECT_EQ(edl.GetNextSceneMarker(EDL::EditDirection::BACKWARD, commbreak.start + 1, &time), true);
+ EXPECT_EQ(edl.GetNextSceneMarker(Direction::BACKWARD, commbreak.start + 1, &time), true);
  EXPECT_EQ(edl.GetTimeWithoutCuts(time), commbreak.start);
- EXPECT_EQ(edl.GetNextSceneMarker(EDL::EditDirection::BACKWARD, commbreak.end + 1, &time), true);
+ EXPECT_EQ(edl.GetNextSceneMarker(Direction::BACKWARD, commbreak.end + 1, &time), true);
  EXPECT_EQ(edl.GetTimeWithoutCuts(time), commbreak.end);
  // We should be in an edit if we are in the middle of a commbreak...
  // lets check and confirm the edits match (after restoring cuts)