summaryrefslogtreecommitdiff
path: root/tools.c
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2009-04-24 14:32:32 +0200
committerAndreas Mair <amair.sob@googlemail.com>2009-04-24 14:32:32 +0200
commit95977e11c0a5c1170351f2fafe400519d7b1086b (patch)
tree92259a6c6b8a7dc50ed9a0c3a2a172b204a4f54c /tools.c
parent7b34d920b0043281d7877d1e0ece8642d27f212d (diff)
downloadvdr-plugin-skinenigmang-95977e11c0a5c1170351f2fafe400519d7b1086b.tar.gz
vdr-plugin-skinenigmang-95977e11c0a5c1170351f2fafe400519d7b1086b.tar.bz2
2009-04-25: Version 0.1.0v0.1.0
- Fixed: Calculating width of events' start times in channel info OSD (Reported by tomglx @vdr-poprtal.de). - Changed: pause scrolling when text has scrolled all to the left in scroll behaviour "to the left" (Reported by Andreas Brugger). - Reworked: (simplified) font loading/caching. - Updated Italian translation (Provided by Diego Pierotto). - Removed: ENABLE_COPYFONT define. - Changed: Reduced number of font recreations (Reported by balta @vdr-portal.de). - Added: more CA systems to text mappings in channel info OSD (Submitted by free-x @vdr-portal.de). - Added: symbol in channel info OSD if current channel has subtitles. - Changed: background colors for the DarkBlue theme (Submitted by zulu @vdr-portal.de). - Added: New option "Show CA system as text". - Changed: Reduced number of locks while drawing to OSD which increases display speed especially in menu OSD. - Added: show signal strength and signal-to-noise ratio in channel info OSD (can be disabled by setting SKINENIGMA_DISABLE_SIGNALINFO to 1). - Fixed: compiler error with certain gcc versions (Reported by C-3PO @ vdr-portal.de). - Changed: smooth scrolling text (based on skinelchi by Christoph Haubrich <christoph.haubrich (AT) web.de>). - Removed: SKINENIGMA_DISABLE_ANIMATED_TEXT define. - Changed: Replace "/" by "~" in channel logo names. - Added: new setting "Show scrollbar in menu". - Added: Override VDR's SetTabs() to adopt column widths in menu OSD to selected font size. - Added: Support subtitle tracks in tracks OSD: logo will only be shown if icons/subtitle/subtitle.xpm exists. - Fixed: missing logo in tracks OSD while using single area. - Minor bugfixes and enhancements. - Requires at least VDR v1.6.0.
Diffstat (limited to 'tools.c')
-rw-r--r--tools.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/tools.c b/tools.c
index f9bf8a8..198169f 100644
--- a/tools.c
+++ b/tools.c
@@ -6,7 +6,6 @@
*/
#include "common.h"
-#include "i18n.h"
#include <sstream>
#include <string.h>
@@ -43,7 +42,7 @@ std::string parseaux(const char *aux)
{
bool founditem = false;
std::stringstream sstrReturn;
- char *start, *end;
+ const char *start, *end;
// check if egpsearch
start = strcasestr(aux, AUX_TAGS_EPGSEARCH_START);
end = strcasestr(aux, AUX_TAGS_EPGSEARCH_END);
@@ -51,11 +50,11 @@ std::string parseaux(const char *aux)
// add header
sstrReturn << AUX_HEADER_EPGSEARCH;
// parse first item
- char *tmp;
+ const char *tmp;
if ((tmp = strcasestr(start, AUX_TAGS_EPGSEARCH_ITEM_1A_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_EPGSEARCH_ITEM_1A_START);
- char *tmp2;
+ const char *tmp2;
if ((tmp2 = strcasestr(tmp, AUX_TAGS_EPGSEARCH_ITEM_1A_END)) != NULL) {
// add channel
sstrReturn << tr("Channel:") << " " << std::string(tmp, tmp2 - tmp);
@@ -70,7 +69,7 @@ std::string parseaux(const char *aux)
if ((tmp = strcasestr(start, AUX_TAGS_EPGSEARCH_ITEM_2A_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_EPGSEARCH_ITEM_2A_START);
- char *tmp2;
+ const char *tmp2;
if ((tmp2 = strcasestr(tmp, AUX_TAGS_EPGSEARCH_ITEM_2A_END)) != NULL) {
// add separator
if (founditem) {
@@ -88,7 +87,7 @@ std::string parseaux(const char *aux)
if ((tmp = strcasestr(start, AUX_TAGS_EPGSEARCH_ITEM_3A_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_EPGSEARCH_ITEM_3A_START);
- char *tmp2;
+ const char *tmp2;
if ((tmp2 = strcasestr(tmp, AUX_TAGS_EPGSEARCH_ITEM_3A_END)) != NULL) {
// add separator
if (founditem) {
@@ -108,7 +107,7 @@ std::string parseaux(const char *aux)
if ((tmp = strcasestr(start, AUX_TAGS_EPGSEARCH_ITEM_1B_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_EPGSEARCH_ITEM_1B_START);
- char *tmp2;
+ const char *tmp2;
if ((tmp2 = strcasestr(tmp, AUX_TAGS_EPGSEARCH_ITEM_1B_END)) != NULL) {
if (std::string(tmp, tmp2 - tmp) != "0") {
// add separator
@@ -122,14 +121,14 @@ std::string parseaux(const char *aux)
if ((tmp = strcasestr(start, AUX_TAGS_EPGSEARCH_ITEM_2B_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_EPGSEARCH_ITEM_2B_START);
- char *tmp2;
- if ((tmp2 = strcasestr(tmp, AUX_TAGS_EPGSEARCH_ITEM_2B_END)) != NULL) {
+ const char *tmp3;
+ if ((tmp3 = strcasestr(tmp, AUX_TAGS_EPGSEARCH_ITEM_2B_END)) != NULL) {
// add separator
if (founditem) {
sstrReturn << ", ";
}
// add search item
- sstrReturn << "eventid=" << std::string(tmp, tmp2 - tmp);
+ sstrReturn << "eventid=" << std::string(tmp, tmp3 - tmp);
}
}
}
@@ -160,11 +159,11 @@ std::string parseaux(const char *aux)
// add header
sstrReturn << AUX_HEADER_VDRADMIN;
// parse first item
- char *tmp;
+ const char *tmp;
if ((tmp = strcasestr(start, AUX_TAGS_VDRADMIN_ITEM1_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_VDRADMIN_ITEM1_START);
- char *tmp2;
+ const char *tmp2;
if ((tmp2 = strcasestr(tmp, AUX_TAGS_VDRADMIN_ITEM1_END)) != NULL) {
// add search item
sstrReturn << std::string(tmp, tmp2 - tmp) << std::endl;
@@ -179,11 +178,11 @@ std::string parseaux(const char *aux)
// add header
sstrReturn << AUX_HEADER_PIN;
// parse first item
- char *tmp;
+ const char *tmp;
if ((tmp = strcasestr(start, AUX_TAGS_PIN_ITEM1_START)) != NULL) {
if (tmp < end) {
tmp += strlen(AUX_TAGS_PIN_ITEM1_START);
- char *tmp2;
+ const char *tmp2;
if ((tmp2 = strcasestr(tmp, AUX_TAGS_PIN_ITEM1_END)) != NULL) {
// add search item
sstrReturn << std::string(tmp, tmp2 - tmp) << std::endl;