Ticket #3477: videoosd.patch

File videoosd.patch, 2.3 KB (added by maverik044, 18 years ago)

  • libs/libmythtv/programinfo.cpp 

    diff -urp ../mythtv-orig/libs/libmythtv/programinfo.cpp ./libs/libmythtv/programinfo.cpp
    old new ProgramInfo::ProgramInfo(void)  
    7070    spread = -1;
    7171    startCol = -1;
    7272    isVideo = false;
     73    isDVDImage= false;
    7374    lenMins = 0;
    7475
    7576    title = "";
    … … ProgramInfo &ProgramInfo::clone(const Pr  
    167168    }
    168169   
    169170    isVideo = other.isVideo;
     171    isDVDImage = other.isDVDImage;
    170172    lenMins = other.lenMins;
    171173   
    172174    title = QDeepCopy<QString>(other.title);

  • libs/libmythtv/programinfo.h 

    diff -urp ../mythtv-orig/libs/libmythtv/programinfo.h ./libs/libmythtv/programinfo.h
    old new class MPUBLIC ProgramInfo  
    294294    AvailableStatusType availableStatus;
    295295   
    296296    bool isVideo;
     297    bool isDVDImage;
    297298    int lenMins;
    298299   
    299300    QString year;

  • libs/libmythtv/tv_play.cpp 

    diff -urp ../mythtv-orig/libs/libmythtv/tv_play.cpp ./libs/libmythtv/tv_play.cpp
    old new void TV::ToggleOSD(bool includeStatusOSD  
    45434543        return;
    45444544       
    45454545    // DVD toggles between status and nothing
    4546     if (activerbuffer->isDVD())
     4546    if (activerbuffer->isDVD() && !playbackinfo->isDVDImage)
    45474547    {
    45484548        if (osd->IsSetDisplaying("status"))
    45494549            osd->HideAll();

  • programs/mythfrontend/main.cpp 

    diff -urp ../mythtv-orig/programs/mythfrontend/main.cpp ./programs/mythfrontend/main.cpp
    old new int internal_play_media(const QString &m  
    559559    pginfo->pathname = mrl;
    560560   
    561561    QDir d(mrl + "/VIDEO_TS");
     562   
    562563    if (mrl.findRev(".iso", -1, false) == (int)mrl.length() - 4 ||
    563         mrl.findRev(".img", -1, false) == (int)mrl.length() - 4 ||
    564         d.exists())
     564        mrl.findRev(".img", -1, false) == (int)mrl.length() - 4)
     565        pginfo->isDVDImage = true;
     566       
     567    if(pginfo->isDVDImage || d.exists())
    565568    {
    566569        pginfo->pathname = QString("dvd:%1").arg(mrl);
    567570    }