Ticket #1873: dvradiofix.diff

File dvradiofix.diff, 1.8 KB (added by mythdev@…, 14 years ago)

Patch to get DVB radio working again

  • mythtv/libs/libmythtv/dvbrecorder.cpp

     
    10821082
    10831083        _dummy_output_video_pid = _input_pmt->FindUnusedPID(DUMMY_VIDEO_PID);
    10841084        _pid_infos[_dummy_output_video_pid] = info;
     1085        _stream_data->AddWritingPID(_dummy_output_video_pid);
    10851086    }
    10861087    else
    10871088        _dummy_output_video_pid = video_pids[0];
     
    11061107    QString p = gContext->GetThemesParentDir();
    11071108    QString path[] =
    11081109    {
    1109         p + gContext->GetSetting("Theme", "G.A.N.T.") + "/",
     1110       // p + gContext->GetSetting("Theme", "G.A.N.T.") + "/",
    11101111        p + "default/",
    11111112    };
    11121113
     
    11231124        _video_stream_fd = open(path[1] + filename.ascii(), O_RDONLY);
    11241125
    11251126    if (_video_stream_fd < 0)
     1127    {
     1128        VERBOSE(VB_RECORD, LOC + "Open failed on dummy video stream " + filename);
    11261129        return;
     1130    }
    11271131
    11281132    unsigned long frameTime = (unsigned long)(1000 / _frames_per_sec);
    11291133    int64_t last_synch = 0;
  • mythtv/libs/libmythtv/mpeg/mpegtables.cpp

     
    383383        return pid;
    384384
    385385    pid = desired_pid;
    386     while (FindPID(desired_pid) >= 0)
    387         desired_pid += 1;
     386    while (FindPID(pid) >= 0)
     387        pid += 1;
    388388
    389     if (desired_pid <= 0x1fff)
     389    if (pid <= 0x1fff)
    390390        return pid;
    391391
    392392    pid = 0x20;
    393     while (FindPID(desired_pid) >= 0)
    394         desired_pid += 1;
     393    while (FindPID(pid) >= 0)
     394        pid += 1;
    395395
    396     return desired_pid & 0x1fff;
     396    return pid & 0x1fff;
    397397}
    398398
    399399const QString PSIPTable::toString() const