Version 1.7.39

VDR developer version 1.7.39 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.39.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.38-1.7.39.diff

MD5 checksums:

3f0681f4aa6bd8deffc8208c40d34d2d  vdr-1.7.39.tar.bz2
1c13a683694c6c3c52444c1689477876  vdr-1.7.38-1.7.39.diff

WARNING:
========

This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

Approaching version 2.0.0:
==========================

If all goes well, there will be just one more developer version after
this one, and then it's going to be version 2.0.0.

From the HISTORY file:
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Polish OSD texts (thanks to Marek Nazarko).
- Modified handling user inactivity in the shutdown handler to avoid a problem in case
  the system time is changed after VDR has been started (thanks to Udo Richter, reported
  by Sören Moch).
- Updated the Czech OSD texts (thanks to Ales Jurik).
- Changed the template for PLGCFG to $(CONFDIR)/plugins.mk (thanks to Ville Skyttä).
- Updated the Swedish OSD texts (thanks to Richard Lithvall).
- Now clearing device bondings for devices that don't provide DVB-S in the Setup/LNB
  menu (reported by Juergen Lock).
- Fixed a possible deadlock in handling the tuners of bonded devices (thanks to
  Juergen Lock).
- Improved working around the broken driver values for SNR in case of a "TT-budget
  S2-3200" receiving DVB-S2.
- The demos in the "osddemo" plugin can now also be ended with the "Back" key.
- Fixed flashing OSD in "high level OSD" mode of the TT S2-6400 in case a menu is open
  while subtitles are being displayed.
- Fixed stuttering or asynchronous audio after changing the audio track. This is done
  by doing a "jump" to the current position, which clears all buffers. However, this
  only works with TS recordings. With PES recordings it causes a segfault - haven't
  been able to figure out why.
- Added a manual page for 'svdrpsend' (thanks to Tobias Grimm).
- Fixed immediately disappearing subtitle track menu in "high level OSD" mode of the
  TT S2-6400 when selecting "No subtitles".
- Updated the French OSD texts (thanks to Bernard Jaulin).
- Updated the Dutch OSD texts (thanks to Carel Willemse).
- Removed all "fuzzy" translations from the files ar.po, hu_HU.po and sr_SR.po, because
  more often than not they are just wrong.
- Now calling DeviceClear() in cTransfer::Receive() if the output device blocks, instead
  of not retrying for 10 seconds (reported by Andreas Mair, with help from Oliver Endriss).
- Updated the Spanish OSD texts (thanks to Luca Olivetti).
- Updated the Hungarian language texts (thanks to István Füley).
- Changed the calls to Skins.QueueMessage() in vdr.c that are related to reporting the
  status of the editing process back to Skins.Message() in order to have them appear
  immediately.
- When sorting recordings by name, folders are now always at the top of the list.
- Updated the Russian OSD texts (thanks to Oleg Roitburd).

PLUGINS/src/dvbhddevice/HISTORY

@@ -59,3 +59,11 @@ VDR Plugin 'dvbhddevice' Revision History
 2013-02-16: Version 0.0.8
 
 - Added missing $(LDFLAGS) to the Makefile (thanks to Ville Skytt<74>).
+
+2013-02-24: Version 0.0.9
+
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed flashing OSD in "high level OSD" mode in case a menu is open while subtitles
+  are being displayed.
+- Fixed immediately disappearing subtitle track menu when selecting "No subtitles".

PLUGINS/src/dvbhddevice/Makefile

@@ -1,7 +1,6 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.23 2013/02/16 10:34:53 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.

PLUGINS/src/dvbhddevice/dvbhddevice.c

@@ -2,8 +2,6 @@
  * dvbhddevice.c: A plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbhddevice.c 1.22 2013/02/16 10:35:42 kls Exp $
  */
 
 #include <vdr/plugin.h>
@@ -12,7 +10,7 @@
 #include "menu.h"
 #include "setup.h"
 
-static const char *VERSION        = "0.0.8";
+static const char *VERSION        = "0.0.9";
 static const char *DESCRIPTION    = trNOOP("HD Full Featured DVB device");
 static const char *MAINMENUENTRY  = "dvbhddevice";
 

