[players] Fix for SetPriority calls being ignored

popcornmix · May 24, 2015 · f5353c6 · f5353c6
1 parent 00dba75
commit f5353c6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
@@ -103,6 +103,7 @@ class CDVDPlayerAudio : public CThread, public IDVDStreamPlayerAudio
   CDVDPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent);
   virtual ~CDVDPlayerAudio();
 
+  bool SetPriority(const int iPriority) { return CThread::SetPriority(iPriority); }
   bool OpenStream(CDVDStreamInfo &hints);
   void CloseStream(bool bWaitForBuffers);
 

diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h
@@ -63,6 +63,7 @@ class CDVDPlayerVideo : public CThread, public IDVDStreamPlayerVideo
                  , CDVDMessageQueue& parent);
   virtual ~CDVDPlayerVideo();
 
+  bool SetPriority(const int iPriority) { return CThread::SetPriority(iPriority); }
   bool OpenStream(CDVDStreamInfo &hint);
   void CloseStream(bool bWaitForBuffers);
 

diff --git a/xbmc/cores/dvdplayer/IDVDPlayer.h b/xbmc/cores/dvdplayer/IDVDPlayer.h
@@ -55,7 +55,7 @@ class IDVDStreamPlayerVideo : public IDVDStreamPlayer
 public:
   ~IDVDStreamPlayerVideo() {}
   float GetRelativeUsage() { return 0.0f; }
-  bool SetPriority(const int iPriority) { return true; }
+  virtual bool SetPriority(const int iPriority) = 0;
   virtual bool OpenStream(CDVDStreamInfo &hint) = 0;
   virtual void CloseStream(bool bWaitForBuffers) = 0;
   virtual bool StepFrame() = 0;
@@ -96,7 +96,7 @@ class IDVDStreamPlayerAudio : public IDVDStreamPlayer
 public:
   ~IDVDStreamPlayerAudio() {}
   float GetRelativeUsage() { return 0.0f; }
-  bool SetPriority(const int iPriority) { return true; }
+  virtual bool SetPriority(const int iPriority) = 0;
   virtual bool OpenStream(CDVDStreamInfo &hints) = 0;
   virtual void CloseStream(bool bWaitForBuffers) = 0;
   virtual void SetSpeed(int speed) = 0;

diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h
@@ -75,6 +75,7 @@ class OMXPlayerAudio : public CThread, public IDVDStreamPlayerAudio
 public:
   OMXPlayerAudio(OMXClock *av_clock, CDVDMessageQueue& parent);
   ~OMXPlayerAudio();
+  bool SetPriority(const int iPriority) { return CThread::SetPriority(iPriority); }
   bool OpenStream(CDVDStreamInfo &hints);
   void SendMessage(CDVDMsg* pMsg, int priority = 0) { m_messageQueue.Put(pMsg, priority); }
   void FlushMessages()                              { m_messageQueue.Flush(); }

diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h
@@ -87,6 +87,7 @@ class OMXPlayerVideo : public CThread, public IDVDStreamPlayerVideo
 public:
   OMXPlayerVideo(OMXClock *av_clock, CDVDOverlayContainer* pOverlayContainer, CDVDMessageQueue& parent);
   ~OMXPlayerVideo();
+  bool SetPriority(const int iPriority) { return CThread::SetPriority(iPriority); }
   bool OpenStream(CDVDStreamInfo &hints);
   void SendMessage(CDVDMsg* pMsg, int priority = 0) { m_messageQueue.Put(pMsg, priority); }
   void FlushMessages()                              { m_messageQueue.Flush(); }