summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-02-09 11:15:01 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-02-09 11:15:01 (GMT)
commit27e125fd73cc02634af4ff035a51a718454132eb (patch)
tree0181fb4d95cc239455076dbb4e7e08a328825573
parent90b7223d233d9502fb01e6aec22f8d5fde513fca (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.
-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.h4
4 files changed, 5 insertions, 5 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 45999a6..3e45a64 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 225a0d1..14fd44c 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 8d79f23..f611ee4 100644
--- a/mythtv/libs/libmythtv/videoout_xv.h
+++ b/mythtv/libs/libmythtv/videoout_xv.h
@@ -70,9 +70,9 @@ class VideoOutputXv : public VideoOutput
void InitPictureAttributes(void);
virtual bool IsPIPSupported(void) const
- { return XVideo == VideoOutputSubType(); }
+ { return false; /*XVideo == VideoOutputSubType(); */}
virtual bool IsPBPSupported(void) const
- { return XVideo == VideoOutputSubType(); }
+ { return false; /*return XVideo == VideoOutputSubType(); */}
virtual bool NeedExtraAudioDecode(void) const { return false; }
virtual QRect GetPIPRect(PIPLocation location,