stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/345'

Browse source
This commit is contained in:
Adam Sutton 2014-04-04 15:56:13 +01:00
commit 2080015aa6
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/channels.c
View file

@ -555,7 +555,7 @@ channel_delete ( channel_t *ch, int delconf )
/* DVR */
autorec_destroy_by_channel(ch, delconf);
dvr_destroy_by_channel(ch);
dvr_destroy_by_channel(ch, delconf);
/* Services */
while((csm = LIST_FIRST(&ch->ch_services)) != NULL)

2
src/dvr/dvr.h
View file

@ -304,7 +304,7 @@ void dvr_autorec_done(void);
void dvr_autorec_update(void);
void dvr_destroy_by_channel(channel_t *ch);
void dvr_destroy_by_channel(channel_t *ch, int delconf);
void dvr_rec_subscribe(dvr_entry_t *de);

19
src/dvr/dvr_db.c
View file

@ -913,7 +913,7 @@ void dvr_event_updated ( epg_broadcast_t *e )
*
*/
static void
dvr_stop_recording(dvr_entry_t *de, int stopcode)
dvr_stop_recording(dvr_entry_t *de, int stopcode, int delconf)
{
dvr_config_t *cfg = dvr_config_find_by_name_default(de->de_config_name);
@ -929,7 +929,8 @@ dvr_stop_recording(dvr_entry_t *de, int stopcode)
lang_str_get(de->de_title, NULL), DVR_CH_NAME(de),
dvr_entry_status(de));
dvr_entry_save(de);
if (delconf)
dvr_entry_save(de);
htsp_dvr_entry_update(de);
dvr_entry_notify(de);
@ -944,7 +945,7 @@ dvr_stop_recording(dvr_entry_t *de, int stopcode)
static void
dvr_timer_stop_recording(void *aux)
{
dvr_stop_recording(aux, 0);
dvr_stop_recording(aux, 0, 1);
}
@ -1033,7 +1034,7 @@ dvr_entry_cancel(dvr_entry_t *de)
case DVR_RECORDING:
de->de_dont_reschedule = 1;
dvr_stop_recording(de, SM_CODE_ABORTED);
dvr_stop_recording(de, SM_CODE_ABORTED, 1);
return de;
case DVR_COMPLETED:
@ -1054,17 +1055,17 @@ dvr_entry_cancel(dvr_entry_t *de)
* Unconditionally remove an entry
*/
static void
dvr_entry_purge(dvr_entry_t *de)
dvr_entry_purge(dvr_entry_t *de, int delconf)
{
if(de->de_sched_state == DVR_RECORDING)
dvr_stop_recording(de, SM_CODE_SOURCE_DELETED);
dvr_stop_recording(de, SM_CODE_SOURCE_DELETED, delconf);
}
/**
*
*/
void
dvr_destroy_by_channel(channel_t *ch)
dvr_destroy_by_channel(channel_t *ch, int delconf)
{
dvr_entry_t *de;
@ -1072,7 +1073,7 @@ dvr_destroy_by_channel(channel_t *ch)
LIST_REMOVE(de, de_channel_link);
de->de_channel = NULL;
de->de_channel_name = strdup(channel_get_name(ch));
dvr_entry_purge(de);
dvr_entry_purge(de, delconf);
}
}
@ -1715,7 +1716,7 @@ dvr_entry_cancel_delete(dvr_entry_t *de)
case DVR_RECORDING:
de->de_dont_reschedule = 1;
dvr_stop_recording(de, SM_CODE_ABORTED);
dvr_stop_recording(de, SM_CODE_ABORTED, 1);
case DVR_COMPLETED:
dvr_entry_delete(de);
break;