r8439 - in /vdr/vdr-plugin-mp3/trunk/debian: changelog control mplayer.sh vdrmplayer.sh.conf

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Thu Mar  4 23:50:05 2010
New Revision: 8439

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8439
Log:
* mplayer.sh, vdrmplayer.sh.conf: Add support for subcp and subfont-text-scale
  options - taken from 0.10.1-14ubuntu1 by Ilya Barygin (Closes: #571995)
* Standards-Version: 3.8.4

Modified:
    vdr/vdr-plugin-mp3/trunk/debian/changelog
    vdr/vdr-plugin-mp3/trunk/debian/control
    vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh
    vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/changelog?rev=8439&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog Thu Mar  4 23:50:05 2010
@@ -1,3 +1,11 @@
+vdr-plugin-mp3 (0.10.2-2) unstable; urgency=low
+
+  * mplayer.sh, vdrmplayer.sh.conf: Add support for subcp and subfont-text-scale
+    options - taken from 0.10.1-14ubuntu1 by Ilya Barygin (Closes: #571995)
+  * Standards-Version: 3.8.4
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 05 Mar 2010 00:46:26 +0100
+
 vdr-plugin-mp3 (0.10.2-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-mp3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/control?rev=8439&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/control Thu Mar  4 23:50:05 2010
@@ -4,7 +4,7 @@
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
 Homepage: http://www.muempf.de/

Modified: vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh?rev=8439&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh Thu Mar  4 23:50:05 2010
@@ -209,6 +209,8 @@
   if ! test -z "$SUBPOS"; then SUBTITLES=" -subpos $SUBPOS"; fi
   if ! test -z "$SUBCOLOR"; then SUBTITLES="$SUBTITLES -sub-bg-color $SUBCOLOR"; fi
   if ! test -z "$SUBALPHA"; then SUBTITLES="$SUBTITLES -sub-bg-alpha $SUBALPHA"; fi
+  if ! test -z "$SUBCP"; then SUBTITLES="$SUBTITLES -subcp $SUBCP"; fi
+  if ! test -z "$SUBSCALE"; then SUBTITLES="$SUBTITLES -subfont-text-scale $SUBSCALE"; fi
 
   debugvar SUBTITLE "$SUBTITLES"
 

Modified: vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf?rev=8439&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf Thu Mar  4 23:50:05 2010
@@ -136,6 +136,8 @@
 SUBPOS="80"		#Vertical position 0-100
 SUBCOLOR="0"		#Background color 0=black 255=white
 SUBALPHA="30"		#Background transparency (0-255)
+SUBCP="latin1"		#Codepage
+SUBSCALE="3"		#Text autoscale coefficient, percentage of the screen size
 
 # Userdefined Options - make sure they do not collide with options
 # used in mplayer.sh