summaryrefslogtreecommitdiff
path: root/display.c
diff options
context:
space:
mode:
authorFrank Neumann <fnu@yavdr.org>2017-05-21 21:05:19 +0200
committerFrank Neumann <fnu@yavdr.org>2017-05-21 21:05:19 +0200
commit9884f8d092d846605ebb9359a68317437b42f7b1 (patch)
tree9ed5df97a936533a9764fed2aba9c015804187fd /display.c
parente53424ba0ba5f75015bddf1fbaf2dadc5623fa7e (diff)
downloadvdr-plugin-text2skin-9884f8d092d846605ebb9359a68317437b42f7b1.tar.gz
vdr-plugin-text2skin-9884f8d092d846605ebb9359a68317437b42f7b1.tar.bz2
Commit static-std-string.diff (thx mini73)
Diffstat (limited to 'display.c')
-rw-r--r--display.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/display.c b/display.c
index 0f001a5..d29e36a 100644
--- a/display.c
+++ b/display.c
@@ -1393,8 +1393,6 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token)
// --- cText2SkinDisplayTracks ------------------------------------------------
-const std::string ChannelNames[] = { "", "stereo", "left", "right" };
-
cText2SkinDisplayTracks::cText2SkinDisplayTracks(cText2SkinLoader *Loader, const char *Title,
int NumTracks, const char * const *Tracks):
cText2SkinRender(Loader, cxDisplay::audioTracks),
@@ -1414,9 +1412,15 @@ cText2SkinDisplayTracks::~cText2SkinDisplayTracks()
{
}
-const std::string &cText2SkinDisplayTracks::ChannelName(int AudioChannel)
+const char *cText2SkinDisplayTracks::ChannelName(int AudioChannel)
{
- return ChannelNames[AudioChannel + 1];
+ switch (AudioChannel)
+ {
+ case 0: return "stereo";
+ case 1: return "left";
+ case 2: return "right";
+ }
+ return "";
}
void cText2SkinDisplayTracks::SetTrack(int Index, const char * const *Tracks)