Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[gui] remove two not-implemented infolabels for PVR #11249

Merged
merged 1 commit into from Dec 23, 2016
Merged

[gui] remove two not-implemented infolabels for PVR #11249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 0 additions & 12 deletions xbmc/GUIInfoManager.cpp
View file
Open in desktop
Expand Up @@ -4276,16 +4276,6 @@ const infomap playlist[] = {{ "length", PLAYLIST_LENGTH },
/// _string_,
/// Backend number
/// }
/// \table_row3{ <b>`Pvr.HasEpg`</b>,
/// \anchor Pvr_HasEpg
/// _boolean_,
/// Returns true when an epg is available.
/// }
/// \table_row3{ <b>`Pvr.HasTxt`</b>,
/// \anchor Pvr_HasTxt
/// _boolean_,
/// Returns true when teletext is available.
/// }
/// \table_row3{ <b>`Pvr.TotalDiscSpace`</b>,
/// \anchor Pvr_TotalDiscSpace
/// _string_,
Expand Down Expand Up @@ -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 },
Expand Down
28 changes: 13 additions & 15 deletions xbmc/guiinfo/GUIInfoLabels.h
View file
Open in desktop
Expand Up @@ -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
Expand Down