Ticket #5680: libs_libmyth-deadcode.patch

File libs_libmyth-deadcode.patch, 2.5 KB (added by Erik Hovland <erik@…>, 17 years ago)

fixes a typo problem and removes some dead code.

  • mythtv/libs/libmyth/mediamonitor-unix.cpp 

    Deals with code that cannot execute.

From: Erik Hovland <erik@hovland.org>


---

 mythtv/libs/libmyth/mediamonitor-unix.cpp |    3 ---
 mythtv/libs/libmyth/xmlparse.cpp          |   24 ++++++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
index 47b5ad6..051a557 100644
    a b bool MediaMonitorUnix::AddDevice(const char* devPath)  
    505505
    506506    endfsent();
    507507
    508     if (mep)
    509         return AddDevice(mep);
    510 
    511508    return false;
    512509}
    513510

  • mythtv/libs/libmyth/xmlparse.cpp 

    diff --git a/mythtv/libs/libmyth/xmlparse.cpp b/mythtv/libs/libmyth/xmlparse.cpp
index f497a81..0d5632e 100644
    a b void XMLParse::parseImageGrid(LayerSet *container, QDomElement &element)  
    991991            }
    992992        }
    993993    }
    994     fontProp *font1 = GetFont(activeFont);
    995     if (!font1)
     994    fontProp *activeFontProp = GetFont(activeFont);
     995    if (!activeFontProp)
    996996    {
    997         cerr << "Unknown font: " << (const char *)activeFont
     997        cerr << "[active font] Unknown font: " << (const char *)activeFont
    998998             << " in image grid: " << (const char *)name << endl;
    999999        return;
    10001000    }
    10011001
    1002     fontProp *font2 = GetFont(selectedFont);
    1003     if (!font2)
     1002    fontProp *selectedFontProp = GetFont(selectedFont);
     1003    if (!selectedFontProp)
    10041004    {
    1005         cerr << "Unknown font: " << (const char *)selectedFont
     1005        cerr << "[selected font] Unknown font: " << (const char *)selectedFont
    10061006             << " in image grid: " << (const char *)name << endl;
    10071007        return;
    10081008    }
    10091009
    1010     fontProp *font3 = GetFont(inactiveFont);
    1011     if (!font2)
     1010    fontProp *inactiveFontProp = GetFont(inactiveFont);
     1011    if (!inactiveFontProp)
    10121012    {
    1013         cerr << "Unknown font: " << (const char *)inactiveFont
     1013        cerr << "inactive font] Unknown font: " << (const char *)inactiveFont
    10141014             << " in image grid: " << (const char *)name << endl;
    10151015        return;
    10161016    }
    10171017
    10181018    UIImageGridType *grid = new UIImageGridType(name, order.toInt());
    10191019    grid->SetScreen(wmult, hmult);
    1020     grid->setActiveFont(font1);
    1021     grid->setSelectedFont(font2);
    1022     grid->setInactiveFont(font3);
     1020    grid->setActiveFont(activeFontProp);
     1021    grid->setSelectedFont(selectedFontProp);
     1022    grid->setInactiveFont(inactiveFontProp);
    10231023    grid->setCutDown(cutdown);
    10241024    grid->setShowChecks(showChecks);
    10251025    grid->setShowSelected(showSelected);