Permalink
Browse files

[players] Mark the render features as deprectated and add an OMX prefix

  • Loading branch information...
1 parent 20e79de commit 128ff9e7afb8c2da139ec608f58a733918fb3e75 @popcornmix popcornmix committed Sep 2, 2014
Showing with 19 additions and 14 deletions.
  1. +4 −4 xbmc/ApplicationPlayer.cpp
  2. +6 −4 xbmc/cores/IPlayer.h
  3. +3 −3 xbmc/cores/dvdplayer/DVDPlayer.cpp
  4. +6 −3 xbmc/cores/dvdplayer/DVDPlayer.h
@@ -621,28 +621,28 @@ void CApplicationPlayer::GetRenderFeatures(std::vector<int> &renderFeatures)
{
boost::shared_ptr<IPlayer> player = GetInternal();
if (player)
- player->GetRenderFeatures(renderFeatures);
+ player->OMXGetRenderFeatures(renderFeatures);
}
void CApplicationPlayer::GetDeinterlaceMethods(std::vector<int> &deinterlaceMethods)
{
boost::shared_ptr<IPlayer> player = GetInternal();
if (player)
- player->GetDeinterlaceMethods(deinterlaceMethods);
+ player->OMXGetDeinterlaceMethods(deinterlaceMethods);
}
void CApplicationPlayer::GetDeinterlaceModes(std::vector<int> &deinterlaceModes)
{
boost::shared_ptr<IPlayer> player = GetInternal();
if (player)
- player->GetDeinterlaceModes(deinterlaceModes);
+ player->OMXGetDeinterlaceModes(deinterlaceModes);
}
void CApplicationPlayer::GetScalingMethods(std::vector<int> &scalingMethods)
{
boost::shared_ptr<IPlayer> player = GetInternal();
if (player)
- player->GetScalingMethods(scalingMethods);
+ player->OMXGetScalingMethods(scalingMethods);
}
void CApplicationPlayer::SetPlaySpeed(int iSpeed, bool bApplicationMuted)
View
@@ -221,22 +221,24 @@ class IPlayer
virtual bool SwitchChannel(const PVR::CPVRChannel &channel) { return false; }
+ // Note: the following "OMX" methods are deprecated and will be removed in the future
+ // They should be handled by the video renderer, not the player
/*!
\brief If the player uses bypass mode, define its rendering capabilities
*/
- virtual void GetRenderFeatures(std::vector<int> &renderFeatures) {};
+ virtual void OMXGetRenderFeatures(std::vector<int> &renderFeatures) {};
/*!
\brief If the player uses bypass mode, define its deinterlace algorithms
*/
- virtual void GetDeinterlaceMethods(std::vector<int> &deinterlaceMethods) {};
+ virtual void OMXGetDeinterlaceMethods(std::vector<int> &deinterlaceMethods) {};
/*!
\brief If the player uses bypass mode, define how deinterlace is set
*/
- virtual void GetDeinterlaceModes(std::vector<int> &deinterlaceModes) {};
+ virtual void OMXGetDeinterlaceModes(std::vector<int> &deinterlaceModes) {};
/*!
\brief If the player uses bypass mode, define its scaling capabilities
*/
- virtual void GetScalingMethods(std::vector<int> &scalingMethods) {};
+ virtual void OMXGetScalingMethods(std::vector<int> &scalingMethods) {};
/*!
\brief define the audio capabilities of the player (default=all)
*/
@@ -4420,7 +4420,7 @@ bool CDVDPlayer::CachePVRStream(void) const
g_advancedSettings.m_bPVRCacheInDvdPlayer;
}
-void CDVDPlayer::GetRenderFeatures(std::vector<int> &renderFeatures)
+void CDVDPlayer::OMXGetRenderFeatures(std::vector<int> &renderFeatures)
{
if (m_omxplayer_mode)
{
@@ -4431,15 +4431,15 @@ void CDVDPlayer::GetRenderFeatures(std::vector<int> &renderFeatures)
}
}
-void CDVDPlayer::GetDeinterlaceMethods(std::vector<int> &deinterlaceMethods)
+void CDVDPlayer::OMXGetDeinterlaceMethods(std::vector<int> &deinterlaceMethods)
{
if (m_omxplayer_mode)
{
deinterlaceMethods.push_back(VS_INTERLACEMETHOD_DEINTERLACE);
}
}
-void CDVDPlayer::GetDeinterlaceModes(std::vector<int> &deinterlaceModes)
+void CDVDPlayer::OMXGetDeinterlaceModes(std::vector<int> &deinterlaceModes)
{
if (m_omxplayer_mode)
{
@@ -288,9 +288,12 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
virtual int OnDVDNavResult(void* pData, int iMessage);
- virtual void GetRenderFeatures(std::vector<int> &renderFeatures);
- virtual void GetDeinterlaceMethods(std::vector<int> &deinterlaceMethods);
- virtual void GetDeinterlaceModes(std::vector<int> &deinterlaceModes);
+ // Note: the following "OMX" methods are deprecated and will be removed in the future
+ // They should be handled by the video renderer, not the player
+ virtual void OMXGetRenderFeatures(std::vector<int> &renderFeatures);
+ virtual void OMXGetDeinterlaceMethods(std::vector<int> &deinterlaceMethods);
+ virtual void OMXGetDeinterlaceModes(std::vector<int> &deinterlaceModes);
+
virtual bool ControlsVolume() {return m_omxplayer_mode;}
protected:

0 comments on commit 128ff9e

Please sign in to comment.