From 68d953044872c300be5e47e465ac8f498b856069 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Fri, 24 Aug 2012 10:26:45 +0100 Subject: [PATCH] Fix incorrect use of de_title. --- src/dvr/dvr_db.c | 4 ++-- src/webui/simpleui.c | 12 ++++++------ src/webui/webui.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index e5160357..43b35f35 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -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); diff --git a/src/webui/simpleui.c b/src/webui/simpleui.c index 1a74fb14..5fc86e39 100644 --- a/src/webui/simpleui.c +++ b/src/webui/simpleui.c @@ -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, ""); @@ -267,9 +267,9 @@ page_einfo(http_connection_t *hc, const char *remain, void *opaque) htsbuf_qprintf(hq, ""); 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, "
\"%s\": \"%s\"

", - 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
", rstatus); @@ -348,7 +348,7 @@ page_pvrinfo(http_connection_t *hc, const char *remain, void *opaque) } htsbuf_qprintf(hq, ""); - 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, "%s\n", rstatus); diff --git a/src/webui/webui.c b/src/webui/webui.c index baa73db1..77bea8c4 100644 --- a/src/webui/webui.c +++ b/src/webui/webui.c @@ -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);