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.
MythTV · Feb 9, 2011 · 27e125f · 27e125f
1 parent 90b7223
commit 27e125f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,