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.

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

pvr.dvblink (master) version 4.1.1 #75

Merged
merged 1 commit into from Mar 6, 2017
Merged

pvr.dvblink (master) version 4.1.1 #75

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
2 changes: 1 addition & 1 deletion pvr.dvblink/addon.xml.in
View file
Open in desktop
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.dvblink"
version="4.1.0"
version="4.1.1"
name="DVBLink PVR Client"
provider-name="DVBLogic">
<requires>
Expand Down
3 changes: 3 additions & 0 deletions pvr.dvblink/changelog.txt
View file
Open in desktop
@@ -1,3 +1,6 @@
[B]Version 4.1.1[/B]
Fixed: Timer Rules incorrectly detected for manual/keyword based timers ( #68 )

[B]Version 4.1.0[/B]
Fixed: Crash when switching channels with timeshift enabled ( #69 )
Fixed: Hangup after period of inactivity ( #64 )
Expand Down
76 changes: 14 additions & 62 deletions src/DVBLinkClient.cpp
View file
Open in desktop
Expand Up @@ -391,21 +391,12 @@ PVR_ERROR DVBLinkClient::GetTimerTypes(PVR_TIMER_TYPE types[], int *size)
| PVR_TIMER_TYPE_SUPPORTS_CHANNELS | PVR_TIMER_TYPE_SUPPORTS_START_TIME | PVR_TIMER_TYPE_SUPPORTS_END_TIME
| PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN;

static const unsigned int TIMER_CREATED_MANUAL_ATTRIBS = PVR_TIMER_TYPE_IS_MANUAL
| PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN
| PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES;

static const unsigned int TIMER_EPG_ATTRIBS = PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE
| PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN;

static const unsigned int TIMER_REPEATING_MANUAL_ATTRIBS = PVR_TIMER_TYPE_IS_REPEATING
| PVR_TIMER_TYPE_SUPPORTS_WEEKDAYS | PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS;

static const unsigned int TIMER_CREATED_REPEATING_MANUAL_ATTRIBS = PVR_TIMER_TYPE_IS_MANUAL
| PVR_TIMER_TYPE_IS_REPEATING
| PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN | PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS
| PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES;

static const unsigned int TIMER_REPEATING_EPG_ATTRIBS = PVR_TIMER_TYPE_IS_REPEATING
| PVR_TIMER_TYPE_SUPPORTS_START_ANYTIME | PVR_TIMER_TYPE_SUPPORTS_RECORD_ONLY_NEW_EPISODES
| PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS;
Expand All @@ -414,9 +405,6 @@ PVR_ERROR DVBLinkClient::GetTimerTypes(PVR_TIMER_TYPE types[], int *size)
| PVR_TIMER_TYPE_SUPPORTS_CHANNELS | PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN | PVR_TIMER_TYPE_IS_REPEATING
| PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS;

static const unsigned int TIMER_CREATED_REPEATING_KEYWORD_ATTRIBS = PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN
| PVR_TIMER_TYPE_IS_REPEATING | PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES | PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS;

static const unsigned int TIMER_MANUAL_CHILD_ATTRIBUTES = PVR_TIMER_TYPE_IS_MANUAL
| PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES;

Expand All @@ -441,18 +429,6 @@ PVR_ERROR DVBLinkClient::GetTimerTypes(PVR_TIMER_TYPE types[], int *size)
/* Values definitions for attributes. */
recordingLimitValues, default_rec_limit_, showTypeValues, default_rec_show_type_)));

timerTypes.push_back(
/* One-shot manual (time and channel based) - already created, disable editing of some attributes*/
std::unique_ptr<TimerType>(new TimerType(
/* Type id. */
TIMER_CREATED_ONCE_MANUAL,
/* Attributes. */
TIMER_CREATED_MANUAL_ATTRIBS,
/* Description. */
XBMC->GetLocalizedString(32037),
/* Values definitions for attributes. */
recordingLimitValues, default_rec_limit_, showTypeValues, default_rec_show_type_)));

timerTypes.push_back(
/* One-shot epg based */
std::unique_ptr<TimerType>(new TimerType(
Expand Down Expand Up @@ -513,18 +489,6 @@ PVR_ERROR DVBLinkClient::GetTimerTypes(PVR_TIMER_TYPE types[], int *size)
/* Values definitions for attributes. */
recordingLimitValues, default_rec_limit_, showTypeValues, default_rec_show_type_)));

