From bb39010021b5fd8a1046200839c678afc76227d5 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sun, 11 Dec 2005 12:00:00 +0100 Subject: 2005-12-11: Version 1.1-cvs_ext-0.3 (vdr-text2skin-1.1-cvs_ext-0.3.diff) - added recording-tokens: RecordingLength, RecordingCuttedLength --- status.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'status.c') diff --git a/status.c b/status.c index 8e376b3..f35f45c 100644 --- a/status.c +++ b/status.c @@ -7,6 +7,7 @@ #include "menu.h" #include #include +#include const std::string ReplayNames[__REPLAY_COUNT__] = { "", "normal", "mp3", "mplayer", "dvd", "vcd", "image" }; @@ -53,11 +54,11 @@ void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name) mReplayIsShuffle = Name[2] == 'S'; } } - else if (const cRecording *rec = GetRecordingByName(Name)) - { - mReplay = rec; - mReplayMode = replayNormal; - } + else if (const cRecording *rec = GetRecordingByFileName(cReplayControl::LastReplayed())) + { + mReplay = rec; + mReplayMode = replayNormal; + } else if (strcmp(Name, "DVD") == 0) mReplayMode = replayDVD; else if (strcmp(Name, "VCD") == 0) @@ -308,7 +309,13 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token) { const tComponent *c = components->Component(i); if (c->stream != 2) index++; // only audio-streams - if (i == index) return (cxType)c->language; + { + std::string buffer(c->language); + if (c->type == 1) buffer.append("MONO"); + if (c->type == 2) buffer.append("DUAL"); + if (c->type == 5) buffer.append("DD"); + return (cxType)buffer.c_str(); + } } } } -- cgit v1.2.3