Ticket #1544: bookmark_fix1.diff

File bookmark_fix1.diff, 1.6 KB (added by skamithi, 17 years ago)

watching da vinci code, it saved the current subtitle even though it should have been set to -1. this should ensure it saves the correct subtitle setting.

  • avformatdecoder.cpp

     
    16101610            int trackNo = ringBuffer->DVD()->GetTrack(kTrackTypeSubtitle);
    16111611            uint captionmode = GetNVP()->GetCaptionMode();
    16121612            int trackcount = (int)GetTrackCount(kTrackTypeSubtitle);
    1613             if (captionmode == kDisplayAVSubtitle &&
    1614                 (trackNo < 0 || trackNo >= trackcount))
     1613            if (trackNo < 0 || trackNo >= trackcount)
    16151614            {
    16161615                GetNVP()->SetCaptionsEnabled(false, false);
    16171616            }

  • DVDRingBuffer.cpp

     
    9991030    if (type == kTrackTypeSubtitle)
    10001031    {
    10011032        curSubtitleTrack = trackNo;
    1002         autoselectsubtitle = false;
     1033        if (trackNo < 0)
     1034            autoselectsubtitle = true;
     1035        else
     1036            autoselectsubtitle = false;
    10031037    }
    10041038    else if (type == kTrackTypeAudio)
    10051039    {

  • NuppelVideoPlayer.cpp

     
    66256625    {
    66266626        audiotrack = GetTrack(kTrackTypeAudio);
    66276627        if (GetCaptionMode() == kDisplayAVSubtitle)
    6628             subtitletrack = GetTrack(kTrackTypeSubtitle);
     6628            subtitletrack = ringBuffer->DVD()->GetTrack(kTrackTypeSubtitle);
    66296629        ringBuffer->DVD()->GetPartAndTitle(part, title);
    66306630    }
    66316631    else