Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
DVR: remove unused dvr_sl_ variables and dvr_dup_detect_episode
  • Loading branch information
perexg committed May 21, 2015
1 parent 48f219c commit f5d0a52
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 30 deletions.
11 changes: 0 additions & 11 deletions src/dvr/dvr.h
Expand Up @@ -67,17 +67,6 @@ typedef struct dvr_config {
int dvr_subtitle_in_title;
int dvr_windows_compatible_filenames;

/* Series link support */
int dvr_sl_brand_lock;
int dvr_sl_season_lock;
int dvr_sl_channel_lock;
int dvr_sl_time_lock;
int dvr_sl_more_recent;
int dvr_sl_quality_lock;

/* Duplicate detect */
int dvr_dup_detect_episode;

struct dvr_entry_list dvr_entries;
struct dvr_autorec_entry_list dvr_autorec_entries;
struct dvr_timerec_entry_list dvr_timerec_entries;
Expand Down
15 changes: 7 additions & 8 deletions src/dvr/dvr_autorec.c
Expand Up @@ -121,14 +121,13 @@ autorec_cmp(dvr_autorec_entry_t *dae, epg_broadcast_t *e)
// Note: ignore channel test if we allow quality unlocking
if ((cfg = dae->dae_config) == NULL)
return 0;
if (cfg->dvr_sl_quality_lock)
if(dae->dae_channel != NULL) {
if (dae->dae_channel != e->channel &&
dae->dae_channel->ch_enabled)
return 0;
if (!dae->dae_channel->ch_enabled)
return 0;
}
if(dae->dae_channel != NULL) {
if (dae->dae_channel != e->channel &&
dae->dae_channel->ch_enabled)
return 0;
if (!dae->dae_channel->ch_enabled)
return 0;
}

if(dae->dae_channel_tag != NULL) {
LIST_FOREACH(ctm, &dae->dae_channel_tag->ct_ctms, ctm_tag_link)
Expand Down
11 changes: 0 additions & 11 deletions src/dvr/dvr_config.c
Expand Up @@ -180,20 +180,9 @@ dvr_config_create(const char *name, const char *uuid, htsmsg_t *conf)
cfg->dvr_update_window = 24 * 3600;
cfg->dvr_pathname = strdup("$t$n.$x");

/* series link support */
cfg->dvr_sl_brand_lock = 1; // use brand linking
cfg->dvr_sl_season_lock = 0; // ignore season (except if no brand)
cfg->dvr_sl_channel_lock = 1; // channel locked
cfg->dvr_sl_time_lock = 0; // time slot (approx) locked
cfg->dvr_sl_more_recent = 1; // Only record more reason episodes
cfg->dvr_sl_quality_lock = 1; // Don't attempt to ajust quality

/* Muxer config */
cfg->dvr_muxcnf.m_cache = MC_CACHE_DONTKEEP;

/* dup detect */
cfg->dvr_dup_detect_episode = 1; // detect dup episodes

/* Default recording file and directory permissions */

cfg->dvr_muxcnf.m_file_permissions = 0664;
Expand Down

0 comments on commit f5d0a52

Please sign in to comment.