summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-02-09 15:57:31 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-02-09 15:57:31 (GMT)
commitd0976dab0f5eef1473cb11900774aea478d27f02 (patch)
tree9c4b9d055b2c23ec9ee54232fc797afcd42d9ed3
parent6318d52add28f6307026099a53038710057a222e (diff)
Disable Picture-In-Picture and Picture-By-Picture
This was broken by recent threading changes. Unfortunately there is a large chunk of code in the TV class that needs cleaning up before it can be properly fixed, hence I'm disabling for the time being rather than add workarounds. I'll 'rebuild' PiP/PBP once the main playback thread issues have been resolved. (Manually) Cherry picked from 27e125fd73cc02634af4
-rw-r--r--mythtv/libs/libmythtv/videoout_d3d.h2
-rw-r--r--mythtv/libs/libmythtv/videoout_opengl.h2
-rw-r--r--mythtv/libs/libmythtv/videoout_vdpau.h2
-rw-r--r--mythtv/libs/libmythtv/videoout_xv.h6
4 files changed, 5 insertions, 7 deletions
diff --git a/mythtv/libs/libmythtv/videoout_d3d.h b/mythtv/libs/libmythtv/videoout_d3d.h
index 7731c3b..e58961d 100644
--- a/mythtv/libs/libmythtv/videoout_d3d.h
+++ b/mythtv/libs/libmythtv/videoout_d3d.h
@@ -43,7 +43,7 @@ class VideoOutputD3D : public VideoOutput
MythPlayer *pipplayer,
PIPLocation loc);
void RemovePIP(MythPlayer *pipplayer);
- bool IsPIPSupported(void) const { return true; }
+ bool IsPIPSupported(void) const { return false; /*true*/}
virtual MythPainter *GetOSDPainter(void) { return (MythPainter*)m_osd_painter; }
private:
diff --git a/mythtv/libs/libmythtv/videoout_opengl.h b/mythtv/libs/libmythtv/videoout_opengl.h
index e728da7..a67bd0b 100644
--- a/mythtv/libs/libmythtv/videoout_opengl.h
+++ b/mythtv/libs/libmythtv/videoout_opengl.h
@@ -46,7 +46,7 @@ class VideoOutputOpenGL : public VideoOutput
void MoveResizeWindow(QRect new_rect);
virtual void RemovePIP(MythPlayer *pipplayer);
- virtual bool IsPIPSupported(void) const { return true; }
+ virtual bool IsPIPSupported(void) const { return false/*true*/; }
virtual bool hasFullScreenOSD(void) const { return true; }
virtual bool IsSyncLocked(void) const { return true; }
virtual bool ApproveDeintFilter(const QString& filtername) const;
diff --git a/mythtv/libs/libmythtv/videoout_vdpau.h b/mythtv/libs/libmythtv/videoout_vdpau.h
index f6942ed..e46789a 100644
--- a/mythtv/libs/libmythtv/videoout_vdpau.h
+++ b/mythtv/libs/libmythtv/videoout_vdpau.h
@@ -55,7 +55,7 @@ class VideoOutputVDPAU : public VideoOutput
static MythCodecID GetBestSupportedCodec(uint width, uint height,
uint stream_type,
bool no_acceleration);
- virtual bool IsPIPSupported(void) const { return true; }
+ virtual bool IsPIPSupported(void) const { return false;/*true; */}
virtual bool IsPBPSupported(void) const { return false; }
virtual bool NeedExtraAudioDecode(void) const
{ return codec_is_vdpau(video_codec_id); }
diff --git a/mythtv/libs/libmythtv/videoout_xv.h b/mythtv/libs/libmythtv/videoout_xv.h
index 945be25..b5a4447 100644
--- a/mythtv/libs/libmythtv/videoout_xv.h
+++ b/mythtv/libs/libmythtv/videoout_xv.h
@@ -91,10 +91,8 @@ class VideoOutputXv : public VideoOutput
int SetPictureAttribute(PictureAttribute attribute, int newValue);
void InitPictureAttributes(void);
- virtual bool IsPIPSupported(void) const
- { return XVideo == VideoOutputSubType(); }
- virtual bool IsPBPSupported(void) const
- { return XVideo == VideoOutputSubType(); }
+ virtual bool IsPIPSupported(void) const { return false; }
+ virtual bool IsPBPSupported(void) const { return false; }
virtual bool NeedExtraAudioDecode(void) const
{ return XVideoMC <= VideoOutputSubType(); }
virtual bool hasHWAcceleration(void) const