r4170 - in vdr/vdr-plugin-mp3/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-02-15 22:42:18 +0100 (Thu, 15 Feb 2007)
New Revision: 4170

Added:
   vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch
Modified:
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/patches/00list
   vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf
Log:
* Extracted modifications to default mplayer.sh configuration into
  11_mplayer.sh.conf-defaults.dpatch

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog	2007-02-15 21:31:36 UTC (rev 4169)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2007-02-15 21:42:18 UTC (rev 4170)
@@ -2,6 +2,8 @@
 
   * Added 02_mplayer.sh-mysterix.dpatch from Michael Mauksch, which adds
     support for different audio lines (AID) and m3u/pls playlists again
+  * Extracted modifications to default mplayer.sh configuration into
+    11_mplayer.sh.conf-defaults.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Tue, 13 Feb 2007 09:40:55 +0100
 

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2007-02-15 21:31:36 UTC (rev 4169)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2007-02-15 21:42:18 UTC (rev 4170)
@@ -1,4 +1,5 @@
 01_mp3-ogg-conv-utf8
 02_mplayer.sh-mysterix
 10_debian-fhs-defaults
+11_mplayer.sh.conf-defaults
 91_mp3-vdr150

Added: vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch	2007-02-15 21:31:36 UTC (rev 4169)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch	2007-02-15 21:42:18 UTC (rev 4170)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_mplayer.sh.conf-defaults.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-mp3-0.9.15~/debian/vdrmplayer.sh.conf vdr-plugin-mp3-0.9.15/debian/vdrmplayer.sh.conf
+--- vdr-plugin-mp3-0.9.15~/debian/vdrmplayer.sh.conf	2007-02-11 16:38:06.000000000 +0100
++++ vdr-plugin-mp3-0.9.15/debian/vdrmplayer.sh.conf	2007-02-15 22:39:09.000000000 +0100
+@@ -11,7 +11,7 @@
+ # MPLAYER="/usr/bin/mplayer"
+ # or just the name of the binary, e.g.:
+ # MPLAYER="mplayer"
+-MPLAYER="/usr/local/bin/mplayer"
++MPLAYER="/usr/bin/mplayer"
+ 
+ # Video Out Filter lavc or fame - see mplayer DVB docs for details !
+ #VOP="lavc=9000"
+@@ -67,10 +67,10 @@
+ 
+ # how to play AC3 audio?
+ # for AC3 via sound card (ALSA driver):
+-AC3AOUT="-ao alsa9 -ac hwac3"
++#AC3AOUT="-ao alsa9 -ac hwac3"
+ # for AC3 via DVB (doesn't need AC3overDVB patch);
+ # needs MPlayer 0.90 final, or newer:
+-#AC3AOUT="-ac hwac3"
++AC3AOUT="-ao mpegpes -ac hwac3"
+ 
+ # what aspect ratio has your TV set?
+ # either 4/3 (conventional) or 16/9 (widescreen)
+@@ -100,7 +100,7 @@
+ FRAMEDROP="true"
+ 
+ # Lirc RC File
+-LIRCRC="/video/.lircrc"
++#LIRCRC="/video/.lircrc"
+ 
+ # do we have a slow CPU?
+ # if so, reduce the Y resolution to the half of the possible maximum:
+@@ -112,7 +112,7 @@
+ # Where to find DVD/VCD dummy files? (just a fake and empty text file for the plugin)
+ # Example: create two empty text files (DVD and VCD) in /video/plugins/DVD-VCD/
+ # !!!The files must be named VCD and DVD (all capital letters)!!!
+-DVDFiles="/video/plugins/DVD-VCD"
++DVDFiles="/var/lib/vdr-plugin-mplayer/DVD-VCD"
+ 
+ # What is your DVD-ROM device ?
+ DVD="/dev/hdc"
+@@ -138,8 +138,8 @@
+ # used in mplayer.sh
+ # Only for experienced users
+ # USERDEF="-what -option you ever -like to give -to mplayer"
+-USERDEF="-quiet"
+-#USERDEF=""
++# Use "-osdlevel 0" to hide the mplayer osd (not recommended for dxr3 output)
++USERDEF="-quiet -osdlevel 0"
+ 
+ # set to true to enable debugging output
+ #DEBUG="true"


Property changes on: vdr/vdr-plugin-mp3/trunk/debian/patches/11_mplayer.sh.conf-defaults.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf	2007-02-15 21:31:36 UTC (rev 4169)
+++ vdr/vdr-plugin-mp3/trunk/debian/vdrmplayer.sh.conf	2007-02-15 21:42:18 UTC (rev 4170)
@@ -11,7 +11,7 @@
 # MPLAYER="/usr/bin/mplayer"
 # or just the name of the binary, e.g.:
 # MPLAYER="mplayer"
-MPLAYER="/usr/bin/mplayer"
+MPLAYER="/usr/local/bin/mplayer"
 
 # Video Out Filter lavc or fame - see mplayer DVB docs for details !
 #VOP="lavc=9000"
@@ -67,10 +67,10 @@
 
 # how to play AC3 audio?
 # for AC3 via sound card (ALSA driver):
-#AC3AOUT="-ao alsa9 -ac hwac3"
+AC3AOUT="-ao alsa9 -ac hwac3"
 # for AC3 via DVB (doesn't need AC3overDVB patch);
 # needs MPlayer 0.90 final, or newer:
-AC3AOUT="-ao mpegpes -ac hwac3"
+#AC3AOUT="-ac hwac3"
 
 # what aspect ratio has your TV set?
 # either 4/3 (conventional) or 16/9 (widescreen)
@@ -100,7 +100,7 @@
 FRAMEDROP="true"
 
 # Lirc RC File
-#LIRCRC="/video/.lircrc"
+LIRCRC="/video/.lircrc"
 
 # do we have a slow CPU?
 # if so, reduce the Y resolution to the half of the possible maximum:
@@ -112,7 +112,7 @@
 # Where to find DVD/VCD dummy files? (just a fake and empty text file for the plugin)
 # Example: create two empty text files (DVD and VCD) in /video/plugins/DVD-VCD/
 # !!!The files must be named VCD and DVD (all capital letters)!!!
-DVDFiles="/var/lib/vdr-plugin-mplayer/DVD-VCD"
+DVDFiles="/video/plugins/DVD-VCD"
 
 # What is your DVD-ROM device ?
 DVD="/dev/hdc"