PLUGINS/src/dvbhddevice/dvbhdffdevice.c

@@ -2,8 +2,6 @@
  * dvbhdffdevice.c: The DVB HD Full Featured device interface
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbhdffdevice.c 1.49 2013/02/17 14:10:06 kls Exp $
  */
 
 #include <stdint.h>
@@ -498,6 +496,7 @@ bool cDvbHdFfDevice::SetPlayMode(ePlayMode PlayMode)
         mHdffCmdIf->CmdAvSetDecoderInput(0, 0);
         mHdffCmdIf->CmdAvEnableSync(0, true);
         mHdffCmdIf->CmdAvSetPlayMode(0, true);
+        mHdffCmdIf->CmdAvMuteAudio(0, false);
     }
     else {
         if (playMode == pmNone)
@@ -562,6 +561,30 @@ int64_t cDvbHdFfDevice::GetSTC(void)
     return -1;
 }
 
+cRect cDvbHdFfDevice::CanScaleVideo(const cRect &Rect, int Alignment)
+{
+    return Rect;
+}
+
+void cDvbHdFfDevice::ScaleVideo(const cRect &Rect)
+{
+    if (Rect == cRect::Null)
+    {
+        mHdffCmdIf->CmdAvSetVideoWindow(0, false, 0, 0, 0, 0);
+    }
+    else
+    {
+        int osdWidth;
+        int osdHeight;
+        double osdPixelAspect;
+
+        GetOsdSize(osdWidth, osdHeight, osdPixelAspect);
+        mHdffCmdIf->CmdAvSetVideoWindow(0, true,
+            Rect.X() * 1000 / osdWidth, Rect.Y() * 1000 / osdHeight,
+            Rect.Width() * 1000 / osdWidth, Rect.Height() * 1000 / osdHeight);
+    }
+}
+
 void cDvbHdFfDevice::TrickSpeed(int Speed)
 {
   freezed = false;
@@ -591,6 +614,7 @@ void cDvbHdFfDevice::Play(void)
         mHdffCmdIf->CmdAvEnableSync(0, true);
     mHdffCmdIf->CmdAvSetVideoSpeed(0, 100);
     mHdffCmdIf->CmdAvSetAudioSpeed(0, 100);
+    mHdffCmdIf->CmdAvMuteAudio(0, false);
     cDevice::Play();
 }
 
@@ -604,8 +628,8 @@ void cDvbHdFfDevice::Freeze(void)
 
 void cDvbHdFfDevice::Mute(void)
 {
-  //TODO???
-  cDevice::Mute();
+    mHdffCmdIf->CmdAvMuteAudio(0, true);
+    cDevice::Mute();
 }
 
 static HdffVideoStreamType_t MapVideoStreamTypes(int Vtype)

PLUGINS/src/dvbhddevice/dvbhdffdevice.h

@@ -2,8 +2,6 @@
  * dvbhdffdevice.h: The DVB HD Full Featured device interface
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: dvbhdffdevice.h 1.9 2012/12/03 13:43:55 kls Exp $
  */
 
 #ifndef __DVBHDFFDEVICE_H
@@ -99,6 +97,8 @@ protected:
   virtual int PlayTsAudio(const uchar *Data, int Length);
 public:
   virtual int64_t GetSTC(void);
+  virtual cRect CanScaleVideo(const cRect &Rect, int Alignment = taCenter);
+  virtual void ScaleVideo(const cRect &Rect = cRect::Null);
   virtual void TrickSpeed(int Speed);
   virtual void Clear(void);
   virtual void Play(void);

PLUGINS/src/dvbhddevice/hdffcmd.c

@@ -2,8 +2,6 @@
  * hdffcmd.c: TODO(short description)
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffcmd.c 1.26 2012/11/15 09:19:47 kls Exp $
  */
 
 #include <stdint.h>
@@ -175,6 +173,10 @@ void cHdffCmdIf::CmdAvSetSyncShift(int16_t SyncShift)
     HdffCmdAvSetSyncShift(mOsdDev, SyncShift);
 }
 
