Ticket #5761: music-buf-r20533.patch

File music-buf-r20533.patch, 2.0 KB (added by anonymous, 15 years ago)

Updated patch to take into account files that have since been removed from trunk. Untested.

  • mythplugins/mythmusic/mythmusic/aacdecoder.cpp

     
    136136            ulong sz = output_bytes < bks ? output_bytes : bks;
    137137
    138138            int samples = (sz * 8) / (channels * 16);
    139             if (output()->AddSamples(output_buf, samples, -1))
     139            bool ok = (output()->GetAudioBufferedTime() <= 500);
     140            if (ok) ok = output()->AddSamples(output_buf, samples, -1);
     141            if (ok)
    140142              {
    141143                output_bytes -= sz;
    142144                memmove(output_buf, output_buf + sz, output_bytes);

  • mythplugins/mythmusic/mythmusic/avfdecoder.cpp

     
    103103            ulong sz = output_bytes < bks ? output_bytes : bks;
    104104
    105105            int samples = (sz*8)/(m_channels*16);
    106             if (output()->AddSamples(output_buf, samples, -1))
     106            if (ok) ok = output()->AddSamples(output_buf, samples, -1);
     107            if (ok)
    107108            {
    108109                output_bytes -= sz;
    109110                memmove(output_buf, output_buf + sz, output_bytes);

  • mythplugins/mythmusic/mythmusic/cddecoder.cpp

     
    7070            ulong sz = output_bytes < bks ? output_bytes : bks;
    7171
    7272            int samples = (sz*8)/(chan*16);
    73             if (output()->AddSamples(output_buf, samples, -1))
     73            bool ok = (output()->GetAudioBufferedTime() <= 500);
     74            if (ok) ok = output()->AddSamples(output_buf, samples, -1);
     75            if (ok)
    7476            {
    7577                output_bytes -= sz;
    7678                memmove(output_buf, output_buf + sz, output_bytes);