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

Thu Feb 15 22:31:37 CET 2007

Author: tiber-guest
Date: 2007-02-15 22:31:36 +0100 (Thu, 15 Feb 2007)
New Revision: 4169

Added:
   vdr/vdr-plugin-mp3/trunk/debian/patches/02_mplayer.sh-mysterix.dpatch
Modified:
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh
   vdr/vdr-plugin-mp3/trunk/debian/patches/00list
   vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
Log:
* Added 02_mplayer.sh-mysterix.dpatch from Michael Mauksch, which adds
  support for different audio lines (AID) and m3u/pls playlists again

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================

--- vdr/vdr-plugin-mp3/trunk/debian/changelog	2007-02-14 22:12:34 UTC (rev 4168)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2007-02-15 21:31:36 UTC (rev 4169)
@@ -1,3 +1,10 @@
+vdr-plugin-mp3 (0.9.15-10) UNRELEASED; urgency=low
+
+  * Added 02_mplayer.sh-mysterix.dpatch from Michael Mauksch, which adds
+    support for different audio lines (AID) and m3u/pls playlists again
+
+ -- Tobias Grimm <tg at e-tobi.net>  Tue, 13 Feb 2007 09:40:55 +0100
+
 vdr-plugin-mp3 (0.9.15-9) unstable; urgency=low
 
   * Fixed location of config file in mplayer.sh

Modified: vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh	2007-02-14 22:12:34 UTC (rev 4168)
+++ vdr/vdr-plugin-mp3/trunk/debian/mplayer.sh	2007-02-15 21:31:36 UTC (rev 4169)
@@ -500,7 +500,7 @@
 if ! test -r "$FILE"; then echolog "*** ERROR: Make sure $FILE exists and is readable - otherwise it cannot be played ;-)"; exit; fi
 
 # Check if config file exists!
-declare CFGFIL="/etc/vdr/plugins/vdrmplayer.sh.conf"
+declare CFGFIL="${0}.conf"
 debugvar CFGFIL $CFGFIL
 if ! test -f $CFGFIL; then echolog "*** FATAL: mplayer.sh.conf not found!!! Exiting." ; exit; fi
 

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2007-02-14 22:12:34 UTC (rev 4168)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2007-02-15 21:31:36 UTC (rev 4169)
@@ -1,3 +1,4 @@
 01_mp3-ogg-conv-utf8
+02_mplayer.sh-mysterix
 10_debian-fhs-defaults
 91_mp3-vdr150

Added: vdr/vdr-plugin-mp3/trunk/debian/patches/02_mplayer.sh-mysterix.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/02_mplayer.sh-mysterix.dpatch	2007-02-14 22:12:34 UTC (rev 4168)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/02_mplayer.sh-mysterix.dpatch	2007-02-15 21:31:36 UTC (rev 4169)
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run 
+## 02_mplayer.sh-mysterix.dpatch by Michael Mauksch <mandaxy at gmx.de>
+## http://toms-cafe.de/vdr/download/mp3-0.9.15-ogg-conv-utf8.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 0.8.6b (by Mysterix mandaxy at gmx.de)
+## DP:   - add check by use mode Traditonell instead of slave for correct
+## DP:     handling AID
+## DP:     (http://vdrportal.de/board/thread.php?postid=411671#post411671)
+## DP: 0.8.6a (by Mysterix mandaxy at gmx.de)
+## DP:   - add handling AID to parse different Audiolines in mplayer  
+## DP:   - add handling of Playlistfiles (*m3u/*.pls) for parsing playlists to
+## DP:     mplayer
+## DP:   - IMPORTANT NOTE:
+## DP:     These changes are needed by new vdr-mp3-plugin version (0-9-14)
+## DP:     and only an workaround! I'm a Noob in this kind of Coding and hope
+## DP:     Juri Haberland (Original Author of this Script) or any other
+## DP:     professional one will write a correct and comfortable Solution. :)
+
+ at DPATCH@
+diff -urNad vdr-plugin-mp3-0.9.15~/debian/mplayer.sh vdr-plugin-mp3-0.9.15/debian/mplayer.sh
+--- vdr-plugin-mp3-0.9.15~/debian/mplayer.sh	2007-02-11 16:34:07.000000000 +0100
++++ vdr-plugin-mp3-0.9.15/debian/mplayer.sh	2007-02-15 22:23:32.000000000 +0100
+@@ -487,15 +487,40 @@
+ declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
+ declare CMDLINE AOUT REMOTE USERDEF SUFFIX
+ declare FILE="$1"
+-declare SLAVE="$2"
+ declare -a XResPAL[0]
+ declare -a XResNTSC[0]
+ declare FDSTR=""
+ declare SUBTITLES=""
+ declare DETC=""
+ 
++
++while shift; do
++  if [ "$1" = "SLAVE" ]; then
++    SLAVE="SLAVE"
++  elif [ "$1" = "AID" ]; then
++      AID="AID"
++      AIDLEVEL="$2"
++    shift
++  fi
++done
++		  
++		  
+ echolog "*** Starting mplayer.sh Version $VERSION"
+ 
++# Check if file a Playlist and set neccassary parameter
++case "$FILE" in
++  *.pls | *.m3u)
++    PLS="true"
++    PLSFILE="$FILE"
++    first=`grep -v -m1 "^#" $FILE`
++    FILE="$first"
++  ;;
++  *)
++    FILE="$FILE"
++  ;;
++esac
++
++
+ if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
+ if ! test -r "$FILE"; then echolog "*** ERROR: Make sure $FILE exists and is readable - otherwise it cannot be played ;-)"; exit; fi
+ 
+@@ -558,6 +583,22 @@
+     fi
+ fi
+ 
++
++# Check and Set AID for mplayer to use different Audiolines
++if test "$AID" == "AID";then
++ OPTAID=" -aid $AIDLEVEL" 
++ CMDLINE="$CMDLINE $OPTAID"
++fi
++
++# Check for Playlist and add neccessary commandlines 
++if test "$PLS" == "true";then
++ OPTPLS=" -playlist "
++ FILE="$PLSFILE" 
++ CMDLINE="$CMDLINE $OPTPLS"
++fi
++
++#echolog "$CMDLINE"
++
+ debugvar CMDLINE "$CMDLINE"
+ exec $CMDLINE "$FILE"
+ exit

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch	2007-02-14 22:12:34 UTC (rev 4168)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch	2007-02-15 21:31:36 UTC (rev 4169)
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad vdr-plugin-mp3-0.9.15~/data-mp3.c vdr-plugin-mp3-0.9.15/data-mp3.c
 --- vdr-plugin-mp3-0.9.15~/data-mp3.c	2006-04-23 17:41:14.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/data-mp3.c	2006-09-23 18:46:11.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/data-mp3.c	2007-02-15 22:25:50.000000000 +0100
 @@ -36,8 +36,8 @@
  #define di(x) ; 
  #endif