+void cHdffCmdIf::CmdAvMuteAudio(uint8_t DecoderIndex, bool Mute)
+{
+    HdffCmdAvMuteAudio(mOsdDev, DecoderIndex, Mute);
+}
 
 void cHdffCmdIf::CmdOsdConfigure(const HdffOsdConfig_t * pConfig)
 {
@@ -309,6 +311,13 @@ void cHdffCmdIf::CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int Radius
     HdffCmdOsdDrawEllipse(mOsdDev, hDisplay, CX, CY, RadiusX, RadiusY, Color, Flags);
 }
 
+void cHdffCmdIf::CmdOsdDrawSlope(uint32_t hDisplay, int X, int Y, int Width, int Height,
+                                 uint32_t Color, uint32_t Type)
+{
+    //printf("Slope (%d,%d) %d x %d, %08X, %X\n", X, Y, Width, Height, Color, Type);
+    HdffCmdOsdDrawSlope(mOsdDev, hDisplay, X, Y, Width, Height, Color, Type);
+}
+
 void cHdffCmdIf::CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color)
 {
     //printf("Text %08X (%d,%d), %s, %08X\n", hFont, X, Y, pText, Color);

PLUGINS/src/dvbhddevice/hdffcmd.h

@@ -2,8 +2,6 @@
  * hdffcmd.h: TODO(short description)
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffcmd.h 1.21 2012/11/15 09:20:05 kls Exp $
  */
 
 #ifndef _HDFF_CMD_H_
@@ -48,6 +46,7 @@ public:
     void CmdAvSetAudioDownmix(HdffAudioDownmixMode_t DownmixMode);
     void CmdAvSetAudioChannel(uint8_t AudioChannel);
     void CmdAvSetSyncShift(int16_t SyncShift);
+    void CmdAvMuteAudio(uint8_t DecoderIndex, bool Mute);
 
     void CmdOsdConfigure(const HdffOsdConfig_t * pConfig);
     void CmdOsdReset(void);
@@ -74,6 +73,7 @@ public:
     void CmdOsdDrawRectangle(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color);
     void CmdOsdDrawEllipse(uint32_t hDisplay, int CX, int CY, int RadiusX, int RadiusY,
                            uint32_t Color, uint32_t Flags);
+    void CmdOsdDrawSlope(uint32_t hDisplay, int X, int Y, int Width, int Height, uint32_t Color, uint32_t Type);
     void CmdOsdDrawText(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
     void CmdOsdDrawUtf8Text(uint32_t hDisplay, uint32_t hFont, int X, int Y, const char * pText, uint32_t Color);
     void CmdOsdDrawTextW(uint32_t hDisplay, uint32_t hFont, int X, int Y, const uint16_t * pText, uint32_t Color);

PLUGINS/src/dvbhddevice/hdffosd.c

@@ -2,8 +2,6 @@
  * hdffosd.c: Implementation of the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffosd.c 1.20 2013/01/29 08:59:36 kls Exp $
  */
 
 #include "hdffosd.h"
@@ -107,6 +105,10 @@ cHdffOsd::cHdffOsd(int Left, int Top, HDFF::cHdffCmdIf * pHdffCmdIf, uint Level)
 cHdffOsd::~cHdffOsd()
 {
     //printf("~cHdffOsd %d %d\n", mLeft, mTop);
+    if (Active()) {
+        mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
+        mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
+    }
     SetActive(false);
 
     for (int i = 0; i < MAX_NUM_FONTS; i++)
@@ -124,8 +126,6 @@ cHdffOsd::~cHdffOsd()
 
     if (mBitmapPalette != HDFF_INVALID_HANDLE)
         mHdffCmdIf->CmdOsdDeletePalette(mBitmapPalette);
-    mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
-    mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
     mHdffCmdIf->CmdOsdDeleteDisplay(mDisplay);
 }
 
@@ -152,7 +152,7 @@ eOsdError cHdffOsd::SetAreas(const tArea *Areas, int NumAreas)
     {
         //printf("SetAreas %d: %d %d %d %d %d\n", i, Areas[i].x1, Areas[i].y1, Areas[i].x2, Areas[i].y2, Areas[i].bpp);
     }
-    if (mDisplay != HDFF_INVALID_HANDLE)
+    if (Active() && mDisplay != HDFF_INVALID_HANDLE)
     {
         mHdffCmdIf->CmdOsdDrawRectangle(mDisplay, 0, 0, mDispWidth, mDispHeight, 0);
         mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
@@ -251,7 +251,6 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
 {
     int w = Font->Width(s);
     int h = Font->Height();
-    int limit = 0;
     int cw = Width ? Width : w;
     int ch = Height ? Height : h;
     int i;
@@ -345,7 +344,6 @@ void cHdffOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Colo
 
     if (Width || Height)
     {
-        limit = x + cw;// - mLeft;
         if (Width)
         {
             if ((Alignment & taLeft) != 0)
@@ -510,6 +508,8 @@ void cHdffOsd::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Qua
 void cHdffOsd::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
 {
     //printf("DrawSlope\n");
+    mHdffCmdIf->CmdOsdDrawSlope(mDisplay, mLeft + x1, mTop + y1,
+                                x2 - x1 + 1, y2 - y1 + 1, Color, Type);
     mChanged = true;
 }
 

PLUGINS/src/dvbhddevice/hdffosd.h

@@ -2,8 +2,6 @@
  * hdffosd.h: Implementation of the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: hdffosd.h 1.2 2011/01/30 15:27:48 kls Exp $
  */
 
 #ifndef _HDFF_OSD_H_

PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c

@@ -468,3 +468,39 @@ int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift)
     osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
+
+int HdffCmdAvMuteAudio(int OsdDevice, uint8_t DecoderIndex, int Mute)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_MUTE_AUDIO);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, Mute ? 1 : 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
+int HdffCmdAvMuteVideo(int OsdDevice, uint8_t DecoderIndex, int Mute)
+{
+    uint8_t cmdData[16];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND,
+                       HDFF_MSG_GROUP_AV_DECODER,
+                       HDFF_MSG_AV_MUTE_VIDEO);
+    BitBuffer_SetBits(&cmdBuf, 4, DecoderIndex);
+    BitBuffer_SetBits(&cmdBuf, 1, Mute ? 1 : 0);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}

PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h

@@ -151,4 +151,9 @@ int HdffCmdAvSetAudioChannel(int OsdDevice, uint8_t AudioChannel);
 
 int HdffCmdAvSetSyncShift(int OsdDevice, int16_t SyncShift);
 
+int HdffCmdAvMuteAudio(int OsdDevice, uint8_t DecoderIndex, int Mute);
+
+int HdffCmdAvMuteVideo(int OsdDevice, uint8_t DecoderIndex, int Mute);
+
+
 #endif /* HDFFCMD_AV_H */

PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h

@@ -71,6 +71,8 @@ typedef enum HdffMessageId_t
     HDFF_MSG_AV_SET_AUDIO_CHANNEL,
     HDFF_MSG_AV_SET_PLAY_MODE,
     HDFF_MSG_AV_SET_OPTIONS,
+    HDFF_MSG_AV_MUTE_AUDIO,
+    HDFF_MSG_AV_MUTE_VIDEO,
 
     HDFF_MSG_MUX_SET_VIDEO_OUT = 0,
     HDFF_MSG_MUX_SET_SLOW_BLANK,

PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c

@@ -546,6 +546,30 @@ int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
     return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
 }
 
+int HdffCmdOsdDrawSlope(int OsdDevice, uint32_t Display, uint16_t X,
+                        uint16_t Y, uint16_t Width, uint16_t Height,
+                        uint32_t Color, uint32_t Type)
+{
+    uint8_t cmdData[28];
+    BitBuffer_t cmdBuf;
+    osd_raw_cmd_t osd_cmd;
+
+    BitBuffer_Init(&cmdBuf, cmdData, sizeof(cmdData));
+    memset(&osd_cmd, 0, sizeof(osd_raw_cmd_t));
+    osd_cmd.cmd_data = cmdData;
+    HdffCmdBuildHeader(&cmdBuf, HDFF_MSG_TYPE_COMMAND, HDFF_MSG_GROUP_OSD,
+                       HDFF_MSG_OSD_DRAW_SLOPE);
+    BitBuffer_SetBits(&cmdBuf, 32, Display);
+    BitBuffer_SetBits(&cmdBuf, 16, X);
+    BitBuffer_SetBits(&cmdBuf, 16, Y);
+    BitBuffer_SetBits(&cmdBuf, 16, Width);
+    BitBuffer_SetBits(&cmdBuf, 16, Height);
+    BitBuffer_SetBits(&cmdBuf, 32, Color);
+    BitBuffer_SetBits(&cmdBuf, 32, Type);
+    osd_cmd.cmd_len = HdffCmdSetLength(&cmdBuf);
+    return ioctl(OsdDevice, OSD_RAW_CMD, &osd_cmd);
+}
+
 int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
                        uint16_t X, uint16_t Y, const char * Text,
                        uint32_t Color)

PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h

@@ -145,6 +145,10 @@ int HdffCmdOsdDrawEllipse(int OsdDevice, uint32_t Display, uint16_t CX,
                           uint16_t CY, uint16_t RadiusX, uint16_t RadiusY,
                           uint32_t Color, uint32_t Flags);
 
+int HdffCmdOsdDrawSlope(int OsdDevice, uint32_t Display, uint16_t X,
+                        uint16_t Y, uint16_t Width, uint16_t Height,
+                        uint32_t Color, uint32_t Type);
+
 int HdffCmdOsdDrawText(int OsdDevice, uint32_t Display, uint32_t Font,
                        uint16_t X, uint16_t Y, const char * Text,
                        uint32_t Color);

PLUGINS/src/dvbhddevice/po/fi_FI.po

@@ -23,7 +23,7 @@ msgid "Video Conversion"
 msgstr "Näyttömuoto"
 
 msgid "TV on"
-msgstr ""
+msgstr "TV päälle"
 
 msgid "Automatic"
 msgstr "automaattinen"
@@ -92,7 +92,7 @@ msgid "Audio Downmix"
 msgstr "Äänen alasmiksaus"
 
 msgid "A/V Sync Shift (ms)"
-msgstr ""
+msgstr "A/V-synkronointi (ms)"
 
 msgid "OSD Size"
 msgstr "Kuvaruutunäytön koko"

PLUGINS/src/dvbhddevice/po/it_IT.po

@@ -2,13 +2,14 @@
 # Copyright (C) 2011 Andreas Regel
 # This file is distributed under the same license as the dvbhddevice package.
 # Christoph Haubrich, 2011
+# Diego Pierotto <vdr-italian@tiscali.it>, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2012-11-13 20:08+0100\n"
-"PO-Revision-Date: 2011-07-10 00:23+0100\n"
+"PO-Revision-Date: 2013-02-18 23:42+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <see README>\n"
 "Language: it\n"
@@ -20,13 +21,13 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 msgid "HD Full Featured DVB device"
-msgstr ""
+msgstr "Scheda DVB HD Full Featured"
 
 msgid "Video Conversion"
 msgstr "Conversione video"
 
 msgid "TV on"
-msgstr ""
+msgstr "TV accesa"
 
 msgid "Automatic"
 msgstr "Automatica"
@@ -47,16 +48,16 @@ msgid "Always 16/9"
 msgstr "Sempre 16:9"
 
 msgid "Zoom 16/9"
-msgstr ""
+msgstr "Ingrandimento 16/9"
 
 msgid "Off"
-msgstr ""
+msgstr "Spento"
 
 msgid "Frame rate"
-msgstr ""
+msgstr "Frame rate"
 
 msgid "HD Only"
-msgstr ""
+msgstr "Solo HD"
 
 msgid "Always"
 msgstr "Sempre"
@@ -80,7 +81,7 @@ msgid "Resolution"
 msgstr "Risoluzione"
 
 msgid "Video Mode Adaption"
-msgstr ""
+msgstr "Adattamento modalità video"
 
 msgid "TV format"
 msgstr "Formato TV"
@@ -95,7 +96,7 @@ msgid "Audio Downmix"
 msgstr "Scala Audio"
 
 msgid "A/V Sync Shift (ms)"
-msgstr ""
+msgstr "Alterna sincro A/V (ms)"
 
 msgid "OSD Size"
 msgstr "Dimensione OSD"
@@ -104,10 +105,10 @@ msgid "HDMI CEC"
 msgstr "HDMI CEC"
 
 msgid "CEC: Switch TV on"
-msgstr ""
+msgstr "CEC: Passa a TV accesa"
 
 msgid "CEC: Switch TV off"
-msgstr ""
+msgstr "CEC: Passa a TV spenta"
 
 msgid "Remote Control Protocol"
 msgstr "Protocollo controllo remoto"
@@ -122,4 +123,4 @@ msgid "Allow True Color OSD"
 msgstr "Permetti OSD True Color"
 
 msgid "Hide mainmenu entry"
-msgstr ""
+msgstr "Nascondi voce menu principale"

PLUGINS/src/dvbhddevice/setup.c

@@ -2,8 +2,6 @@
  * setup.c: Setup for the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: setup.c 1.19 2013/02/17 13:25:17 kls Exp $
  */
 
 #include "setup.h"
@@ -436,26 +434,26 @@ void cHdffSetupPage::Store(void)
 
 eOSState cHdffSetupPage::ProcessKey(eKeys key)
 {
-        eOSState state = cMenuSetupPage::ProcessKey(key);
+    eOSState state = cMenuSetupPage::ProcessKey(key);
 
-        if (state == osContinue)
+    if (state == osContinue)
+    {
+        cOsdItem * item;
+        switch (key)
         {
-                cOsdItem * item;
-                switch (key)
+            case kLeft:
+            case kRight:
+                item = Get(Current());
+                if (item == mTvFormatItem)
                 {
-                        case kLeft:
-                        case kRight:
-                                item = Get(Current());
-                                if (item == mTvFormatItem)
-                                {
-                                    mVideoConversion = 0;
-                                        BuildVideoConversionItem();
-                                        Display();
-                                }
-                                break;
-                        default:
-                                break;
+                    mVideoConversion = 0;
+                    BuildVideoConversionItem();
+                    Display();
                 }
+                break;
+            default:
+                break;
         }
-        return state;
+    }
+    return state;
 }

PLUGINS/src/dvbhddevice/setup.h

@@ -2,8 +2,6 @@
  * setup.h: Setup for the DVB HD Full Featured On Screen Display
  *
  * See the README file for copyright information and how to reach the author.
- *
- * $Id: setup.h 1.13 2012/11/15 09:21:07 kls Exp $
  */
 
 #ifndef _HDFF_SETUP_H_

PLUGINS/src/osddemo/HISTORY

@@ -51,3 +51,7 @@ VDR Plugin 'osddemo' Revision History
 
 - Added demos of the DrawEllipse() and DrawSlope() function (press '1' or '2',
   respectively).
+
+2013-02-19: Version 0.3.1
+
+- The demos can now also be ended with the "Back" key.

PLUGINS/src/osddemo/osddemo.c

@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.10 2013/02/17 13:16:34 kls Exp $
+ * $Id: osddemo.c 2.11 2013/02/19 12:43:19 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.3.0";
+static const char *VERSION        = "0.3.1";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -157,6 +157,7 @@ eOSState cLineGame::ProcessKey(eKeys Key)
                      return osContinue;
        case k2:      DrawSlopes(osd);
                      return osContinue;
+       case kBack:
        case kOk:     return osEnd;
        default: return state;
        }
@@ -533,6 +534,7 @@ eOSState cTrueColorDemo::ProcessKey(eKeys Key)
                      SetArea();
                      DrawSlopes(osd);
                      break;
+       case kBack:
        case kOk:     return osEnd;
        default: return state;
        }