diff -rup mythtv.old/libs/libmythtv/programinfo.h mythtv/libs/libmythtv/programinfo.h
old
|
new
|
enum AvailableStatusType { |
114 | 114 | asPendingDelete, |
115 | 115 | asFileNotFound, |
116 | 116 | asZeroByte, |
117 | | asDeleted |
| 117 | asDeleted, |
| 118 | asNotYetAvailable |
118 | 119 | }; |
119 | 120 | |
120 | 121 | enum WatchListStatus { |
diff -rup mythtv.old/programs/mythfrontend/playbackbox.cpp mythtv/programs/mythfrontend/playbackbox.cpp
old
|
new
|
void PlaybackBox::showActionsSelected() |
2648 | 2648 | bool PlaybackBox::play(ProgramInfo *rec, bool inPlaylist) |
2649 | 2649 | { |
2650 | 2650 | bool playCompleted = false; |
| 2651 | ProgramInfo *tmpItem = NULL; |
2651 | 2652 | |
2652 | 2653 | if (!rec) |
2653 | 2654 | return false; |
… |
… |
bool PlaybackBox::play(ProgramInfo *rec, |
2657 | 2658 | |
2658 | 2659 | rec->pathname = rec->GetPlaybackURL(true); |
2659 | 2660 | |
| 2661 | if (rec->availableStatus == asNotYetAvailable) |
| 2662 | { |
| 2663 | tmpItem = findMatchingProg(rec); |
| 2664 | if (tmpItem) |
| 2665 | tmpItem->availableStatus = asAvailable; |
| 2666 | } |
| 2667 | |
2660 | 2668 | if (fileExists(rec) == false) |
2661 | 2669 | { |
2662 | 2670 | QString msg = |
… |
… |
bool PlaybackBox::play(ProgramInfo *rec, |
2664 | 2672 | .arg(rec->pathname); |
2665 | 2673 | VERBOSE(VB_IMPORTANT, msg); |
2666 | 2674 | |
2667 | | ProgramInfo *tmpItem = findMatchingProg(rec); |
| 2675 | if (!tmpItem) |
| 2676 | tmpItem = findMatchingProg(rec); |
| 2677 | |
2668 | 2678 | if (tmpItem) |
2669 | 2679 | { |
2670 | | tmpItem->availableStatus = asFileNotFound; |
| 2680 | if (tmpItem->recstatus == rsRecording) |
| 2681 | tmpItem->availableStatus = asNotYetAvailable; |
| 2682 | else |
| 2683 | tmpItem->availableStatus = asFileNotFound; |
| 2684 | |
2671 | 2685 | showAvailablePopup(tmpItem); |
2672 | 2686 | } |
2673 | 2687 | |
… |
… |
bool PlaybackBox::play(ProgramInfo *rec, |
2680 | 2694 | QString("PlaybackBox::play(): Error, %1 is zero-bytes in size") |
2681 | 2695 | .arg(rec->pathname)); |
2682 | 2696 | |
2683 | | ProgramInfo *tmpItem = findMatchingProg(rec); |
| 2697 | if (!tmpItem) |
| 2698 | tmpItem = findMatchingProg(rec); |
| 2699 | |
2684 | 2700 | if (tmpItem) |
2685 | 2701 | { |
2686 | | tmpItem->availableStatus = asZeroByte; |
| 2702 | if (tmpItem->recstatus == rsRecording) |
| 2703 | tmpItem->availableStatus = asNotYetAvailable; |
| 2704 | else |
| 2705 | tmpItem->availableStatus = asZeroByte; |
| 2706 | |
2687 | 2707 | showAvailablePopup(tmpItem); |
2688 | 2708 | } |
2689 | 2709 | |
… |
… |
void PlaybackBox::showAvailablePopup(Pro |
2903 | 2923 | QObject::tr("The file for this recording is " |
2904 | 2924 | "empty.")); |
2905 | 2925 | break; |
| 2926 | case asNotYetAvailable: |
| 2927 | MythPopupBox::showOkPopup(gContext->GetMainWindow(), |
| 2928 | QObject::tr("Recording Unavailable"), msg + |
| 2929 | QObject::tr("This recording is not yet " |
| 2930 | "available.")); |
2906 | 2931 | } |
2907 | 2932 | } |
2908 | 2933 | |