diff options
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | lcdproc.c | 35 | ||||
| -rw-r--r-- | po/de_DE.po | 64 |
3 files changed, 76 insertions, 26 deletions
@@ -90,5 +90,8 @@ Head: (provided by Diego Pierotto <vdr-italian@tiscali.it>) - fixed a bug with displaying the volume bar. If connection to LCDd is lost and volume is changed in the meantime, the volume bar got mixed up after reconnection. +- adapted to changes in VDR 1.7.11 regarding character set conversion. +- implemented cStatus::SetAudioChannel and SetAudioTrack to display audio track + information on lcd.
\ No newline at end of file @@ -45,11 +45,19 @@ static const char * OutputFunctionText[]= {"Off", "User3"}; class cLcdFeed : public cStatus { +public: + cLcdFeed() { + AudioTrack = NULL; + } +private: + char * AudioTrack; protected: virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber); virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On); virtual void Replaying(const cControl *DvbPlayerControl, const char *Name, const char *FileName, bool On); virtual void SetVolume(int Volume, bool Absolute); + virtual void SetAudioTrack(int Index, const char * const *Tracks); + virtual void SetAudioChannel(int AudioChannel); virtual void OsdClear(void); virtual void OsdTitle(const char *Title); virtual void OsdStatusMessage(const char *Message); @@ -108,6 +116,33 @@ void cLcdFeed::SetVolume(int Volume, bool Absolute) LCDproc->ShowVolume( Volume, Absolute ); } +void cLcdFeed::SetAudioTrack(int Index, const char * const *Tracks) +{ + OsdTitle(trVDR("Button$Audio")); + if (AudioTrack) + free(AudioTrack); + asprintf(&AudioTrack, "%s", Tracks[Index]); + OsdCurrentItem(AudioTrack); +} + +void cLcdFeed::SetAudioChannel(int AudioChannel){ + char * TrackDescription; + switch (AudioChannel){ + case 0: + asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Stereo")); + break; + case 1: + asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Left channel")); + break; + case 2: + asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Right channel")); + break; + default: + return; + } + OsdCurrentItem(TrackDescription); + free(TrackDescription); +} void cLcdFeed::OsdClear(void) { //syslog(LOG_INFO, "lcdproc: cLcdFeed::OsdClear"); diff --git a/po/de_DE.po b/po/de_DE.po index ec98a00..fe1842d 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <vdr@joachim-wilke.de>\n" -"POT-Creation-Date: 2009-03-07 20:04+0100\n" +"POT-Creation-Date: 2010-01-17 13:08+0100\n" "PO-Revision-Date: 2007-08-12 20:41+0200\n" -"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" +"Last-Translator: Joachim Wilke <vdr@joachim-wilke.de>\n" "Language-Team: <vdr@linuxtv.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" @@ -27,7 +27,7 @@ msgstr "Lautstärke " msgid "RECORDING" msgstr "AUFNAHME " -#: lcd.c:859 lcdproc.c:205 lcdproc.c:215 +#: lcd.c:859 lcdproc.c:240 lcdproc.c:250 msgid "No EPG info available." msgstr "Keine EPG Information verfügbar." @@ -35,94 +35,106 @@ msgstr "Keine EPG Information verfügbar." msgid "LCDproc output" msgstr "LCDproc Ausgabe" -#: lcdproc.c:71 +#: lcdproc.c:79 msgid "Waiting for EPG info." msgstr "Suche nach EPG Information." -#: lcdproc.c:354 +#: lcdproc.c:132 +msgid "Stereo" +msgstr "Stereo" + +#: lcdproc.c:135 +msgid "Left channel" +msgstr "Linker Kanal" + +#: lcdproc.c:138 +msgid "Right channel" +msgstr "Rechter Kanal" + +#: lcdproc.c:389 msgid "off" msgstr "aus" -#: lcdproc.c:355 +#: lcdproc.c:390 msgid "on" msgstr "an" -#: lcdproc.c:356 +#: lcdproc.c:391 msgid "auto" msgstr "auto" -#: lcdproc.c:357 +#: lcdproc.c:392 msgid "detailed" msgstr "detailiert" -#: lcdproc.c:358 +#: lcdproc.c:393 msgid "simple" msgstr "einfach" -#: lcdproc.c:361 +#: lcdproc.c:396 msgid "FullCycle" msgstr "Zyklusdauer Statuszeile" -#: lcdproc.c:362 +#: lcdproc.c:397 msgid "TimeDateCycle" msgstr "davon Dauer Zeitanzeige" -#: lcdproc.c:363 +#: lcdproc.c:398 msgid "VolumeKeep" msgstr "Anzeigedauer Lautstärke" -#: lcdproc.c:364 +#: lcdproc.c:399 msgid "Scrollwait" msgstr "Zeit bis Text rollen" -#: lcdproc.c:365 +#: lcdproc.c:400 msgid "Scrollspeed" msgstr "Rollgeschwindigkeit" -#: lcdproc.c:366 +#: lcdproc.c:401 msgid "Charmap" msgstr "Zeichenkodierung" -#: lcdproc.c:367 +#: lcdproc.c:402 msgid "AltShift" msgstr "Alternative \"Heartbeat\"-Signalisierung" -#: lcdproc.c:368 +#: lcdproc.c:403 msgid "BackLight" msgstr "Hintergrundbeleuchtung" -#: lcdproc.c:369 +#: lcdproc.c:404 msgid "SetClientPriority" msgstr "" -#: lcdproc.c:370 +#: lcdproc.c:405 msgid "NormalClientPriority" msgstr "" -#: lcdproc.c:371 +#: lcdproc.c:406 msgid "HighClientPriority" msgstr "" -#: lcdproc.c:372 +#: lcdproc.c:407 msgid "BackLightWait" msgstr "" -#: lcdproc.c:373 +#: lcdproc.c:408 msgid "PrioWait" msgstr "" -#: lcdproc.c:374 lcdproc.c:376 +#: lcdproc.c:409 lcdproc.c:411 msgid "OutputNumber" msgstr "Zahl der Ausgänge am LCD" -#: lcdproc.c:379 +#: lcdproc.c:414 msgid "Recording status" msgstr "Aufnahemstatus" -#: lcdproc.c:380 +#: lcdproc.c:415 msgid "Show time" msgstr "Zeit anzeigen" -#: lcdproc.c:381 +#: lcdproc.c:416 msgid "Show subtitle" msgstr "Untertitel anzeigen" |