diff -urp ../mythtv-orig/libs/libmythtv/programinfo.cpp ./libs/libmythtv/programinfo.cpp
old
|
new
|
ProgramInfo::ProgramInfo(void) |
70 | 70 | spread = -1; |
71 | 71 | startCol = -1; |
72 | 72 | isVideo = false; |
| 73 | isDVDImage= false; |
73 | 74 | lenMins = 0; |
74 | 75 | |
75 | 76 | title = ""; |
… |
… |
ProgramInfo &ProgramInfo::clone(const Pr |
167 | 168 | } |
168 | 169 | |
169 | 170 | isVideo = other.isVideo; |
| 171 | isDVDImage = other.isDVDImage; |
170 | 172 | lenMins = other.lenMins; |
171 | 173 | |
172 | 174 | title = QDeepCopy<QString>(other.title); |
diff -urp ../mythtv-orig/libs/libmythtv/programinfo.h ./libs/libmythtv/programinfo.h
old
|
new
|
class MPUBLIC ProgramInfo |
294 | 294 | AvailableStatusType availableStatus; |
295 | 295 | |
296 | 296 | bool isVideo; |
| 297 | bool isDVDImage; |
297 | 298 | int lenMins; |
298 | 299 | |
299 | 300 | QString year; |
diff -urp ../mythtv-orig/libs/libmythtv/tv_play.cpp ./libs/libmythtv/tv_play.cpp
old
|
new
|
void TV::ToggleOSD(bool includeStatusOSD |
4543 | 4543 | return; |
4544 | 4544 | |
4545 | 4545 | // DVD toggles between status and nothing |
4546 | | if (activerbuffer->isDVD()) |
| 4546 | if (activerbuffer->isDVD() && !playbackinfo->isDVDImage) |
4547 | 4547 | { |
4548 | 4548 | if (osd->IsSetDisplaying("status")) |
4549 | 4549 | osd->HideAll(); |
diff -urp ../mythtv-orig/programs/mythfrontend/main.cpp ./programs/mythfrontend/main.cpp
old
|
new
|
int internal_play_media(const QString &m |
559 | 559 | pginfo->pathname = mrl; |
560 | 560 | |
561 | 561 | QDir d(mrl + "/VIDEO_TS"); |
| 562 | |
562 | 563 | if (mrl.findRev(".iso", -1, false) == (int)mrl.length() - 4 || |
563 | | mrl.findRev(".img", -1, false) == (int)mrl.length() - 4 || |
564 | | d.exists()) |
| 564 | mrl.findRev(".img", -1, false) == (int)mrl.length() - 4) |
| 565 | pginfo->isDVDImage = true; |
| 566 | |
| 567 | if(pginfo->isDVDImage || d.exists()) |
565 | 568 | { |
566 | 569 | pginfo->pathname = QString("dvd:%1").arg(mrl); |
567 | 570 | } |