diff options
author | lordjaxom <lordjaxom> | 2004-12-14 20:05:40 +0000 |
---|---|---|
committer | lordjaxom <lordjaxom> | 2004-12-14 20:05:40 +0000 |
commit | b8f29c674cc0ccca207123342c1344bbd0f13796 (patch) | |
tree | 2af468bf7acc6df510241c1090d7e6538b6b3cf1 /common.c | |
parent | 3b0999969632e2820b846ca8adcef6b346ff7441 (diff) | |
download | vdr-plugin-text2skin-b8f29c674cc0ccca207123342c1344bbd0f13796.tar.gz vdr-plugin-text2skin-b8f29c674cc0ccca207123342c1344bbd0f13796.tar.bz2 |
1.0-pre4v1.0-pre4
Diffstat (limited to 'common.c')
-rw-r--r-- | common.c | 30 |
1 files changed, 24 insertions, 6 deletions
@@ -1,12 +1,14 @@ /* - * $Id: common.c,v 1.2 2004/12/06 22:35:54 lordjaxom Exp $ + * $Id: common.c,v 1.4 2004/12/14 20:02:31 lordjaxom Exp $ */ #include "common.h" #include <vdr/plugin.h> -std::string SkinPath(void) { - return cPlugin::ConfigDirectory(PLUGIN_NAME_I18N); +const std::string &SkinPath(void) { + // should never change + static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N); + return path; } const char *ChannelNumber(const cChannel *Channel, int Number) { @@ -24,15 +26,17 @@ const char *ChannelNumber(const cChannel *Channel, int Number) { const char *ChannelName(const cChannel *Channel, int Number) { static char buffer[256]; buffer[0] = '\0'; - if (Channel) + if (Channel) snprintf(buffer, sizeof(buffer), "%s", Channel->Name()); else if (!Number) snprintf(buffer, sizeof(buffer), "%s", tr("*** Invalid Channel ***")); +#if VDRVERSNUM < 10315 char *ptr; if ((ptr = strchr(buffer, ',')) != NULL || (ptr = strchr(buffer, ';')) != NULL) *ptr = '\0'; +#endif return buffer; } @@ -40,10 +44,15 @@ const char *ChannelShortName(const cChannel *Channel, int Number) { static char buffer[256]; buffer[0] = '\0'; if (Channel) +#if VDRVERSNUM < 10315 snprintf(buffer, sizeof(buffer), "%s", Channel->Name()); +#else + snprintf(buffer, sizeof(buffer), "%s", Channel->ShortName(true)); +#endif else if (!Number) snprintf(buffer, sizeof(buffer), "%s", tr("*** Invalid Channel ***")); +#if VDRVERSNUM < 10315 char *ptr; if ((ptr = strchr(buffer, ',')) != NULL) { char *start = ptr + 1; @@ -52,25 +61,34 @@ const char *ChannelShortName(const cChannel *Channel, int Number) { return start; } else if ((ptr = strchr(buffer, ';')) != NULL) *ptr = '\0'; +#endif return buffer; } - +/* const char *ChannelBouquet(const cChannel *Channel, int Number) { static char buffer[256]; buffer[0] = '\0'; if (Channel) +#if VDRVERSNUM < 10315 snprintf(buffer, sizeof(buffer), "%s", Channel->Name()); +#else + snprintf(buffer, sizeof(buffer), "%s", Channel->Provider()); +#endif else if (!Number) snprintf(buffer, sizeof(buffer), "%s", tr("*** Invalid Channel ***")); +#if VDRVERSNUM < 10315 char *ptr; if ((ptr = strchr(buffer, ';')) != NULL) return ptr + 1; else return ""; +#else + return buffer; +#endif } - +*/ cxType TimeType(time_t Time, const std::string &Format) { static char result[1000]; struct tm tm_r, *tm; |