Remove code that cannot be executed. From: Erik Hovland --- libs/libmythtv/avformatdecoder.cpp | 8 +++----- libs/libmythtv/channel.cpp | 8 +++----- libs/libmythtv/decoderbase.cpp | 2 +- libs/libmythtv/dsmcc.cpp | 2 +- libs/libmythtv/mhi.cpp | 7 ++----- libs/libmythtv/vbitext/vbi.c | 22 ++-------------------- libs/libmythtv/videodev_myth.h | 4 +++- libs/libmythtv/yuv2rgb.cpp | 4 ++-- 8 files changed, 17 insertions(+), 40 deletions(-) diff --git a/libs/libmythtv/avformatdecoder.cpp b/libs/libmythtv/avformatdecoder.cpp index e7b4735..860cb8a 100644 --- a/libs/libmythtv/avformatdecoder.cpp +++ b/libs/libmythtv/avformatdecoder.cpp @@ -3120,8 +3120,7 @@ bool AvFormatDecoder::GetFrame(int onlyvideo) { ateof = true; GetNVP()->SetEof(); - if (pkt) - delete pkt; + delete pkt; return false; } @@ -3278,8 +3277,7 @@ bool AvFormatDecoder::GetFrame(int onlyvideo) if (GetNVP()->IsErrored()) { av_free_packet(pkt); - if (pkt) - delete pkt; + delete pkt; return false; } } @@ -4047,7 +4045,7 @@ bool AvFormatDecoder::SetupAudioStream(void) audioIn.do_passthru); // allow the audio stuff to reencode - GetNVP()->SetAudioCodec(using_passthru?codec_ctx:NULL); + GetNVP()->SetAudioCodec(NULL); GetNVP()->ReinitAudio(); return true; diff --git a/libs/libmythtv/channel.cpp b/libs/libmythtv/channel.cpp index 3bae71d..13725b5 100644 --- a/libs/libmythtv/channel.cpp +++ b/libs/libmythtv/channel.cpp @@ -249,13 +249,11 @@ static QString mode_to_format(int mode, int v4l_version) return "PAL"; else if (mode == VIDEO_MODE_SECAM) return "SECAM"; - else if (mode == 3) + else if (mode == VIDEO_MODE_PALNC) return "PAL-NC"; - else if (mode == 4) - return "PAL-M"; - else if (mode == 5) + else if (mode == VIDEO_MODE_PALN) return "PAL-N"; - else if (mode == 6) + else if (mode == VIDEO_MODE_NTSCJP) return "NTSC-JP"; } else diff --git a/libs/libmythtv/decoderbase.cpp b/libs/libmythtv/decoderbase.cpp index 9b3c78f..c067013 100644 --- a/libs/libmythtv/decoderbase.cpp +++ b/libs/libmythtv/decoderbase.cpp @@ -934,7 +934,7 @@ int DecoderBase::AutoSelectTrack(uint type) } int oldTrack = currentTrack[type]; - currentTrack[type] = (selTrack < 0) ? -1 : selTrack; + currentTrack[type] = selTrack; StreamInfo tmp = tracks[type][currentTrack[type]]; selectedTrack[type] = tmp; diff --git a/libs/libmythtv/dsmcc.cpp b/libs/libmythtv/dsmcc.cpp index 4386f31..fdad68c 100644 --- a/libs/libmythtv/dsmcc.cpp +++ b/libs/libmythtv/dsmcc.cpp @@ -414,7 +414,7 @@ void Dsmcc::ProcessSection(const unsigned char *data, int length, // We haven't seen this stream before but it has the correct // data_broadcast_id. Create a carousel for it. // This will only happen at start-up - car = AddTap(componentTag, carouselId); + AddTap(componentTag, carouselId); m_startTag = componentTag; found = true; } diff --git a/libs/libmythtv/mhi.cpp b/libs/libmythtv/mhi.cpp index dbd1657..c1c6da6 100644 --- a/libs/libmythtv/mhi.cpp +++ b/libs/libmythtv/mhi.cpp @@ -264,11 +264,8 @@ void MHIContext::SetNetBootInfo(const unsigned char *data, uint length) QMutexLocker locker(&m_dsmccLock); // Save the data from the descriptor. m_nbiData.duplicate(data, length); - // If there is no Network Boot Info or we're setting it - // for the first time just update the "last version". - if (length < 2) - m_lastNbiVersion = NBI_VERSION_ABSENT; - else if (m_lastNbiVersion == NBI_VERSION_UNSET) + // If we're setting it for the first time just update the "last version". + if (m_lastNbiVersion == NBI_VERSION_UNSET) m_lastNbiVersion = data[0]; else m_engine_wait.wakeAll(); diff --git a/libs/libmythtv/vbitext/vbi.c b/libs/libmythtv/vbitext/vbi.c index f7e31f4..0c67b5f 100644 --- a/libs/libmythtv/vbitext/vbi.c +++ b/libs/libmythtv/vbitext/vbi.c @@ -114,17 +114,13 @@ vbi_send(struct vbi *vbi, int type, int i1, int i2, int i3, void *p1) static void vbi_send_page(struct vbi *vbi, struct raw_page *rvtp, int page) { - struct vt_page *cvtp = 0; - if (rvtp->page->flags & PG_ACTIVE) { if (rvtp->page->pgno % 256 != page) { rvtp->page->flags &= ~PG_ACTIVE; enhance(rvtp->enh, rvtp->page); -// if (vbi->cache) -// cvtp = vbi->cache->op->put(vbi->cache, rvtp->page); - vbi_send(vbi, EV_PAGE, 0, 0, 0, cvtp ?: rvtp->page); + vbi_send(vbi, EV_PAGE, 0, 0, 0, rvtp->page); } } } @@ -693,21 +689,7 @@ vbi_close(struct vbi *vbi) struct vt_page * vbi_query_page(struct vbi *vbi, int pgno, int subno) { - struct vt_page *vtp = 0; - - (void)pgno; - (void)subno; - -// if (vbi->cache) -// vtp = vbi->cache->op->get(vbi->cache, pgno, subno); - if (vtp == 0) - { - // EV_PAGE will come later... - return 0; - } - - vbi_send(vbi, EV_PAGE, 1, 0, 0, vtp); - return vtp; + return 0; } void diff --git a/libs/libmythtv/videodev_myth.h b/libs/libmythtv/videodev_myth.h index 95ede70..438bde0 100644 --- a/libs/libmythtv/videodev_myth.h +++ b/libs/libmythtv/videodev_myth.h @@ -64,8 +64,10 @@ struct video_tuner #define VIDEO_MODE_PAL 0 #define VIDEO_MODE_NTSC 1 #define VIDEO_MODE_SECAM 2 -#define VIDEO_MODE_AUTO 3 +#define VIDEO_MODE_PALNC 3 #define VIDEO_MODE_ATSC 4 /* dtv */ +#define VIDEO_MODE_PALN 5 +#define VIDEO_MODE_NTSCJP 6 __u16 signal; /* Signal strength 16bit scale */ }; diff --git a/libs/libmythtv/yuv2rgb.cpp b/libs/libmythtv/yuv2rgb.cpp index 94eda86..9674eb5 100644 --- a/libs/libmythtv/yuv2rgb.cpp +++ b/libs/libmythtv/yuv2rgb.cpp @@ -376,10 +376,10 @@ yuv2rgb_fun yuv2rgb_init_mmx (int bpp, int mode) return mmx_rgb16; else if ((bpp == 32) && (mode == MODE_RGB)) return mmx_argb32; -#endif - +#else if ((bpp == 32) && (mode == MODE_RGB)) return yuv420_argb32_non_mmx; +#endif return NULL; }