Ticket #1873: dvradiofix.diff
File dvradiofix.diff, 1.8 KB (added by , 18 years ago) |
---|
-
mythtv/libs/libmythtv/dvbrecorder.cpp
1082 1082 1083 1083 _dummy_output_video_pid = _input_pmt->FindUnusedPID(DUMMY_VIDEO_PID); 1084 1084 _pid_infos[_dummy_output_video_pid] = info; 1085 _stream_data->AddWritingPID(_dummy_output_video_pid); 1085 1086 } 1086 1087 else 1087 1088 _dummy_output_video_pid = video_pids[0]; … … 1106 1107 QString p = gContext->GetThemesParentDir(); 1107 1108 QString path[] = 1108 1109 { 1109 p + gContext->GetSetting("Theme", "G.A.N.T.") + "/",1110 // p + gContext->GetSetting("Theme", "G.A.N.T.") + "/", 1110 1111 p + "default/", 1111 1112 }; 1112 1113 … … 1123 1124 _video_stream_fd = open(path[1] + filename.ascii(), O_RDONLY); 1124 1125 1125 1126 if (_video_stream_fd < 0) 1127 { 1128 VERBOSE(VB_RECORD, LOC + "Open failed on dummy video stream " + filename); 1126 1129 return; 1130 } 1127 1131 1128 1132 unsigned long frameTime = (unsigned long)(1000 / _frames_per_sec); 1129 1133 int64_t last_synch = 0; -
mythtv/libs/libmythtv/mpeg/mpegtables.cpp
383 383 return pid; 384 384 385 385 pid = desired_pid; 386 while (FindPID( desired_pid) >= 0)387 desired_pid += 1;386 while (FindPID(pid) >= 0) 387 pid += 1; 388 388 389 if ( desired_pid <= 0x1fff)389 if (pid <= 0x1fff) 390 390 return pid; 391 391 392 392 pid = 0x20; 393 while (FindPID( desired_pid) >= 0)394 desired_pid += 1;393 while (FindPID(pid) >= 0) 394 pid += 1; 395 395 396 return desired_pid & 0x1fff;396 return pid & 0x1fff; 397 397 } 398 398 399 399 const QString PSIPTable::toString() const