timerTypes.push_back(
/* Repeating manual (time and channel based) Parent - already created, so disable editing of some attributes*/
std::unique_ptr<TimerType>(new TimerType(
/* Type id. */
TIMER_CREATED_REPEATING_MANUAL,
/* Attributes. */
TIMER_CREATED_REPEATING_MANUAL_ATTRIBS,
/* Description. */
XBMC->GetLocalizedString(32042),
/* Values definitions for attributes. */
recordingLimitValues, default_rec_limit_, showTypeValues, default_rec_show_type_)));

timerTypes.push_back(
/* Repeating epg based Parent*/
std::unique_ptr<TimerType>(new TimerType(
Expand All @@ -548,18 +512,6 @@ PVR_ERROR DVBLinkClient::GetTimerTypes(PVR_TIMER_TYPE types[], int *size)
XBMC->GetLocalizedString(32044),
/* Values definitions for attributes. */
recordingLimitValues, default_rec_limit_, showTypeValues, default_rec_show_type_)));

timerTypes.push_back(
/* Repeating Keyword (Generic) based - already created, disable editing of some elements*/
std::unique_ptr<TimerType>(new TimerType(
/* Type id. */
TIMER_CREATED_REPEATING_KEYWORD,
/* Attributes. */
TIMER_CREATED_REPEATING_KEYWORD_ATTRIBS,
/* Description. */
XBMC->GetLocalizedString(32044),
/* Values definitions for attributes. */
recordingLimitValues, default_rec_limit_, showTypeValues, default_rec_show_type_)));
}