@@ -22,7 +22,7 @@
  const char *img_suff[] = { "jpg","png","gif",0 };
 diff -urNad vdr-plugin-mp3-0.9.15~/data.c vdr-plugin-mp3-0.9.15/data.c
 --- vdr-plugin-mp3-0.9.15~/data.c	2006-05-16 19:31:09.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/data.c	2006-09-23 18:46:11.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/data.c	2007-02-15 22:25:50.000000000 +0100
 @@ -38,7 +38,7 @@
  
  // ----------------------------------------------------------------
@@ -32,9 +32,24 @@
  
  char *Quote(const char *str)
  {
+diff -urNad vdr-plugin-mp3-0.9.15~/debian/mplayer.sh vdr-plugin-mp3-0.9.15/debian/mplayer.sh
+--- vdr-plugin-mp3-0.9.15~/debian/mplayer.sh	2007-02-15 22:25:50.000000000 +0100
++++ vdr-plugin-mp3-0.9.15/debian/mplayer.sh	2007-02-15 22:26:28.000000000 +0100
+@@ -525,9 +525,9 @@
+ if ! test -r "$FILE"; then echolog "*** ERROR: Make sure $FILE exists and is readable - otherwise it cannot be played ;-)"; exit; fi
+ 
+ # Check if config file exists!
+-declare CFGFIL="${0}.conf"
++declare CFGFIL="/etc/vdr/plugins/vdrmplayer.sh.conf"
+ debugvar CFGFIL $CFGFIL
+-if ! test -f $CFGFIL; then echolog "*** FATAL: mplayer.sh.conf not found!!! Exiting." ; exit; fi
++if ! test -f $CFGFIL; then echolog "*** FATAL: $CFGFIL not found!!! Exiting." ; exit; fi
+ 
+ # read config file and initialize the variables
+ initialize
 diff -urNad vdr-plugin-mp3-0.9.15~/player-mplayer.c vdr-plugin-mp3-0.9.15/player-mplayer.c
 --- vdr-plugin-mp3-0.9.15~/player-mplayer.c	2006-09-19 20:17:50.000000000 +0200
-+++ vdr-plugin-mp3-0.9.15/player-mplayer.c	2006-09-23 18:47:43.000000000 +0200
++++ vdr-plugin-mp3-0.9.15/player-mplayer.c	2007-02-15 22:25:50.000000000 +0100
 @@ -47,7 +47,7 @@
  
  #define MPLAYER_VOL_STEP 3.0


