aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xbmc/interfaces/builtins/PlayerBuiltins.cpp6
-rw-r--r--xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp6
-rw-r--r--xbmc/video/ContextMenus.cpp4
-rw-r--r--xbmc/video/dialogs/GUIDialogVideoInfo.cpp7
-rw-r--r--xbmc/video/guilib/CMakeLists.txt3
-rw-r--r--xbmc/video/guilib/VideoAction.h29
-rw-r--r--xbmc/video/guilib/VideoPlayAction.h24
-rw-r--r--xbmc/video/guilib/VideoPlayActionProcessor.cpp24
-rw-r--r--xbmc/video/guilib/VideoPlayActionProcessor.h8
-rw-r--r--xbmc/video/guilib/VideoSelectAction.h29
-rw-r--r--xbmc/video/guilib/VideoSelectActionProcessor.cpp52
-rw-r--r--xbmc/video/guilib/VideoSelectActionProcessor.h10
-rw-r--r--xbmc/video/windows/GUIWindowVideoBase.cpp12
-rw-r--r--xbmc/video/windows/GUIWindowVideoBase.h4
14 files changed, 96 insertions, 122 deletions
diff --git a/xbmc/interfaces/builtins/PlayerBuiltins.cpp b/xbmc/interfaces/builtins/PlayerBuiltins.cpp
index 01ee12c1c5..25e6f9c226 100644
--- a/xbmc/interfaces/builtins/PlayerBuiltins.cpp
+++ b/xbmc/interfaces/builtins/PlayerBuiltins.cpp
@@ -513,13 +513,13 @@ int PlayOrQueueMedia(const std::vector<std::string>& params, bool forcePlay)
if (askToResume)
{
- const VIDEO::GUILIB::SelectAction action =
+ const VIDEO::GUILIB::Action action =
VIDEO::GUILIB::CVideoSelectActionProcessorBase::ChoosePlayOrResume(item);
- if (action == VIDEO::GUILIB::SELECT_ACTION_RESUME)
+ if (action == VIDEO::GUILIB::ACTION_RESUME)
{
item.SetStartOffset(STARTOFFSET_RESUME);
}
- else if (action != VIDEO::GUILIB::SELECT_ACTION_PLAY)
+ else if (action != VIDEO::GUILIB::ACTION_PLAY_FROM_BEGINNING)
{
// The Resume dialog was closed without any choice
return false;
diff --git a/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp b/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp
index 4e834af724..504351698a 100644
--- a/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp
+++ b/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp
@@ -60,13 +60,13 @@ bool CPVRGUIActionsPlayback::CheckResumeRecording(const CFileItem& item) const
{
bool bPlayIt(true);
- const VIDEO::GUILIB::SelectAction action =
+ const VIDEO::GUILIB::Action action =
VIDEO::GUILIB::CVideoSelectActionProcessorBase::ChoosePlayOrResume(item);
- if (action == VIDEO::GUILIB::SELECT_ACTION_RESUME)
+ if (action == VIDEO::GUILIB::ACTION_RESUME)
{
const_cast<CFileItem*>(&item)->SetStartOffset(STARTOFFSET_RESUME);
}
- else if (action == VIDEO::GUILIB::SELECT_ACTION_PLAY)
+ else if (action == VIDEO::GUILIB::ACTION_PLAY_FROM_BEGINNING)
{
const_cast<CFileItem*>(&item)->SetStartOffset(0);
}
diff --git a/xbmc/video/ContextMenus.cpp b/xbmc/video/ContextMenus.cpp
index 4128284579..ef73320587 100644
--- a/xbmc/video/ContextMenus.cpp
+++ b/xbmc/video/ContextMenus.cpp
@@ -315,9 +315,9 @@ void SetPathAndPlay(const std::shared_ptr<CFileItem>& item, const std::string& p
CVideoPlayActionProcessor proc{item, player};
if (resume && (item->GetStartOffset() == STARTOFFSET_RESUME ||
VIDEO_UTILS::GetItemResumeInformation(*item).isResumable))
- proc.Process(VIDEO::GUILIB::PLAY_ACTION_RESUME);
+ proc.Process(VIDEO::GUILIB::ACTION_RESUME);
else
- proc.Process(VIDEO::GUILIB::PLAY_ACTION_PLAY_FROM_BEGINNING);
+ proc.Process(VIDEO::GUILIB::ACTION_PLAY_FROM_BEGINNING);
item->ClearProperty("prohibit_choose_video_version");
}
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
index 08e7a1579f..a76286d711 100644
--- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -67,7 +67,6 @@
using namespace XFILE::VIDEODATABASEDIRECTORY;
using namespace XFILE;
using namespace KODI::MESSAGING;
-using namespace VIDEO::GUILIB;
#define CONTROL_IMAGE 3
#define CONTROL_TEXTAREA 4
@@ -712,7 +711,7 @@ void CGUIDialogVideoInfo::ClearCastList()
namespace
{
-class CVideoPlayActionProcessor : public CVideoPlayActionProcessorBase
+class CVideoPlayActionProcessor : public VIDEO::GUILIB::CVideoPlayActionProcessorBase
{
public:
explicit CVideoPlayActionProcessor(const std::shared_ptr<CFileItem>& item)
@@ -791,7 +790,7 @@ void CGUIDialogVideoInfo::Play(bool resume)
if (resume)
{
CVideoPlayActionProcessor proc{m_movieItem};
- proc.Process(PLAY_ACTION_RESUME);
+ proc.Process(VIDEO::GUILIB::ACTION_RESUME);
}
else
{
@@ -799,7 +798,7 @@ void CGUIDialogVideoInfo::Play(bool resume)
{
// if dialog has a resume button, play button has always the purpose to start from beginning
CVideoPlayActionProcessor proc{m_movieItem};
- proc.Process(PLAY_ACTION_PLAY_FROM_BEGINNING);
+ proc.Process(VIDEO::GUILIB::ACTION_PLAY_FROM_BEGINNING);
}
else
{
diff --git a/xbmc/video/guilib/CMakeLists.txt b/xbmc/video/guilib/CMakeLists.txt
index c5226897c4..a953270624 100644
--- a/xbmc/video/guilib/CMakeLists.txt
+++ b/xbmc/video/guilib/CMakeLists.txt
@@ -2,9 +2,8 @@ set(SOURCES VideoPlayActionProcessor.cpp
VideoSelectActionProcessor.cpp
VideoActionProcessorHelper.cpp)
-set(HEADERS VideoPlayAction.h
+set(HEADERS VideoAction.h
VideoPlayActionProcessor.h
- VideoSelectAction.h
VideoSelectActionProcessor.h
VideoActionProcessorHelper.h)
diff --git a/xbmc/video/guilib/VideoAction.h b/xbmc/video/guilib/VideoAction.h
new file mode 100644
index 0000000000..d2efd86d3c
--- /dev/null
+++ b/xbmc/video/guilib/VideoAction.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 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
+
+namespace VIDEO
+{
+namespace GUILIB
+{
+// Note: Do not change the numerical values of the elements. Some of them are used as values for
+// the integer settings SETTING_MYVIDEOS_SELECTACTION and SETTING_MYVIDEOS_PLAYACTION.
+enum Action
+{
+ ACTION_CHOOSE = 0,
+ ACTION_PLAY_OR_RESUME = 1, // if resume is possible, ask user. play from beginning otherwise
+ ACTION_RESUME = 2, // resume if possibly, play from beginning otherwise
+ ACTION_INFO = 3,
+ ACTION_MORE = 4,
+ ACTION_PLAY_FROM_BEGINNING = 5, // play from beginning, also if resume would be possible
+ ACTION_PLAYPART = 6,
+ ACTION_QUEUE = 7,
+};
+} // namespace GUILIB
+} // namespace VIDEO
diff --git a/xbmc/video/guilib/VideoPlayAction.h b/xbmc/video/guilib/VideoPlayAction.h
deleted file mode 100644
index a566875602..0000000000
--- a/xbmc/video/guilib/VideoPlayAction.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 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
-
-namespace VIDEO
-{
-namespace GUILIB
-{
-// Note: Do not change the numerical values of the elements. Some of them are used as values for
-// the integer setting SETTING_MYVIDEOS_PLAYACTION.
-enum PlayAction
-{
- PLAY_ACTION_PLAY_OR_RESUME = 1, // if resume is possible, ask user. play from beginning otherwise
- PLAY_ACTION_RESUME = 2, // resume if possibly, play from beginning otherwise
- PLAY_ACTION_PLAY_FROM_BEGINNING = 5, // play from beginning, also if resume would be possible
-};
-} // namespace GUILIB
-} // namespace VIDEO
diff --git a/xbmc/video/guilib/VideoPlayActionProcessor.cpp b/xbmc/video/guilib/VideoPlayActionProcessor.cpp
index 7d508dca82..2f59154603 100644
--- a/xbmc/video/guilib/VideoPlayActionProcessor.cpp
+++ b/xbmc/video/guilib/VideoPlayActionProcessor.cpp
@@ -20,9 +20,9 @@
using namespace VIDEO::GUILIB;
-PlayAction CVideoPlayActionProcessorBase::GetDefaultPlayAction()
+Action CVideoPlayActionProcessorBase::GetDefaultPlayAction()
{
- return static_cast<PlayAction>(CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+ return static_cast<Action>(CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
CSettings::SETTING_MYVIDEOS_PLAYACTION));
}
@@ -31,7 +31,7 @@ bool CVideoPlayActionProcessorBase::Process()
return Process(GetDefaultPlayAction());
}
-bool CVideoPlayActionProcessorBase::Process(PlayAction playAction)
+bool CVideoPlayActionProcessorBase::Process(Action playAction)
{
m_userCancelled = false;
@@ -52,9 +52,9 @@ bool CVideoPlayActionProcessorBase::Process(PlayAction playAction)
switch (playAction)
{
- case PLAY_ACTION_PLAY_OR_RESUME:
+ case ACTION_PLAY_OR_RESUME:
{
- const VIDEO::GUILIB::PlayAction action = ChoosePlayOrResume();
+ const Action action = ChoosePlayOrResume();
if (action < 0)
{
m_userCancelled = true;
@@ -64,10 +64,10 @@ bool CVideoPlayActionProcessorBase::Process(PlayAction playAction)
return Process(action);
}
- case PLAY_ACTION_RESUME:
+ case ACTION_RESUME:
return OnResumeSelected();
- case PLAY_ACTION_PLAY_FROM_BEGINNING:
+ case ACTION_PLAY_FROM_BEGINNING:
return OnPlaySelected();
default:
@@ -76,19 +76,19 @@ bool CVideoPlayActionProcessorBase::Process(PlayAction playAction)
return false; // We did not handle the action.
}
-PlayAction CVideoPlayActionProcessorBase::ChoosePlayOrResume()
+Action CVideoPlayActionProcessorBase::ChoosePlayOrResume()
{
- PlayAction action = PLAY_ACTION_PLAY_FROM_BEGINNING;
+ Action action = ACTION_PLAY_FROM_BEGINNING;
const std::string resumeString = VIDEO_UTILS::GetResumeString(*m_item);
if (!resumeString.empty())
{
CContextButtons choices;
- choices.Add(PLAY_ACTION_RESUME, resumeString);
- choices.Add(PLAY_ACTION_PLAY_FROM_BEGINNING, 12021); // Play from beginning
+ choices.Add(ACTION_RESUME, resumeString);
+ choices.Add(ACTION_PLAY_FROM_BEGINNING, 12021); // Play from beginning
- action = static_cast<PlayAction>(CGUIDialogContextMenu::ShowAndGetChoice(choices));
+ action = static_cast<Action>(CGUIDialogContextMenu::ShowAndGetChoice(choices));
}
return action;
diff --git a/xbmc/video/guilib/VideoPlayActionProcessor.h b/xbmc/video/guilib/VideoPlayActionProcessor.h
index 25753bc6d0..a09ffd30e8 100644
--- a/xbmc/video/guilib/VideoPlayActionProcessor.h
+++ b/xbmc/video/guilib/VideoPlayActionProcessor.h
@@ -8,7 +8,7 @@
#pragma once
-#include "video/guilib/VideoPlayAction.h"
+#include "video/guilib/VideoAction.h"
#include <memory>
@@ -29,10 +29,10 @@ public:
}
virtual ~CVideoPlayActionProcessorBase() = default;
- static PlayAction GetDefaultPlayAction();
+ static Action GetDefaultPlayAction();
bool Process();
- bool Process(PlayAction playAction);
+ bool Process(Action playAction);
bool UserCancelled() const { return m_userCancelled; }
@@ -45,7 +45,7 @@ protected:
private:
CVideoPlayActionProcessorBase() = delete;
- PlayAction ChoosePlayOrResume();
+ Action ChoosePlayOrResume();
bool m_versionChecked{false};
const std::shared_ptr<const CFileItem> m_videoVersion;
diff --git a/xbmc/video/guilib/VideoSelectAction.h b/xbmc/video/guilib/VideoSelectAction.h
deleted file mode 100644
index 731e0cf35b..0000000000
--- a/xbmc/video/guilib/VideoSelectAction.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2023 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
-
-namespace VIDEO
-{
-namespace GUILIB
-{
-// Note: Do not change the numerical values of the elements. Some of them are used as values for
-// the integer setting SETTING_MYVIDEOS_SELECTACTION.
-enum SelectAction
-{
- SELECT_ACTION_CHOOSE = 0,
- SELECT_ACTION_PLAY_OR_RESUME = 1,
- SELECT_ACTION_RESUME = 2,
- SELECT_ACTION_INFO = 3,
- SELECT_ACTION_MORE = 4,
- SELECT_ACTION_PLAY = 5,
- SELECT_ACTION_PLAYPART = 6,
- SELECT_ACTION_QUEUE = 7,
-};
-} // namespace GUILIB
-} // namespace VIDEO
diff --git a/xbmc/video/guilib/VideoSelectActionProcessor.cpp b/xbmc/video/guilib/VideoSelectActionProcessor.cpp
index 15fd6e5e4d..3bab184d23 100644
--- a/xbmc/video/guilib/VideoSelectActionProcessor.cpp
+++ b/xbmc/video/guilib/VideoSelectActionProcessor.cpp
@@ -26,9 +26,9 @@
using namespace VIDEO::GUILIB;
-SelectAction CVideoSelectActionProcessorBase::GetDefaultSelectAction()
+Action CVideoSelectActionProcessorBase::GetDefaultSelectAction()
{
- return static_cast<SelectAction>(CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+ return static_cast<Action>(CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
CSettings::SETTING_MYVIDEOS_SELECTACTION));
}
@@ -37,7 +37,7 @@ bool CVideoSelectActionProcessorBase::Process()
return Process(GetDefaultSelectAction());
}
-bool CVideoSelectActionProcessorBase::Process(SelectAction selectAction)
+bool CVideoSelectActionProcessorBase::Process(Action selectAction)
{
CVideoActionProcessorHelper procHelper{m_item, m_videoVersion};
@@ -53,25 +53,25 @@ bool CVideoSelectActionProcessorBase::Process(SelectAction selectAction)
switch (selectAction)
{
- case SELECT_ACTION_CHOOSE:
+ case ACTION_CHOOSE:
{
- const SelectAction action = ChooseVideoItemSelectAction();
+ const Action action = ChooseVideoItemSelectAction();
if (action < 0)
return true; // User cancelled the context menu. We're done.
return Process(action);
}
- case SELECT_ACTION_PLAY_OR_RESUME:
+ case ACTION_PLAY_OR_RESUME:
{
- const SelectAction action = ChoosePlayOrResume(*m_item);
+ const Action action = ChoosePlayOrResume(*m_item);
if (action < 0)
return true; // User cancelled the select menu. We're done.
return Process(action);
}
- case SELECT_ACTION_PLAYPART:
+ case ACTION_PLAYPART:
{
const unsigned int part = ChooseStackItemPartNumber();
if (part < 1) // part numbers are 1-based
@@ -80,19 +80,19 @@ bool CVideoSelectActionProcessorBase::Process(SelectAction selectAction)
return OnPlayPartSelected(part);
}
- case SELECT_ACTION_RESUME:
+ case ACTION_RESUME:
return OnResumeSelected();
- case SELECT_ACTION_PLAY:
+ case ACTION_PLAY_FROM_BEGINNING:
return OnPlaySelected();
- case SELECT_ACTION_QUEUE:
+ case ACTION_QUEUE:
return OnQueueSelected();
- case SELECT_ACTION_INFO:
+ case ACTION_INFO:
return OnInfoSelected();
- case SELECT_ACTION_MORE:
+ case ACTION_MORE:
return OnMoreSelected();
default:
@@ -124,42 +124,42 @@ unsigned int CVideoSelectActionProcessorBase::ChooseStackItemPartNumber() const
return dialog->GetSelectedItem() + 1; // part numbers are 1-based
}
-SelectAction CVideoSelectActionProcessorBase::ChoosePlayOrResume(const CFileItem& item)
+Action CVideoSelectActionProcessorBase::ChoosePlayOrResume(const CFileItem& item)
{
- SelectAction action = SELECT_ACTION_PLAY;
+ Action action = ACTION_PLAY_FROM_BEGINNING;
const std::string resumeString = VIDEO_UTILS::GetResumeString(item);
if (!resumeString.empty())
{
CContextButtons choices;
- choices.Add(SELECT_ACTION_RESUME, resumeString);
- choices.Add(SELECT_ACTION_PLAY, 12021); // Play from beginning
+ choices.Add(ACTION_RESUME, resumeString);
+ choices.Add(ACTION_PLAY_FROM_BEGINNING, 12021); // Play from beginning
- action = static_cast<SelectAction>(CGUIDialogContextMenu::ShowAndGetChoice(choices));
+ action = static_cast<Action>(CGUIDialogContextMenu::ShowAndGetChoice(choices));
}
return action;
}
-SelectAction CVideoSelectActionProcessorBase::ChooseVideoItemSelectAction() const
+Action CVideoSelectActionProcessorBase::ChooseVideoItemSelectAction() const
{
CContextButtons choices;
const std::string resumeString = VIDEO_UTILS::GetResumeString(*m_item);
if (!resumeString.empty())
{
- choices.Add(SELECT_ACTION_RESUME, resumeString);
- choices.Add(SELECT_ACTION_PLAY, 12021); // Play from beginning
+ choices.Add(ACTION_RESUME, resumeString);
+ choices.Add(ACTION_PLAY_FROM_BEGINNING, 12021); // Play from beginning
}
else
{
- choices.Add(SELECT_ACTION_PLAY, 208); // Play
+ choices.Add(ACTION_PLAY_FROM_BEGINNING, 208); // Play
}
- choices.Add(SELECT_ACTION_INFO, 22081); // Show information
- choices.Add(SELECT_ACTION_QUEUE, 13347); // Queue item
- choices.Add(SELECT_ACTION_MORE, 22082); // More
+ choices.Add(ACTION_INFO, 22081); // Show information
+ choices.Add(ACTION_QUEUE, 13347); // Queue item
+ choices.Add(ACTION_MORE, 22082); // More
- return static_cast<SelectAction>(CGUIDialogContextMenu::ShowAndGetChoice(choices));
+ return static_cast<Action>(CGUIDialogContextMenu::ShowAndGetChoice(choices));
}
diff --git a/xbmc/video/guilib/VideoSelectActionProcessor.h b/xbmc/video/guilib/VideoSelectActionProcessor.h
index a154921166..12332addb9 100644
--- a/xbmc/video/guilib/VideoSelectActionProcessor.h
+++ b/xbmc/video/guilib/VideoSelectActionProcessor.h
@@ -8,7 +8,7 @@
#pragma once
-#include "video/guilib/VideoSelectAction.h"
+#include "video/guilib/VideoAction.h"
#include <memory>
@@ -29,12 +29,12 @@ public:
}
virtual ~CVideoSelectActionProcessorBase() = default;
- static SelectAction GetDefaultSelectAction();
+ static Action GetDefaultSelectAction();
bool Process();
- bool Process(SelectAction selectAction);
+ bool Process(Action selectAction);
- static SelectAction ChoosePlayOrResume(const CFileItem& item);
+ static Action ChoosePlayOrResume(const CFileItem& item);
protected:
virtual bool OnPlayPartSelected(unsigned int part) = 0;
@@ -48,7 +48,7 @@ protected:
private:
CVideoSelectActionProcessorBase() = delete;
- SelectAction ChooseVideoItemSelectAction() const;
+ Action ChooseVideoItemSelectAction() const;
unsigned int ChooseStackItemPartNumber() const;
bool m_versionChecked{false};
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index 7e7ee38705..6ad778a048 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -607,7 +607,7 @@ private:
};
} // namespace
-bool CGUIWindowVideoBase::OnFileAction(int iItem, SelectAction action, const std::string& player)
+bool CGUIWindowVideoBase::OnFileAction(int iItem, Action action, const std::string& player)
{
const std::shared_ptr<CFileItem> item = m_vecItems->Get(iItem);
if (!item)
@@ -754,13 +754,13 @@ protected:
bool OnResumeSelected() override
{
m_item->SetStartOffset(STARTOFFSET_RESUME);
- return m_window.OnFileAction(m_itemIndex, SELECT_ACTION_RESUME, m_player);
+ return m_window.OnFileAction(m_itemIndex, VIDEO::GUILIB::ACTION_RESUME, m_player);
}
bool OnPlaySelected() override
{
m_item->SetStartOffset(0);
- return m_window.OnFileAction(m_itemIndex, SELECT_ACTION_PLAY, m_player);
+ return m_window.OnFileAction(m_itemIndex, VIDEO::GUILIB::ACTION_PLAY_FROM_BEGINNING, m_player);
}
private:
@@ -851,13 +851,13 @@ bool CGUIWindowVideoBase::OnPlayStackPart(int itemIndex, unsigned int partNumber
CDirectory::GetDirectory(path, parts, "", DIR_FLAG_DEFAULTS);
const int value = CVideoSelectActionProcessor::ChoosePlayOrResume(*parts[partNumber - 1]);
- if (value == SELECT_ACTION_RESUME)
+ if (value == VIDEO::GUILIB::ACTION_RESUME)
{
const VIDEO_UTILS::ResumeInformation resumeInfo =
VIDEO_UTILS::GetItemResumeInformation(*parts[partNumber - 1]);
item->SetStartOffset(resumeInfo.startOffset);
}
- else if (value != SELECT_ACTION_PLAY)
+ else if (value != VIDEO::GUILIB::ACTION_PLAY_FROM_BEGINNING)
return false; // if not selected PLAY, then we changed our mind so return
item->m_lStartPartNumber = partNumber;
@@ -894,7 +894,7 @@ bool CGUIWindowVideoBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
}
case CONTEXT_BUTTON_PLAY_PART:
{
- return OnFileAction(itemNumber, SELECT_ACTION_PLAYPART, "");
+ return OnFileAction(itemNumber, VIDEO::GUILIB::ACTION_PLAYPART, "");
}
case CONTEXT_BUTTON_PLAY_PARTYMODE:
diff --git a/xbmc/video/windows/GUIWindowVideoBase.h b/xbmc/video/windows/GUIWindowVideoBase.h
index 9916980d4a..1542ac4dce 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.h
+++ b/xbmc/video/windows/GUIWindowVideoBase.h
@@ -11,7 +11,7 @@
#include "playlists/PlayListTypes.h"
#include "video/VideoDatabase.h"
#include "video/VideoThumbLoader.h"
-#include "video/guilib/VideoSelectAction.h"
+#include "video/guilib/VideoAction.h"
#include "windows/GUIMediaWindow.h"
namespace
@@ -95,7 +95,7 @@ protected:
\param action the action to perform
\return true if the action is performed, false otherwise
*/
- bool OnFileAction(int item, VIDEO::GUILIB::SelectAction action, const std::string& player);
+ bool OnFileAction(int item, VIDEO::GUILIB::Action action, const std::string& player);
void OnRestartItem(int iItem, const std::string &player = "");
bool OnPlayOrResumeItem(int iItem, const std::string& player = "");
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-21 21:10:39 +0000