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

Fix incorrect use of de_title.

Browse source
This commit is contained in:
Adam Sutton 2012-08-24 10:26:45 +01:00
parent efb0fb9246
commit 68d9530448
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dvr/dvr_db.c
View file

@ -755,7 +755,7 @@ dvr_stop_recording(dvr_entry_t *de, int stopcode)
tvhlog(LOG_INFO, "dvr", "\"%s\" on \"%s\": "
"End of program: %s",
de->de_title, de->de_channel->ch_name,
lang_str_get(de->de_title, NULL), de->de_channel->ch_name,
streaming_code2txt(de->de_last_error) ?: "Program ended");
dvr_entry_save(de);
@ -791,7 +791,7 @@ dvr_timer_start_recording(void *aux)
de->de_rec_state = DVR_RS_PENDING;
tvhlog(LOG_INFO, "dvr", "\"%s\" on \"%s\" recorder starting",
de->de_title, de->de_channel->ch_name);
lang_str_get(de->de_title, NULL), de->de_channel->ch_name);
dvr_entry_notify(de);
htsp_dvr_entry_update(de);

12
src/webui/simpleui.c
View file

@ -173,7 +173,7 @@ page_simple(http_connection_t *hc,
htsbuf_qprintf(hq,
"%02d:%02d-%02d:%02d  %s",
a.tm_hour, a.tm_min, b.tm_hour, b.tm_min, de->de_title);
a.tm_hour, a.tm_min, b.tm_hour, b.tm_min, lang_str_get(de->de_title, NULL));
htsbuf_qprintf(hq, "</a>");
@ -267,9 +267,9 @@ page_einfo(http_connection_t *hc, const char *remain, void *opaque)
htsbuf_qprintf(hq, "</form>");
if (e->episode) {
if ( e->episode->description )
htsbuf_qprintf(hq, "%s", e->episode->description);
htsbuf_qprintf(hq, "%s", lang_str_get(e->episode->description, NULL));
else if ( e->episode->summary )
htsbuf_qprintf(hq, "%s", e->episode->summary);
htsbuf_qprintf(hq, "%s", lang_str_get(e->episode->summary, NULL));
}
@ -322,7 +322,7 @@ page_pvrinfo(http_connection_t *hc, const char *remain, void *opaque)
a.tm_hour, a.tm_min, b.tm_hour, b.tm_min);
htsbuf_qprintf(hq, "<hr><b>\"%s\": \"%s\"</b><br><br>",
de->de_channel->ch_name, de->de_title);
de->de_channel->ch_name, lang_str_get(de->de_title, NULL));
if((rstatus = val2str(de->de_sched_state, recstatustxt)) != NULL)
htsbuf_qprintf(hq, "Recording status: %s<br>", rstatus);
@ -348,7 +348,7 @@ page_pvrinfo(http_connection_t *hc, const char *remain, void *opaque)
}
htsbuf_qprintf(hq, "</form>");
htsbuf_qprintf(hq, "%s", de->de_desc);
htsbuf_qprintf(hq, "%s", lang_str_get(de->de_desc, NULL));
pthread_mutex_unlock(&global_lock);
@ -426,7 +426,7 @@ page_status(http_connection_t *hc,
b.tm_hour, b.tm_min,
de->de_stop,
de->de_stop_extra,
de->de_title);
lang_str_get(de->de_title, NULL));
rstatus = val2str(de->de_sched_state, recstatustxt);
htsbuf_qprintf(hq, "<status>%s</status></recording>\n", rstatus);

4
src/webui/webui.c
View file

@ -377,7 +377,7 @@ http_dvr_list_playlist(http_connection_t *hc)
durration += (de->de_stop_extra + de->de_start_extra)*60;
bandwidth = ((8*fsize) / (durration*1024.0));
htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, de->de_title);
htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, lang_str_get(de->de_title, NULL));
htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRId64"\n", durration);
htsbuf_qprintf(hq, "#EXT-X-STREAM-INF:PROGRAM-ID=%d,BANDWIDTH=%d\n", de->de_id, bandwidth);
@ -415,7 +415,7 @@ http_dvr_playlist(http_connection_t *hc, dvr_entry_t *de)
bandwidth = ((8*fsize) / (durration*1024.0));
htsbuf_qprintf(hq, "#EXTM3U\n");
htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, de->de_title);
htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, lang_str_get(de->de_title, NULL));
htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRId64"\n", durration);
htsbuf_qprintf(hq, "#EXT-X-STREAM-INF:PROGRAM-ID=%d,BANDWIDTH=%d\n", de->de_id, bandwidth);