Fixed horizontal scaling of subtitles (cont'd)

2 files changed, 7 insertions, 5 deletions

diff --git a/HISTORY b/HISTORY
index 20b2b010..6bc949b7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6567,6 +6567,9 @@ Video Disk Recorder Revision History
 - Made updating the editing marks during replay react faster in case the marks
   file has just been written.
 - Fixed horizontal scaling of subtitles (reported by Reinhard Nissl).
+- Stripped the note "The data returned by this function is only used for informational
+  purposes (if any)" from the description of cDevice::GetVideoSize(). The VideoAspect
+  is now used to properly scale subtitles.
 - Fixed cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE (thanks
   to Juergen Lock).
 - Fixed the Language header of the Serbian translation file (thanks to Ville Skyttä).
diff --git a/device.h b/device.h
index 1598af24..a383dac6 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 2.23 2010/10/24 12:11:16 kls Exp $
+ * $Id: device.h 2.24 2011/03/21 17:58:41 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -405,10 +405,9 @@ public:
          ///< (default is PAL).
   virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
          ///< Returns the With, Height and VideoAspect ratio of the currently
-         ///< displayed video material. The data returned by this function is
-         ///< only used for informational purposes (if any). Width and
-         ///< Height are given in pixel (e.g. 720x576) and VideoAspect is
-         ///< e.g. 1.33333 for a 4:3 broadcast, or 1.77778 for 16:9.
+         ///< displayed video material. Width and Height are given in pixel
+         ///< (e.g. 720x576) and VideoAspect is e.g. 1.33333 for a 4:3 broadcast,
+         ///< or 1.77778 for 16:9.
          ///< The default implementation returns 0 for Width and Height
          ///< and 1.0 for VideoAspect.
   virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);