Ticket #5299: libs_libmythtv-dead-code.patch

libs/libmythtv/avformatdecoder.cpp

@@ -3120 +3120 @@
             {
                 ateof = true;
                 GetNVP()->SetEof();
-                if (pkt)
-                    delete pkt;
+                delete pkt;
                 return false;
             }
 
@@ -3278 +3277 @@
             if (GetNVP()->IsErrored())
             {
                 av_free_packet(pkt);
-                if (pkt)
-                    delete pkt;
+                delete pkt;
                 return false;
             }
         }
@@ -4047 +4045 @@
                              audioIn.do_passthru);
 
     // allow the audio stuff to reencode
-    GetNVP()->SetAudioCodec(using_passthru?codec_ctx:NULL);
+    GetNVP()->SetAudioCodec(NULL);
     GetNVP()->ReinitAudio();
 
     return true;

libs/libmythtv/channel.cpp

@@ -249 +249 @@
             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

libs/libmythtv/decoderbase.cpp

@@ -934 +934 @@
     }
 
     int oldTrack = currentTrack[type];
-    currentTrack[type] = (selTrack < 0) ? -1 : selTrack;
+    currentTrack[type] = selTrack;
     StreamInfo tmp = tracks[type][currentTrack[type]];
     selectedTrack[type] = tmp;
 

libs/libmythtv/dsmcc.cpp

@@ -414 +414 @@
         // 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;
     }

libs/libmythtv/mhi.cpp

@@ -264 +264 @@
     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();

libs/libmythtv/vbitext/vbi.c

@@ -114 +114 @@
 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 +689 @@
 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

libs/libmythtv/videodev_myth.h

@@ -64 +64 @@
 #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 */
 };
 

libs/libmythtv/yuv2rgb.cpp

@@ -376 +376 @@
         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;
 }