Ticket #3829: osd-multiple.2.diff

File osd-multiple.2.diff, 2.9 KB (added by wstewart@…, 15 years ago)

Updated for trunk. Not sure if this will apply to 0.21-fixes.

  • libs/libmythtv/tv_play.cpp 

    diff -aurp -x '*.orig' mythtv-orig/libs/libmythtv/tv_play.cpp mythtv/libs/libmythtv/tv_play.cpp
    old new void TV::ToggleOSD(bool includeStatusOSD 
    52835283    }
    52845284    else if (osd->IsSetDisplaying("status"))
    52855285    {
    5286         if (osd->HasSet("program_info_small"))
     5286        if (playbackinfo->isVideo && osd->HasSet("program_info_small_video"))
     5287            UpdateOSDProgInfo("program_info_small_video");
     5288        else if (playbackinfo->isVideo && osd->HasSet("program_info_video"))
     5289            UpdateOSDProgInfo("program_info_video");
     5290        else if (StateIsPlaying(GetState()) && !playbackinfo->isVideo &&
     5291                 osd->HasSet("program_info_small_recording"))
     5292            UpdateOSDProgInfo("program_info_small_recording");
     5293        else if (StateIsPlaying(GetState()) && !playbackinfo->isVideo &&
     5294                 osd->HasSet("program_info_recording"))
     5295            UpdateOSDProgInfo("program_info_recording");
     5296        else if (osd->HasSet("program_info_small"))
    52875297            UpdateOSDProgInfo("program_info_small");
    52885298        else
    52895299            UpdateOSDProgInfo("program_info");
    … … void TV::ToggleOSD(bool includeStatusOSD 
    52915301    // If small is displaying, show long if we have it, else hide info
    52925302    else if (osd->IsSetDisplaying("program_info_small"))
    52935303    {
    5294         if (osd->HasSet("program_info"))
     5304        if (playbackinfo->isVideo && osd->HasSet("program_info_video"))
     5305            UpdateOSDProgInfo("program_info_video");
     5306        else if (StateIsPlaying(GetState()) && !playbackinfo->isVideo &&
     5307                 osd->HasSet("program_info_recording"))
     5308            UpdateOSDProgInfo("program_info_recording");
     5309        else if (osd->HasSet("program_info"))
    52955310            UpdateOSDProgInfo("program_info");
    52965311        else
    52975312            osd->HideAll();
    … … void TV::ToggleOSD(bool includeStatusOSD 
    53095324    // No status desired? Nothing is up, Display small if we have, else display long
    53105325    else
    53115326    {
    5312         if (osd->HasSet("program_info_small"))
     5327        if (playbackinfo->isVideo && osd->HasSet("program_info_small_video"))
     5328            UpdateOSDProgInfo("program_info_small_video");
     5329        else if (playbackinfo->isVideo && osd->HasSet("program_info_video"))
     5330            UpdateOSDProgInfo("program_info_video");
     5331        else if (StateIsPlaying(GetState()) && !playbackinfo->isVideo &&
     5332                 osd->HasSet("program_info_small_recording"))
     5333            UpdateOSDProgInfo("program_info_small_recording");
     5334        else if (StateIsPlaying(GetState()) && !playbackinfo->isVideo &&
     5335                 osd->HasSet("program_info_recording"))
     5336            UpdateOSDProgInfo("program_info_recording");
     5337        else if (osd->HasSet("program_info_small"))
    53135338            UpdateOSDProgInfo("program_info_small");
    53145339        else
    53155340            UpdateOSDProgInfo("program_info");