diff -Naurp -x '*.orig' mythtv-orig/libs/libmythtv/osd.cpp mythtv/libs/libmythtv/osd.cpp
old
|
new
|
void OSD::SetText(const QString &name, |
1711 | 1711 | cs->Load(" ", wmult, hmult, 30, 30); |
1712 | 1712 | } |
1713 | 1713 | |
| 1714 | OSDTypeImage *cs1 = (OSDTypeImage *)container->GetType("coverart"); |
| 1715 | if (cs1) |
| 1716 | { |
| 1717 | if ((infoMap.contains("coverartpath")) && (infoMap["coverartpath"] != "")) |
| 1718 | cs1->Load(infoMap["coverartpath"], wmult, hmult, 30, 30); |
| 1719 | } |
| 1720 | |
1714 | 1721 | m_setsvisible = true; |
1715 | 1722 | changed = true; |
1716 | 1723 | } |
… |
… |
void OSD::SetInfoText(QMap<QString, QStr |
1734 | 1741 | cs->Load(" ", wmult, hmult, 30, 30); |
1735 | 1742 | } |
1736 | 1743 | |
| 1744 | OSDTypeImage *cs1 = (OSDTypeImage *)container->GetType("coverart"); |
| 1745 | if (cs1) |
| 1746 | { |
| 1747 | if ((infoMap.contains("coverartpath")) && (infoMap["coverartpath"] != "")) |
| 1748 | cs1->Load(infoMap["coverartpath"], wmult, hmult, 30, 30); |
| 1749 | } |
| 1750 | |
1737 | 1751 | container->DisplayFor(length * 1000000); |
1738 | 1752 | m_setsvisible = true; |
1739 | 1753 | changed = true; |
diff -Naurp -x '*.orig' mythtv-orig/libs/libmythtv/programinfo.cpp mythtv/libs/libmythtv/programinfo.cpp
old
|
new
|
void ProgramInfo::ToMap(QMap<QString, QS |
530 | 530 | QDateTime timeNow = QDateTime::currentDateTime(); |
531 | 531 | |
532 | 532 | int hours, minutes, seconds; |
| 533 | bool isDVDImage = false; |
533 | 534 | |
534 | 535 | progMap["title"] = title; |
535 | 536 | progMap["subtitle"] = subtitle; |
… |
… |
void ProgramInfo::ToMap(QMap<QString, QS |
592 | 593 | progMap["channel"] = ChannelText(channelFormat); |
593 | 594 | progMap["longchannel"] = ChannelText(longChannelFormat); |
594 | 595 | progMap["iconpath"] = ""; |
| 596 | progMap["coverartpath"] = ""; |
595 | 597 | |
596 | 598 | QString tmpSize; |
597 | 599 | |
… |
… |
void ProgramInfo::ToMap(QMap<QString, QS |
683 | 685 | query.prepare("SELECT icon FROM channel WHERE chanid = :CHANID ;"); |
684 | 686 | query.bindValue(":CHANID", chanid); |
685 | 687 | |
686 | | if (query.exec() && query.next()) |
687 | | progMap["iconpath"] = query.value(0).toString(); |
| 688 | if (!isVideo) |
| 689 | { |
| 690 | if (query.exec() && query.next()) |
| 691 | progMap["iconpath"] = query.value(0).toString(); |
| 692 | } |
| 693 | else |
| 694 | { |
| 695 | if (pathname.endsWith(".iso", Qt::CaseInsensitive) || |
| 696 | pathname.endsWith(".img", Qt::CaseInsensitive)) |
| 697 | isDVDImage = true; |
| 698 | |
| 699 | if (pathname.startsWith("dvd:") && !isDVDImage) |
| 700 | { |
| 701 | progMap["coverartpath"] = ""; |
| 702 | } |
| 703 | else |
| 704 | { |
| 705 | QString fn; |
| 706 | |
| 707 | if (isDVDImage) |
| 708 | fn = pathname.right(pathname.length() - 4); |
| 709 | else |
| 710 | fn = pathname; |
| 711 | |
| 712 | query.prepare("SELECT coverfile FROM videometadata WHERE filename = :FILENAME ;"); |
| 713 | query.bindValue(":FILENAME", fn); |
| 714 | |
| 715 | if (query.exec() && query.next()) |
| 716 | progMap["coverartpath"] = query.value(0).toString(); |
| 717 | } |
| 718 | } |
688 | 719 | |
689 | 720 | progMap["recstatus"] = RecStatusText(); |
690 | 721 | |