diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 0c2a5a00c832e..fb78744fe0581 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -4276,16 +4276,6 @@ const infomap playlist[] = {{ "length", PLAYLIST_LENGTH }, /// _string_, /// Backend number /// } -/// \table_row3{ `Pvr.HasEpg`, -/// \anchor Pvr_HasEpg -/// _boolean_, -/// Returns true when an epg is available. -/// } -/// \table_row3{ `Pvr.HasTxt`, -/// \anchor Pvr_HasTxt -/// _boolean_, -/// Returns true when teletext is available. -/// } /// \table_row3{ `Pvr.TotalDiscSpace`, /// \anchor Pvr_TotalDiscSpace /// _string_, @@ -4558,8 +4548,6 @@ const infomap pvr[] = {{ "isrecording", PVR_IS_RECORDING { "backendrecordings", PVR_BACKEND_RECORDINGS }, { "backenddeletedrecordings", PVR_BACKEND_DELETED_RECORDINGS }, { "backendnumber", PVR_BACKEND_NUMBER }, - { "hasepg", PVR_HAS_EPG }, - { "hastxt", PVR_HAS_TXT }, { "totaldiscspace", PVR_TOTAL_DISKSPACE }, { "nexttimer", PVR_NEXT_TIMER }, { "isplayingtv", PVR_IS_PLAYING_TV }, diff --git a/xbmc/guiinfo/GUIInfoLabels.h b/xbmc/guiinfo/GUIInfoLabels.h index 8bcb799f46d3a..59567aa9f2723 100644 --- a/xbmc/guiinfo/GUIInfoLabels.h +++ b/xbmc/guiinfo/GUIInfoLabels.h @@ -445,21 +445,19 @@ #define PVR_IS_RECORDING (PVR_CONDITIONS_START) #define PVR_HAS_TIMER (PVR_CONDITIONS_START + 1) #define PVR_HAS_NONRECORDING_TIMER (PVR_CONDITIONS_START + 2) -#define PVR_HAS_EPG (PVR_CONDITIONS_START + 3) -#define PVR_HAS_TXT (PVR_CONDITIONS_START + 4) -#define PVR_IS_PLAYING_TV (PVR_CONDITIONS_START + 5) -#define PVR_IS_PLAYING_RADIO (PVR_CONDITIONS_START + 6) -#define PVR_IS_PLAYING_RECORDING (PVR_CONDITIONS_START + 7) -#define PVR_ACTUAL_STREAM_ENCRYPTED (PVR_CONDITIONS_START + 8) -#define PVR_HAS_TV_CHANNELS (PVR_CONDITIONS_START + 9) -#define PVR_HAS_RADIO_CHANNELS (PVR_CONDITIONS_START + 10) -#define PVR_IS_TIMESHIFTING (PVR_CONDITIONS_START + 11) -#define PVR_IS_RECORDING_TV (PVR_CONDITIONS_START + 12) -#define PVR_HAS_TV_TIMER (PVR_CONDITIONS_START + 13) -#define PVR_HAS_NONRECORDING_TV_TIMER (PVR_CONDITIONS_START + 14) -#define PVR_IS_RECORDING_RADIO (PVR_CONDITIONS_START + 15) -#define PVR_HAS_RADIO_TIMER (PVR_CONDITIONS_START + 16) -#define PVR_HAS_NONRECORDING_RADIO_TIMER (PVR_CONDITIONS_START + 17) +#define PVR_IS_PLAYING_TV (PVR_CONDITIONS_START + 3) +#define PVR_IS_PLAYING_RADIO (PVR_CONDITIONS_START + 4) +#define PVR_IS_PLAYING_RECORDING (PVR_CONDITIONS_START + 5) +#define PVR_ACTUAL_STREAM_ENCRYPTED (PVR_CONDITIONS_START + 6) +#define PVR_HAS_TV_CHANNELS (PVR_CONDITIONS_START + 7) +#define PVR_HAS_RADIO_CHANNELS (PVR_CONDITIONS_START + 8) +#define PVR_IS_TIMESHIFTING (PVR_CONDITIONS_START + 9) +#define PVR_IS_RECORDING_TV (PVR_CONDITIONS_START + 10) +#define PVR_HAS_TV_TIMER (PVR_CONDITIONS_START + 11) +#define PVR_HAS_NONRECORDING_TV_TIMER (PVR_CONDITIONS_START + 12) +#define PVR_IS_RECORDING_RADIO (PVR_CONDITIONS_START + 13) +#define PVR_HAS_RADIO_TIMER (PVR_CONDITIONS_START + 14) +#define PVR_HAS_NONRECORDING_RADIO_TIMER (PVR_CONDITIONS_START + 15) #define PVR_CONDITIONS_END PVR_HAS_NONRECORDING_RADIO_TIMER #define PVR_STRINGS_START 1200