1 | Index: libs/libmythtv/NuppelVideoPlayer.h |
---|
2 | =================================================================== |
---|
3 | --- libs/libmythtv/NuppelVideoPlayer.h (revision 9372) |
---|
4 | +++ libs/libmythtv/NuppelVideoPlayer.h (working copy) |
---|
5 | @@ -147,7 +147,7 @@ |
---|
6 | void NextScanType(void) |
---|
7 | { SetScanType((FrameScanType)(((int)m_scan + 1) & 0x3)); } |
---|
8 | void SetScanType(FrameScanType); |
---|
9 | - FrameScanType GetScanType(void) const { return m_scan; } |
---|
10 | + FrameScanType GetScanType(void) const { return m_scan_locked ? m_scan : kScan_Detect; } |
---|
11 | |
---|
12 | void SetOSDFontName(const QString osdfonts[22], const QString &prefix); |
---|
13 | void SetOSDThemeName(const QString themename); |
---|
14 | Index: libs/libmythtv/videoout_null.cpp |
---|
15 | =================================================================== |
---|
16 | --- libs/libmythtv/videoout_null.cpp (revision 9372) |
---|
17 | +++ libs/libmythtv/videoout_null.cpp (working copy) |
---|
18 | @@ -109,6 +109,15 @@ |
---|
19 | return true; |
---|
20 | } |
---|
21 | |
---|
22 | +bool VideoOutputNull::SetupDeinterlace(bool interlaced, |
---|
23 | + const QString& overridefilter) |
---|
24 | +{ |
---|
25 | + (void)overridefilter; |
---|
26 | + |
---|
27 | + // null vidout doesn't deinterlace |
---|
28 | + return !interlaced; |
---|
29 | +} |
---|
30 | + |
---|
31 | void VideoOutputNull::Exit(void) |
---|
32 | { |
---|
33 | if (XJ_started) |
---|
34 | Index: libs/libmythtv/videooutbase.cpp |
---|
35 | =================================================================== |
---|
36 | --- libs/libmythtv/videooutbase.cpp (revision 9372) |
---|
37 | +++ libs/libmythtv/videooutbase.cpp (working copy) |
---|
38 | @@ -297,13 +297,6 @@ |
---|
39 | bool VideoOutput::SetupDeinterlace(bool interlaced, |
---|
40 | const QString& overridefilter) |
---|
41 | { |
---|
42 | - if (VideoOutputNull *null = dynamic_cast<VideoOutputNull *>(this)) |
---|
43 | - { |
---|
44 | - (void)null; |
---|
45 | - // null vidout doesn't deinterlace |
---|
46 | - return !interlaced; |
---|
47 | - } |
---|
48 | - |
---|
49 | if (m_deinterlacing == interlaced) |
---|
50 | return m_deinterlacing; |
---|
51 | |
---|
52 | Index: libs/libmythtv/videoout_null.h |
---|
53 | =================================================================== |
---|
54 | --- libs/libmythtv/videoout_null.h (revision 9372) |
---|
55 | +++ libs/libmythtv/videoout_null.h (working copy) |
---|
56 | @@ -11,6 +11,7 @@ |
---|
57 | |
---|
58 | bool Init(int width, int height, float aspect, WId winid, |
---|
59 | int winx, int winy, int winw, int winh, WId embedid = 0); |
---|
60 | + bool SetupDeinterlace(bool i, const QString& ovrf=""); |
---|
61 | void PrepareFrame(VideoFrame *buffer, FrameScanType); |
---|
62 | void Show(FrameScanType ); |
---|
63 | |
---|