Trivial tweak to debug output.

This commit is contained in:
Adam Sutton 2012-07-11 15:55:45 +01:00
parent 7611d65a25
commit f7a05dac2e
2 changed files with 3 additions and 2 deletions

View file

@ -561,7 +561,6 @@ static epggrab_ota_mux_t *_opentv_event_callback
/* Begin (reset state) */ /* Begin (reset state) */
if (epggrab_ota_begin(ota)) { if (epggrab_ota_begin(ota)) {
tvhlog(LOG_DEBUG, "opentv", "begin processing events");
/* Remove outstanding event data */ /* Remove outstanding event data */
_opentv_status_remove_events(sta); _opentv_status_remove_events(sta);
@ -599,7 +598,6 @@ static epggrab_ota_mux_t *_opentv_event_callback
/* Mark complete */ /* Mark complete */
tvhlog(LOG_DEBUG, "opentv", "finish processing events"); tvhlog(LOG_DEBUG, "opentv", "finish processing events");
epggrab_ota_complete(ota);
return NULL; return NULL;
} }

View file

@ -261,6 +261,7 @@ static void _epggrab_ota_finished ( epggrab_ota_mux_t *ota )
int epggrab_ota_begin ( epggrab_ota_mux_t *ota ) int epggrab_ota_begin ( epggrab_ota_mux_t *ota )
{ {
if (ota->state == EPGGRAB_OTA_MUX_IDLE) { if (ota->state == EPGGRAB_OTA_MUX_IDLE) {
tvhlog(LOG_DEBUG, ota->grab->id, "begin processing");
ota->state = EPGGRAB_OTA_MUX_RUNNING; ota->state = EPGGRAB_OTA_MUX_RUNNING;
time(&ota->started); time(&ota->started);
return 1; return 1;
@ -273,6 +274,7 @@ void epggrab_ota_complete ( epggrab_ota_mux_t *ota )
th_dvb_mux_instance_t *tdmi = ota->tdmi; th_dvb_mux_instance_t *tdmi = ota->tdmi;
if (ota->state != EPGGRAB_OTA_MUX_COMPLETE) { if (ota->state != EPGGRAB_OTA_MUX_COMPLETE) {
tvhlog(LOG_DEBUG, ota->grab->id, "processing complete");
ota->state = EPGGRAB_OTA_MUX_COMPLETE; ota->state = EPGGRAB_OTA_MUX_COMPLETE;
time(&ota->completed); time(&ota->completed);
@ -292,6 +294,7 @@ void epggrab_ota_complete ( epggrab_ota_mux_t *ota )
/* Reset */ /* Reset */
void epggrab_ota_cancel ( epggrab_ota_mux_t *ota ) void epggrab_ota_cancel ( epggrab_ota_mux_t *ota )
{ {
tvhlog(LOG_DEBUG, ota->grab->id, "processing cancelled");
ota->state = EPGGRAB_OTA_MUX_IDLE; ota->state = EPGGRAB_OTA_MUX_IDLE;
_epggrab_ota_finished(ota); _epggrab_ota_finished(ota);
} }