/* Copy data to target array. */
Expand Down Expand Up @@ -664,13 +616,13 @@ int DVBLinkClient::GetSchedules(ADDON_HANDLE handle, const RecordingList& record
StoredManualScheduleList& manual_schedules = response.GetManualSchedules();
for (size_t i = 0; i < manual_schedules.size(); i++)
{
schedule_map_[manual_schedules[i]->GetID()] = schedule_desc(-1, TIMER_CREATED_ONCE_MANUAL,
schedule_map_[manual_schedules[i]->GetID()] = schedule_desc(-1, TIMER_ONCE_MANUAL,
manual_schedules[i]->MarginBefore, manual_schedules[i]->MarginAfter);

if (manual_schedules[i]->GetDayMask() != 0)
{
unsigned int kodi_idx = get_kodi_timer_idx_from_dvblink(manual_schedules[i]->GetID());
schedule_map_[manual_schedules[i]->GetID()] = schedule_desc(kodi_idx, TIMER_CREATED_REPEATING_MANUAL,
schedule_map_[manual_schedules[i]->GetID()] = schedule_desc(kodi_idx, TIMER_REPEATING_MANUAL,
manual_schedules[i]->MarginBefore, manual_schedules[i]->MarginAfter);

PVR_TIMER timer;
Expand All @@ -682,7 +634,7 @@ int DVBLinkClient::GetSchedules(ADDON_HANDLE handle, const RecordingList& record
timer.iClientIndex = kodi_idx;
timer.iClientChannelUid = GetInternalUniqueIdFromChannelId(manual_schedules[i]->GetChannelID());
timer.state = PVR_TIMER_STATE_SCHEDULED;
timer.iTimerType = TIMER_CREATED_REPEATING_MANUAL;
timer.iTimerType = TIMER_REPEATING_MANUAL;
timer.iMarginStart = manual_schedules[i]->MarginBefore / 60;
timer.iMarginEnd = manual_schedules[i]->MarginAfter / 60;
timer.iMaxRecordings = manual_schedules[i]->RecordingsToKeep;
Expand Down Expand Up @@ -752,7 +704,7 @@ int DVBLinkClient::GetSchedules(ADDON_HANDLE handle, const RecordingList& record
for (size_t i = 0; i < bp_schedules.size(); i++)
{
unsigned int kodi_idx = get_kodi_timer_idx_from_dvblink(bp_schedules[i]->GetID());
schedule_map_[bp_schedules[i]->GetID()] = schedule_desc(kodi_idx, TIMER_CREATED_REPEATING_KEYWORD,
schedule_map_[bp_schedules[i]->GetID()] = schedule_desc(kodi_idx, TIMER_REPEATING_KEYWORD,
bp_schedules[i]->MarginBefore, bp_schedules[i]->MarginAfter);

PVR_TIMER timer;
Expand All @@ -767,7 +719,7 @@ int DVBLinkClient::GetSchedules(ADDON_HANDLE handle, const RecordingList& record
timer.iClientChannelUid = PVR_TIMER_ANY_CHANNEL;

timer.state = PVR_TIMER_STATE_SCHEDULED;
timer.iTimerType = TIMER_CREATED_REPEATING_KEYWORD;
timer.iTimerType = TIMER_REPEATING_KEYWORD;
timer.iMarginStart = bp_schedules[i]->MarginBefore / 60;
timer.iMarginEnd = bp_schedules[i]->MarginAfter / 60;
strncpy(timer.strEpgSearchString, bp_schedules[i]->GetKeyphrase().c_str(), sizeof(timer.strEpgSearchString) - 1);
Expand Down Expand Up @@ -838,20 +790,20 @@ PVR_ERROR DVBLinkClient::GetTimers(ADDON_HANDLE handle)
int schedule_type = schedule_map_[rec->GetScheduleID()].schedule_kodi_type;
switch (schedule_type)
{
case TIMER_CREATED_ONCE_MANUAL:
case TIMER_ONCE_MANUAL:
case TIMER_ONCE_EPG:
//for once timers - copy parent attribute (there was no separate schedule submitted to kodi)
xbmcTimer.iTimerType = schedule_type;
break;
case TIMER_CREATED_REPEATING_MANUAL:
case TIMER_REPEATING_MANUAL:
xbmcTimer.iTimerType = TIMER_ONCE_MANUAL_CHILD;
xbmcTimer.iParentClientIndex = get_kodi_timer_idx_from_dvblink(rec->GetScheduleID());
break;
case TIMER_REPEATING_EPG:
xbmcTimer.iTimerType = TIMER_ONCE_EPG_CHILD;
xbmcTimer.iParentClientIndex = get_kodi_timer_idx_from_dvblink(rec->GetScheduleID());
break;
case TIMER_CREATED_REPEATING_KEYWORD:
case TIMER_REPEATING_KEYWORD:
xbmcTimer.iTimerType = TIMER_ONCE_KEYWORD_CHILD;
xbmcTimer.iParentClientIndex = get_kodi_timer_idx_from_dvblink(rec->GetScheduleID());
break;
Expand Down Expand Up @@ -1067,7 +1019,7 @@ PVR_ERROR DVBLinkClient::DeleteTimer(const PVR_TIMER &timer)

switch (timer.iTimerType)
{
case TIMER_CREATED_ONCE_MANUAL:
case TIMER_ONCE_MANUAL:
case TIMER_ONCE_EPG:
case TIMER_ONCE_MANUAL_CHILD:
case TIMER_ONCE_EPG_CHILD:
Expand All @@ -1084,9 +1036,9 @@ PVR_ERROR DVBLinkClient::DeleteTimer(const PVR_TIMER &timer)
status = srv_connection.get_connection()->RemoveRecording(removeRecording, &error);
}
break;
case TIMER_CREATED_REPEATING_MANUAL:
case TIMER_REPEATING_MANUAL:
case TIMER_REPEATING_EPG:
case TIMER_CREATED_REPEATING_KEYWORD:
case TIMER_REPEATING_KEYWORD:
{
//this is a schedule

Expand Down Expand Up @@ -1119,7 +1071,7 @@ PVR_ERROR DVBLinkClient::UpdateTimer(const PVR_TIMER &timer)
std::string schedule_id;
switch (timer.iTimerType)
{
case TIMER_CREATED_ONCE_MANUAL:
case TIMER_ONCE_MANUAL:
case TIMER_ONCE_EPG:
{
//this is a timer
Expand All @@ -1129,9 +1081,9 @@ PVR_ERROR DVBLinkClient::UpdateTimer(const PVR_TIMER &timer)
parse_timer_hash(timer.strDirectory, timer_id, schedule_id);
}
break;
case TIMER_CREATED_REPEATING_MANUAL:
case TIMER_REPEATING_MANUAL:
case TIMER_REPEATING_EPG:
case TIMER_CREATED_REPEATING_KEYWORD:
case TIMER_REPEATING_KEYWORD:
{
//this is a schedule

Expand Down
3 changes: 0 additions & 3 deletions src/DVBLinkClient.h
View file
Open in desktop
Expand Up @@ -55,9 +55,6 @@ typedef std::map<std::string, std::string> recording_id_to_url_map_t;
#define TIMER_REPEATING_MANUAL (PVR_TIMER_TYPE_NONE + 6)
#define TIMER_REPEATING_EPG (PVR_TIMER_TYPE_NONE + 7)
#define TIMER_REPEATING_KEYWORD (PVR_TIMER_TYPE_NONE + 8)
#define TIMER_CREATED_ONCE_MANUAL (PVR_TIMER_TYPE_NONE + 9)
#define TIMER_CREATED_REPEATING_MANUAL (PVR_TIMER_TYPE_NONE + 10)
#define TIMER_CREATED_REPEATING_KEYWORD (PVR_TIMER_TYPE_NONE + 11)

enum dvblink_client_rec_num_e
{
Expand Down