[SCM] vdr-plugin-vdrrip packaging repository branch, master, updated. upstream/0.3.0-7-ga3c8a92
etobi
git at e-tobi.net
Sun Jun 3 09:32:18 UTC 2012
The following commit has been merged in the master branch:
commit c977853e5380bd3ad0fb043d5a5626cea08570b9
Author: etobi <git at e-tobi.net>
Date: Sun Jun 3 10:50:04 2012 +0200
Dropped alle patches - assume they are fixed upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 272abee..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,15 +0,0 @@
-01_Makefile-fPIC-fix
-01_confpathes
-02_maketempdir
-03_greppid2
-05_fix-dvdparameter
-06_fix-ogm-ac3-vdrsync-dev
-07_preserve-queue-owner
-11_fix-identify-aspect
-
-90_APIVERSION.dpatch
-91_vdrrip+dvd-0.3.0-1.3.7
-95_fix_crop
-96_dvdread
-97_gcc4.4
-98_vdr1.7
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.dpatch
deleted file mode 100644
index a9650c5..0000000
--- a/debian/patches/01_Makefile-fPIC-fix.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## Makefile-fPIC-fix patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefile to fix potential FTBFS.
-
- at DPATCH@
-diff -urNad /usr/src/cvs/vdrdevel-plugin-vdrrip/Makefile vdrdevel-plugin-vdrrip/Makefile
---- /usr/src/cvs/vdrdevel-plugin-vdrrip/Makefile Thu Apr 22 20:57:22 2004
-+++ vdrdevel-plugin-vdrrip/Makefile Mon Sep 20 00:29:06 2004
-@@ -19,7 +19,7 @@
- ### The C++ compiler and options:
-
- CXX ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
-
- ### The directory environment:
-
diff --git a/debian/patches/01_confpathes.dpatch b/debian/patches/01_confpathes.dpatch
deleted file mode 100644
index 5c5c3b3..0000000
--- a/debian/patches/01_confpathes.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## confpathes patch by Thomas Günther <@toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Configure pathes in queuehandler.sh.conf.
-
- at DPATCH@
-diff -urNad /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh.conf vdr-plugin-vdrrip/scripts/queuehandler.sh.conf
---- /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh.conf Sat Apr 24 03:43:18 2004
-+++ vdr-plugin-vdrrip/scripts/queuehandler.sh.conf Sat Apr 24 13:07:18 2004
-@@ -33,8 +33,8 @@
-
- # this pathes are used for the encoding of vdr-recordings & dvd's.
- # they _must_ point to an unpatched mencoder & mplayer
-- mencoder="/usr/local/bin/mencoder"
-- mplayer="/usr/local/bin/mplayer"
-+ mencoder="/usr/bin/mencoder"
-+ mplayer="/usr/bin/mplayer"
-
- # this pathes are only used for encoding a vdr-recording with
- # selected ac3-stream.
-@@ -52,11 +52,11 @@
-
-
- # optional tools (only needed for ogm/matroska-container)
-- vdrsync="/usr/local/bin/vdrsync.pl"
-- ffmpeg="/usr/local/bin/ffmpeg"
-- ogmmerge="/usr/local/bin/ogmmerge"
-- ogmsplit="/usr/local/bin/ogmsplit"
-- mkvmerge="/usr/local/bin/mkvmerge"
-+ vdrsync="/usr/bin/vdrsync.pl"
-+ ffmpeg="/usr/bin/ffmpeg"
-+ ogmmerge="/usr/bin/ogmmerge"
-+ ogmsplit="/usr/bin/ogmsplit"
-+ mkvmerge="/usr/bin/mkvmerge"
-
-
-
-@@ -64,7 +64,7 @@
- # from the queuehandler on your tv.
- # You have to specify only $svdrpsend or $netcat.
- # $netcat is only recommend, if perl isn't installed.
-- svdrpsend="/usr/local/bin/svdrpsend.pl"
-+ svdrpsend="/usr/lib/vdr/svdrpsend.pl"
- #netcat=""
-
- vdrhostname="localhost"
diff --git a/debian/patches/02_maketempdir.dpatch b/debian/patches/02_maketempdir.dpatch
deleted file mode 100644
index 022ceb3..0000000
--- a/debian/patches/02_maketempdir.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## maketempdir patch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Create temporary directory.
-
- at DPATCH@
-diff -urNad /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh vdr-plugin-vdrrip/scripts/queuehandler.sh
---- /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh Sat Apr 24 14:44:56 2004
-+++ vdr-plugin-vdrrip/scripts/queuehandler.sh Thu Apr 29 02:18:11 2004
-@@ -92,6 +92,7 @@
- log_error "usage: $scriptname queuefile tempdir" 1
- fi
-
-+ mkdir -p "$tempdir"
- if [ ! -d "$tempdir" ]
- then
- log_error "directory $tempdir doesn't exist, aborting !" 1
-@@ -315,6 +316,11 @@
- #
- if [ "$error" ]; then return
- elif [ "$dvd" ]; then return; fi
-+
-+ # Recreate $tempdir if removed by vdr housekeeping
-+ mkdir -p "$tempdir"
-+ if [ ! -d "$tempdir" ]; then return; fi
-+ cd "$tempdir"
-
- case "$container" in
- "avi")
diff --git a/debian/patches/03_greppid2.dpatch b/debian/patches/03_greppid2.dpatch
deleted file mode 100644
index 129d464..0000000
--- a/debian/patches/03_greppid2.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## greppid2 patch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Detect second running process instead of third.
-
- at DPATCH@
-diff -urNad /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh vdr-plugin-vdrrip/scripts/queuehandler.sh
---- /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh Sat Apr 24 00:53:50 2004
-+++ vdr-plugin-vdrrip/scripts/queuehandler.sh Sat Apr 24 00:56:59 2004
-@@ -90,7 +90,7 @@
-
- local pids=`pgrep -d" " "$scriptname"`
- local pid1=`echo "$pids" | cut -d" " -f1`
-- local pid2=`echo "$pids" | cut -d" " -f3`
-+ local pid2=`echo "$pids" | cut -d" " -f2`
-
- if [ "$pid1" != "$pid2" ]
- then
diff --git a/debian/patches/05_fix-dvdparameter.dpatch b/debian/patches/05_fix-dvdparameter.dpatch
deleted file mode 100644
index 88ebdc0..0000000
--- a/debian/patches/05_fix-dvdparameter.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## fix-dvdparameter patch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change the dvd-parameter to -dvd if the mencoder-version is 0.XX,
-## DP: from http://www.a-land.de (herbert attenberger <herbsl at a-land.de>).
-
- at DPATCH@
-diff -urNad /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh vdr-plugin-vdrrip/scripts/queuehandler.sh
---- /usr/src/cvs/vdr-plugin-vdrrip/scripts/queuehandler.sh Sat Apr 24 14:28:20 2004
-+++ vdr-plugin-vdrrip/scripts/queuehandler.sh Sat Apr 24 14:33:17 2004
-@@ -216,6 +216,17 @@
- mp=$mplayer
- fi
-
-+ # change the dvd-parameter to -dvd if the mencoder-version is 0.XX
-+ if [ "$dvd" ]
-+ then
-+ local menc_ver=`$mc -v 2>/dev/null | grep "MEncoder" | sed "s/^MEncoder \(.\).*/\1/"`
-+ if [ "$menc_ver" = "0" ]
-+ then
-+ dvd=`echo "$dvd" | sed "s/^dvd:\/\//-dvd /"`
-+ fi
-+ log_debug "dvd: $dvd"
-+ fi
-+
- # check needed tools
- case "$container" in
- "avi")
diff --git a/debian/patches/06_fix-ogm-ac3-vdrsync-dev.dpatch b/debian/patches/06_fix-ogm-ac3-vdrsync-dev.dpatch
deleted file mode 100644
index 5dc7567..0000000
--- a/debian/patches/06_fix-ogm-ac3-vdrsync-dev.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## fix-ogm-ac3-vdrsync-dev patch by Thomas Günther <@toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix ogm/ac3: vdrsync 0.1.2.2dev1 creates bd.mpa, not bd.ac3.
-
- at DPATCH@
-diff -urNad /usr/src/cvs/e-tobi/test/scripts/queuehandler.sh test/scripts/queuehandler.sh
---- /usr/src/cvs/e-tobi/test/scripts/queuehandler.sh Sun May 2 21:27:54 2004
-+++ test/scripts/queuehandler.sh Sun May 2 21:29:38 2004
-@@ -360,6 +360,11 @@
- log_info "demuxing all vdr-files from directory $dir"
- evecho "demuxing vdr-files"
- execute "$vdrsync $dir -o $tempdir"
-+ # vdrsync 0.1.2.2 developer version creates bd.mpa
-+ if [ -e "$tempdir/bd.mpa" ]
-+ then
-+ mv "$tempdir/bd.mpa" "$tempdir/bd.ac3"
-+ fi
- fi
- ;;
- *)
diff --git a/debian/patches/07_preserve-queue-owner.dpatch b/debian/patches/07_preserve-queue-owner.dpatch
deleted file mode 100644
index 262f6d8..0000000
--- a/debian/patches/07_preserve-queue-owner.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_preserve-queue-owner.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Preserve owner of queue.vdrrip in queuehandler.sh.
-
- at DPATCH@
---- vdrrip-0.3.0/scripts/queuehandler.sh
-+++ vdrrip-0.3.0/scripts/queuehandler.sh
-@@ -729,8 +729,8 @@
- rm -f "$queuefile"
- else
- let lines=lines-1
-- tail -n $lines "$queuefile" > /tmp/queuefile.tmp
-- mv /tmp/queuefile.tmp $queuefile
-+ cp -a "$queuefile" /tmp/queuefile.tmp
-+ tail -n $lines /tmp/queuefile.tmp > "$queuefile"
- fi
-
- if [ "$error" ]
diff --git a/debian/patches/11_fix-identify-aspect.dpatch b/debian/patches/11_fix-identify-aspect.dpatch
deleted file mode 100644
index 44b6396..0000000
--- a/debian/patches/11_fix-identify-aspect.dpatch
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_fix-identify-aspect.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/vdrrip-0.3.0-fix-identify-aspect.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes problems with newer mplayer versions and with locale settings
-## DP: (see http://vdrportal.de/board/thread.php?threadid=53225
-## DP: and http://vdrportal.de/board/thread.php?threadid=58775)
-
- at DPATCH@
---- vdrrip-0.3.0/movie.c
-+++ vdrrip-0.3.0/movie.c
-@@ -21,8 +21,8 @@
-
- #define SAVEFILE "save.vdrrip"
-
--#define IDENTCMD "%s \'%s\'%s -identify -frames 0 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
--#define CROPCMD "%s \'%s\'%s -vo null -ao null -really-quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
-+#define IDENTCMD "%s \'%s\'%s -identify -frames 1 -vo md5sum:outfile=/dev/null -ao null 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
-+#define CROPCMD "%s \'%s\'%s -vo null -ao null -quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
- #define AUDIOCMD "%s \'%s/001.vdr\' -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
- #define AUDIOCMDDVD "%s %s -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
- #define MENCCMD "%s %s help 2>/dev/null"
-@@ -516,10 +516,34 @@
- FREE(s);
-
- s = strcol(strgrep("ID_VIDEO_ASPECT", p), "=", 2);
-+ if (s && atof(s) == 0.0) { // Workaround for mplayer-1.0rc1: search for second aspect line
-+ s = strcol(strgrep("ID_VIDEO_ASPECT", p), "=", 2);
-+ dsyslog("VDRRIP-FIX: searched for second aspect line: %s", s);
-+ }
- if (s) {
- Aspect = atof(s);
-+ if (Aspect == (double)(int)Aspect) { // Workaround for locale problems
-+ if (strchr(s, '.'))
-+ *strchr(s, '.') = ',';
-+ else if (strchr(s, ','))
-+ *strchr(s, ',') = '.';
-+ dsyslog("VDRRIP-FIX: tried to solve locale problem: %s", s);
-+ Aspect = atof(s);
-+ }
- } else {Aspect = -1;}
-
-+ if (Aspect <= 0.0) { // Workaround for mplayer-1.0pre7
-+ pclose(p);
-+ p = popen(cmd, "r");
-+ if (p && strgrep("(aspect 3)", p)) {
-+ Aspect = 1.7778; // 16:9
-+ dsyslog("VDRRIP-FIX: found (aspect 3) - set aspect to 16:9");
-+ } else {
-+ Aspect = 1.3333; // 4:3
-+ dsyslog("VDRRIP-FIX: (aspect 3) NOT found - set aspect to 4:3");
-+ }
-+ }
-+
- CalcAspect = Aspect;
-
- pclose(p);
---- vdrrip-0.3.0/scripts/queuehandler.sh
-+++ vdrrip-0.3.0/scripts/queuehandler.sh
-@@ -303,8 +303,8 @@
- shortname="$shortname(preview)"
-
- # start the preview in the middle of the movie
-- local length=`"$mp" -identify -frames 0 "$dir/001.vdr" 2>/dev/null | grep ID_LENGTH | cut -d"=" -f2`
-- let local ss=length/2
-+ local length=`"$mp" -vo null -ao null -identify -frames 0 "$dir/001.vdr" 2>/dev/null | grep ID_LENGTH | cut -d"=" -f2`
-+ let local ss=$(echo $length | sed -e s/[.,].*//)/2
- previewval="-ss $ss -endpos $previewlength"
- }
-
-@@ -782,7 +782,7 @@
- -ss $splitpos $endpos -o $tempdir/$ofile"
-
- # detect length of splitted file and add it to $splitpos
-- local length=`$mplayer -identify -frames 0 $tempdir/$ofile 2>/dev/null | \
-+ local length=`$mplayer -vo null -ao null -identify -frames 0 $tempdir/$ofile 2>/dev/null | \
- grep ID_LENGTH | cut -d= -f2`
- let splitpos=splitpos+length-overlap
- let count=count+1
diff --git a/debian/patches/90_APIVERSION.dpatch b/debian/patches/90_APIVERSION.dpatch
deleted file mode 100644
index 2a60f84..0000000
--- a/debian/patches/90_APIVERSION.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
- -patch)
- sed -i -e s/VDRVERSION/APIVERSION/g Makefile
- ;;
- -unpatch)
- sed -i -e s/APIVERSION/VDRVERSION/g Makefile
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/patches/91_vdrrip+dvd-0.3.0-1.3.7.dpatch b/debian/patches/91_vdrrip+dvd-0.3.0-1.3.7.dpatch
deleted file mode 100644
index 641914c..0000000
--- a/debian/patches/91_vdrrip+dvd-0.3.0-1.3.7.dpatch
+++ /dev/null
@@ -1,329 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## vdrrip+dvd-0.3.0-1.3.7 patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change interface of vdrrip for vdr >= 1.3.7 (from Norad at vdrportal.de),
-## DP: change interface of dvd menu, too (Thomas Günther <tom at toms-cafe.de>).
-
- at DPATCH@
-diff -Naur vdrdevel-plugin-vdrrip-0.3.0.orig/menu-vdrrip.c vdrdevel-plugin-vdrrip-0.3.0/menu-vdrrip.c
---- vdrdevel-plugin-vdrrip-0.3.0.orig/menu-vdrrip.c Sat Jun 12 13:46:39 2004
-+++ vdrdevel-plugin-vdrrip-0.3.0/menu-vdrrip.c Sat Jun 12 13:59:53 2004
-@@ -4,6 +4,10 @@
-
- #include <vdr/plugin.h>
- #include <vdr/videodir.h>
-+#if VDRVERSNUM >= 10307
-+#include <vdr/interface.h>
-+#include <vdr/status.h>
-+#endif
-
- #ifdef VDRRIP_DVD
- #include <dvdnav/ifo_read.h>
-@@ -92,14 +96,22 @@
- # ifdef VDRRIP_DVD
-
- cMenuVdrripWarning::cMenuVdrripWarning(const char *Title, const char *Text)
-+#if VDRVERSNUM >= 10307
-+:cMenuText(Title, "")
-+#else
- :cOsdMenu(Title)
-+#endif
- {
- bool warning;
- warning = true;
- //warning = false;
-
- if (warning) {
-+#if VDRVERSNUM >= 10307
-+ SetText(Text);
-+#else
- Add(new cMenuTextItem(Text, 1, 2, Setup.OSDwidth - 2, MAXOSDITEMS, clrWhite, clrBackground, fontOsd));
-+#endif
- SetHelp(tr("back"), tr("accept"), NULL, NULL);
- hadsubmenu = false;
- } else {
-@@ -120,6 +132,22 @@
- if (hadsubmenu) {return osBack;}
-
- switch (Key) {
-+#if VDRVERSNUM >= 10307
-+ // cMenuText::ProcessKey don't handle submenus
-+ case kUp|k_Repeat:
-+ case kUp:
-+ case kDown|k_Repeat:
-+ case kDown:
-+ case kLeft|k_Repeat:
-+ case kLeft:
-+ case kRight|k_Repeat:
-+ case kRight:
-+ DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft,
-+ NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
-+ cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
-+ return osContinue;
-+#endif
-+
- case kRed: return osBack;
-
- case kGreen: {
-@@ -138,13 +166,22 @@
- ifo_handle_t *ifo_zero = NULL;
- ifo_handle_t *ifo_tmp = NULL;
-
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtStatus, tr("checking dvd..."));
-+ Skins.Flush();
-+#else
- Interface->Status(tr("checking dvd..."));
- Interface->Flush();
-+#endif
-
- if (access(DVD, R_OK) == -1) {
- char *s = NULL;
- asprintf(&s, "No read privileges on %s !", DVD);
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, s);
-+#else
- Interface->Error(s);
-+#endif
- FREE(s);
- return false;
- }
-@@ -160,7 +197,11 @@
- else {
- char *s = NULL;
- asprintf(&s, "Can't open ifo %d !", i);
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, s);
-+#else
- Interface->Error(s);
-+#endif
- FREE(s);
- DVDClose(dvd);
- return false;
-@@ -171,14 +212,22 @@
- return true;
- } else {
- DVDClose(dvd);
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, "Can't open main ifo from dvd !");
-+#else
- Interface->Error("Can't open main ifo from dvd !");
-+#endif
- return false;
- }
- }
-
- char *s = NULL;
- asprintf(&s, "Can 't open %s !", DVD);
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, s);
-+#else
- Interface->Error(s);
-+#endif
- FREE(s);
- return false;
- }
-@@ -190,8 +239,13 @@
- cMenuVdrripEncode::cMenuVdrripEncode():cOsdMenu(tr("encode vdr-recording")) {
- R = NULL;
-
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtStatus, tr("scanning recordings..."));
-+ Skins.Flush();
-+#else
- Interface->Status(tr("scanning recordings..."));
- Interface->Flush();
-+#endif
-
- R = new cVdrripRecordings;
- Set();
-@@ -259,7 +313,13 @@
- FREE(s1);
- }
-
-- if (Q->getLockStat()) {Interface->Error(tr("the queuefile is locked by the queuehandler !"));}
-+ if (Q->getLockStat()) {
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, tr("the queuefile is locked by the queuehandler !"));
-+#else
-+ Interface->Error(tr("the queuefile is locked by the queuehandler !"));
-+#endif
-+ }
-
- SetHelpKeys();
- }
-@@ -353,11 +413,13 @@
- }
-
- void cMenuVdrripQueue::AddColItem(cOsdItem *i) {
-+#if VDRVERSNUM < 10307
- #ifdef clrScrolLine
- i->SetColor(clrScrolLine, clrBackground);
- #else
- i->SetColor(clrCyan, clrBackground);
- #endif
-+#endif
-
- Add(i);
- }
-@@ -584,11 +646,13 @@
- }
-
- void cMenuVdrripEditTemplate::AddColItem(cOsdItem *i) {
-+#if VDRVERSNUM < 10307
- #ifdef clrScrolLine
- i->SetColor(clrScrolLine, clrBackground);
- #else
- i->SetColor(clrCyan, clrBackground);
- #endif
-+#endif
-
- Add(i);
- }
-@@ -600,8 +664,13 @@
- MovOSDsaveName = NULL;
- FileSize[0] = MovieData[0] = CropData[0] = ScaleData[0] = NULL;
-
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtStatus, tr("reading movie-data..."));
-+ Skins.Flush();
-+#else
- Interface->Status(tr("reading movie-data..."));
- Interface->Flush();
-+#endif
-
- M = new cMovie(p, n);
- Init();
-@@ -888,8 +957,13 @@
-
- #ifdef VDRRIP_DVD
- } else if (M->isDVD() && MovOSD.Title != MovOSDsave.Title && MovOSD.Title > 0) {
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtStatus, tr("reading audio-data from dvd..."));
-+ Skins.Flush();
-+#else
- Interface->Status(tr("reading audio-data from dvd..."));
- Interface->Flush();
-+#endif
- M->setDVDTitle(MovOSD.Title, true);
- M->saveMovieData();
- Set();
-@@ -1067,7 +1141,13 @@
- FREE(q);
- DELETE(Q);
- return osBack;
-- } else {Interface->Error(tr("the queuefile is locked by the queuehandler !"));}
-+ } else {
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, tr("the queuefile is locked by the queuehandler !"));
-+#else
-+ Interface->Error(tr("the queuefile is locked by the queuehandler !"));
-+#endif
-+ }
-
- FREE(q);
- DELETE(Q);
-@@ -1089,11 +1169,20 @@
- } else {
- if (Interface->Confirm(tr("crop black movie boarders ?"))) {
- CropReset = true;
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtStatus, tr("search for black movie boarders"));
-+ Skins.Flush();
-+#else
- Interface->Status(tr("search for black movie boarders"));
- Interface->Flush();
-+#endif
- if (! M->setCropValues()) {
- CropReset = false;
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, tr("couldn't detect black movie boarders !"));
-+#else
- Interface->Error(tr("couldn't detect black movie boarders !"));
-+#endif
- }
- M->saveMovieData();
- }
-@@ -1133,11 +1222,13 @@
- }
-
- void cMenuVdrripMovie::AddColItem(cOsdItem *i) {
-+#if VDRVERSNUM < 10307
- #ifdef clrScrolLine
- i->SetColor(clrScrolLine, clrBackground);
- #else
- i->SetColor(clrCyan, clrBackground);
- #endif
-+#endif
-
- Add(i);
- }
-@@ -1163,8 +1254,13 @@
- eOSState state = cOsdMenu::ProcessKey(Key);
-
- if (Key == kOk) {
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtStatus, tr("reading audio-data from dvd..."));
-+ Skins.Flush();
-+#else
- Interface->Status(tr("reading audio-data from dvd..."));
- Interface->Flush();
-+#endif
- M->setDVDTitle(Current() + 1, true);
- M->saveMovieData();
- return osBack;
-diff -Naur vdrdevel-plugin-vdrrip-0.3.0.orig/menu-vdrrip.h vdrdevel-plugin-vdrrip-0.3.0/menu-vdrrip.h
---- vdrdevel-plugin-vdrrip-0.3.0.orig/menu-vdrrip.h Sat Jun 12 13:46:39 2004
-+++ vdrdevel-plugin-vdrrip-0.3.0/menu-vdrrip.h Sat Jun 12 13:58:26 2004
-@@ -7,6 +7,10 @@
-
- #include <vdr/osd.h>
- #include <vdr/menuitems.h>
-+#if VDRVERSNUM >= 10307
-+#include <vdr/menu.h>
-+#include <vdr/skins.h>
-+#endif
-
- #include "movie.h"
- #include "vdrriprecordings.h"
-@@ -51,7 +55,12 @@
-
- #ifdef VDRRIP_DVD
-
--class cMenuVdrripWarning : public cOsdMenu {
-+class cMenuVdrripWarning
-+#if VDRVERSNUM >= 10307
-+ : public cMenuText {
-+#else
-+ : public cOsdMenu {
-+#endif
- private:
- bool hadsubmenu;
-
-diff -Naur vdrdevel-plugin-vdrrip-0.3.0.orig/vdrrip.c vdrdevel-plugin-vdrrip-0.3.0/vdrrip.c
---- vdrdevel-plugin-vdrrip-0.3.0.orig/vdrrip.c Sat Jun 12 13:46:39 2004
-+++ vdrdevel-plugin-vdrrip-0.3.0/vdrrip.c Sat Jun 12 13:47:56 2004
-@@ -132,13 +132,21 @@
- if (access(MPlayer, X_OK) == -1) {
- char *s = NULL;
- asprintf(&s, "%s doesn't exist or isn't a executable !", MPlayer);
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, s);
-+#else
- Interface->Error(s);
-+#endif
- FREE(s);
- return NULL;
- } else if (access(MEncoder, X_OK) == -1) {
- char *s = NULL;
- asprintf(&s, "%s doesn't exist or isn't a executable !", MEncoder);
-+#if VDRVERSNUM >= 10307
-+ Skins.Message(mtError, s);
-+#else
- Interface->Error(s);
-+#endif
- FREE(s);
- return NULL;
- } else return new cMenuVdrrip();
diff --git a/debian/patches/95_fix_crop.dpatch b/debian/patches/95_fix_crop.dpatch
deleted file mode 100644
index 9e62c0b..0000000
--- a/debian/patches/95_fix_crop.dpatch
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## mencoder cropping bug workaround by Stefan Wagner (Wilderigel)
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a problem with mencoders -vop option. -vf is used now.
-
- at DPATCH@
-diff -urNad vdr-plugin-vdrrip-0.3.0~/movie.c vdr-plugin-vdrrip-0.3.0/movie.c
---- vdr-plugin-vdrrip-0.3.0~/movie.c 2007-06-10 17:10:38.000000000 +0200
-+++ vdr-plugin-vdrrip-0.3.0/movie.c 2007-06-10 17:10:38.000000000 +0200
-@@ -22,7 +22,7 @@
- #define SAVEFILE "save.vdrrip"
-
- #define IDENTCMD "%s \'%s\'%s -identify -frames 1 -vo md5sum:outfile=/dev/null -ao null 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
--#define CROPCMD "%s \'%s\'%s -vo null -ao null -quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
-+#define CROPCMD "%s \'%s\'%s -vo null -ao null -quiet -ss %i -frames %i -vf cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
- #define AUDIOCMD "%s \'%s/001.vdr\' -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
- #define AUDIOCMDDVD "%s %s -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
- #define MENCCMD "%s %s help 2>/dev/null"
-diff -urNad vdr-plugin-vdrrip-0.3.0~/scripts/queuehandler.sh vdr-plugin-vdrrip-0.3.0/scripts/queuehandler.sh
---- vdr-plugin-vdrrip-0.3.0~/scripts/queuehandler.sh 2007-06-10 17:10:38.000000000 +0200
-+++ vdr-plugin-vdrrip-0.3.0/scripts/queuehandler.sh 2007-06-10 17:10:38.000000000 +0200
-@@ -465,7 +465,7 @@
- ;;
- esac
-
-- # set mencoder -vop values
-+ # set mencoder -vf values
- if [ "$crop_w" = "-1" -a "$crop_h" = "-1" -a "$crop_x" = "-1" -a \
- "$crop_y" = "-1" -a "$scale_w" = "-1" -a "$scale_h" = "-1" ]
- then
-@@ -475,15 +475,15 @@
- then
- local vopopts="scale=$scale_w:$scale_h"
- else
-- local vopopts="scale=$scale_w:$scale_h,crop=$crop_w:$crop_h:$crop_x:$crop_y"
-+ local vopopts="crop=$crop_w:$crop_h:$crop_x:$crop_y,scale=$scale_w:$scale_h"
- fi
-
- if [ "$ppvalues" ]
- then
-- local vopopts="-vop pp=$ppvalues,$vopopts"
-+ local vopopts="-vf pp=$ppvalues,$vopopts"
- elif [ "$vopopts" ]
- then
-- local vopopts="-vop $vopopts"
-+ local vopopts="-vf $vopopts"
- fi
-
- # encode in two passes
diff --git a/debian/patches/96_dvdread.dpatch b/debian/patches/96_dvdread.dpatch
deleted file mode 100644
index d8c8ae0..0000000
--- a/debian/patches/96_dvdread.dpatch
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 96_dvdread.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-vdrrip-0.3.0~/Makefile vdr-plugin-vdrrip-0.3.0/Makefile
---- vdr-plugin-vdrrip-0.3.0~/Makefile 2008-07-25 01:47:38.000000000 +0200
-+++ vdr-plugin-vdrrip-0.3.0/Makefile 2008-07-25 01:51:00.000000000 +0200
-@@ -45,7 +45,12 @@
-
- INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
-
--DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D__STDC_LIMIT_MACROS
-+
-+NEW_IFO_READ := $(wildcard /usr/include/dvdread/ifo_read.h)
-+ifneq ($(strip $(NEW_IFO_READ)),)
-+ DEFINES += -DNEW_IFO_READ
-+endif
-
- ### The object files (add further files here):
-
-diff -urNad vdr-plugin-vdrrip-0.3.0~/menu-vdrrip.c vdr-plugin-vdrrip-0.3.0/menu-vdrrip.c
---- vdr-plugin-vdrrip-0.3.0~/menu-vdrrip.c 2008-07-25 01:47:38.000000000 +0200
-+++ vdr-plugin-vdrrip-0.3.0/menu-vdrrip.c 2008-07-25 01:53:10.000000000 +0200
-@@ -10,7 +10,13 @@
- #endif
-
- #ifdef VDRRIP_DVD
-+#ifdef NEW_IFO_READ
-+ #include <stdint.h>
-+ #include <dvdread/ifo_read.h>
-+ #include <dvdread/ifo_types.h>
-+#else
- #include <dvdnav/ifo_read.h>
-+#endif
- #endif //VDRRIP_DVD
-
- #include "menu-vdrrip.h"
-diff -urNad vdr-plugin-vdrrip-0.3.0~/movie.c vdr-plugin-vdrrip-0.3.0/movie.c
---- vdr-plugin-vdrrip-0.3.0~/movie.c 2008-07-25 01:47:38.000000000 +0200
-+++ vdr-plugin-vdrrip-0.3.0/movie.c 2008-07-25 01:52:59.000000000 +0200
-@@ -8,7 +8,13 @@
- #include <math.h>
-
- #ifdef VDRRIP_DVD
-+#ifdef NEW_IFO_READ
-+ #include <stdint.h>
-+ #include <dvdread/ifo_read.h>
-+ #include <dvdread/ifo_types.h>
-+#else
- #include <dvdnav/ifo_read.h>
-+#endif
- #endif //VDRRIP_DVD
-
- #include <vdr/plugin.h>
diff --git a/debian/patches/97_gcc4.4.dpatch b/debian/patches/97_gcc4.4.dpatch
deleted file mode 100644
index f5dbbb0..0000000
--- a/debian/patches/97_gcc4.4.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 97_gcc4.4.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-plugin-vdrrip-0.3.0~/a-tools.c vdr-plugin-vdrrip-0.3.0/a-tools.c
---- vdr-plugin-vdrrip-0.3.0~/a-tools.c 2004-02-04 19:15:28.000000000 +0100
-+++ vdr-plugin-vdrrip-0.3.0/a-tools.c 2009-11-11 21:57:24.000000000 +0100
-@@ -70,7 +70,7 @@
- }
-
- int strnumcol(const char *s, char *d) {
-- char *s1;
-+ const char *s1;
- int i, l;
-
- // let's do some checks:
diff --git a/debian/patches/98_vdr1.7.dpatch b/debian/patches/98_vdr1.7.dpatch
deleted file mode 100644
index 06058e5..0000000
--- a/debian/patches/98_vdr1.7.dpatch
+++ /dev/null
@@ -1,311 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 98_vdr1.7.dpatch by Daniel Meyerholt <dxm523 at googlemail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -Nur vdr-plugin-vdrrip-0.3.0/movie.c vdr-plugin-vdrrip-0.3.0-vdr-1.7//movie.c
---- vdr-plugin-vdrrip-0.3.0/movie.c 2011-01-01 17:15:06.505600001 +0100
-+++ vdr-plugin-vdrrip-0.3.0-vdr-1.7//movie.c 2011-01-01 18:37:41.670600001 +0100
-@@ -29,8 +29,9 @@
-
- #define IDENTCMD "%s \'%s\'%s -identify -frames 1 -vo md5sum:outfile=/dev/null -ao null 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
- #define CROPCMD "%s \'%s\'%s -vo null -ao null -quiet -ss %i -frames %i -vf cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
--#define AUDIOCMD "%s \'%s/001.vdr\' -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
--#define AUDIOCMDDVD "%s %s -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
-+#define AUDIOPID "%s \'%s/00001.ts\' -vo null -ao null -frames 0 2>/dev/null | grep pid | cut -d \')\' -f2 | cut -d \'=\' -f 2"
-+#define AUDIOCMD "%s \'%s/00001.ts\' -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep ^AUDIO"
-+#define AUDIOCMDDVD "%s %s -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep ^AUDIO"
- #define MENCCMD "%s %s help 2>/dev/null"
-
- // --- cMovie ------------------------------------------------------------
-@@ -296,7 +297,7 @@
- int l1;
-
- if (Dvd) {asprintf(&cmd, IDENTCMD, MPlayer, Dir, "");
-- } else {asprintf(&cmd, IDENTCMD, MPlayer, Dir, "/001.vdr");}
-+ } else {asprintf(&cmd, IDENTCMD, MPlayer, Dir, "/00001.ts");}
-
- FILE *p = popen(cmd, "r");
- if (p) {
-@@ -316,8 +317,8 @@
- asprintf(&cmd, CROPCMD, MPlayer, Dir, "", l/2, l1);
- isyslog("[vdrrip] detecting crop values in %s", Dir);
- } else {
-- asprintf(&cmd, CROPCMD, MPlayer, Dir, "/001.vdr", l/2, l1);
-- isyslog("[vdrrip] detecting crop values in %s/001.vdr", Dir);
-+ asprintf(&cmd, CROPCMD, MPlayer, Dir, "/00001.ts", l/2, l1);
-+ isyslog("[vdrrip] detecting crop values in %s/00001.ts", Dir);
- }
- p = popen(cmd, "r");
- FREE(cmd);
-@@ -481,7 +482,7 @@
- void cMovie::setLengthVDR() {
- char *file = NULL;
-
-- asprintf(&file, "%s/index.vdr", Dir);
-+ asprintf(&file, "%s/index", Dir);
- FILE *f = fopen(file, "r");
- if (f) {
- fseek(f, 0, SEEK_END);
-@@ -500,7 +501,7 @@
- void cMovie::queryMpValuesVDR() {
- char *cmd = NULL, *s = NULL;
-
-- asprintf(&cmd, IDENTCMD, MPlayer, Dir, "/001.vdr");
-+ asprintf(&cmd, IDENTCMD, MPlayer, Dir, "/00001.ts");
- FILE *p = popen(cmd, "r");
- if (p) {
- s = strcol(strgrep("ID_VIDEO_WIDTH", p), "=", 2);
-@@ -564,7 +565,18 @@
- char *cmd = NULL, *buf = NULL;
- size_t i = 0;
- int n = 0;
-+
-+ // Get Audio PID
-+ asprintf(&cmd, AUDIOPID, MPlayer, Dir);
-+ FILE *apid = popen(cmd,"r");
-+ isyslog ("Getting Audio PID of ts: %s",cmd);
- int c = 0;
-+ if (apid && getline(&buf,&i,apid) != -1) {
-+ c = atoi (buf);
-+ }
-+ pclose(apid);
-+ isyslog("Pid selected : %i",c);
-+
- bool next = true;
-
- while (next) {
-@@ -572,7 +584,7 @@
- FILE *p = popen(cmd, "r");
- if (p) {
- if (getline(&buf, &i, p) != -1) {
-- if (c == 128) {next = false;}
-+ if (c == 255) {next = false;}
- A = (struct AudioData*)realloc(A, (n + 1) * sizeof(struct AudioData));
-
- A[n].AudioID = c;
-diff -Nur vdr-plugin-vdrrip-0.3.0/scripts/queuehandler.sh vdr-plugin-vdrrip-0.3.0-vdr-1.7//scripts/queuehandler.sh
---- vdr-plugin-vdrrip-0.3.0/scripts/queuehandler.sh 2011-01-01 17:15:06.496600001 +0100
-+++ vdr-plugin-vdrrip-0.3.0-vdr-1.7//scripts/queuehandler.sh 2011-01-01 18:39:34.009600002 +0100
-@@ -202,7 +202,7 @@
- if [ "$error" ]; then return; fi
-
- # check mplayer/mencoder
-- if [ ! "$dvd" -a $audio_id -ge 128 ]
-+ if [ ! "$dvd" -a $audio_id -eq 128 ]
- then
- # encoding a vdr-recording with selected ac3-stream
- check_exe "$mencoder_ac3" "mencoder_ac3="
-@@ -236,7 +236,7 @@
- fi
- ;;
- "ogm")
-- check_exe "$vdrsync" "vdrsync="
-+ check_exe "$projectx" "projectx="
- check_exe "$ogmmerge" "ogmmerge="
-
- if [ "$acodec" = "lame" -o "$acodec" = "ogg-vorbis" ]
-@@ -250,7 +250,7 @@
- fi
- ;;
- "matroska")
-- check_exe "$vdrsync" "vdrsync="
-+ check_exe "$projectx" "projectx="
- check_exe "$mkvmerge" "mkvmerge="
-
- if [ "$acodec" = "lame" -o "$acodec" = "ogg-vorbis" ]
-@@ -285,11 +285,11 @@
- "avi")
- let steps=steps-4
- if [ "$dvd" ]; then let steps=steps-1
-- elif [ ! -e "$dir/002.vdr" ]; then let steps=steps-1; fi
-+ elif [ ! -e "$dir/00002.ts" ]; then let steps=steps-1; fi
- ;;
- "ogm")
- let steps=steps-2
-- if [ "$acodec" = "copy" -a $audio_id -ge 128 ]
-+ if [ "$acodec" = "copy" -a $audio_id -eq 128 ]
- then
- let steps=steps-1
- fi
-@@ -315,7 +315,7 @@
- shortname="$shortname(preview)"
-
- # start the preview in the middle of the movie
-- local length=`"$mp" -vo null -ao null -identify -frames 0 "$dir/001.vdr" 2>/dev/null | grep ID_LENGTH | cut -d"=" -f2`
-+ local length=`"$mp" -vo null -ao null -identify -frames 0 "$dir/00001.ts" 2>/dev/null | grep ID_LENGTH | cut -d"=" -f2`
- let local ss=$(echo $length | sed -e s/[.,].*//)/2
- previewval="-ss $ss -endpos $previewlength"
- }
-@@ -336,24 +336,24 @@
- case "$container" in
- "avi")
- # join all vdr-files to $tempdir/temp.vdr
-- if [ -e "$dir/002.vdr" -a "$preview" != "1" ]
-+ if [ -e "$dir/00002.ts" -a "$preview" != "1" ]
- then
- log_info "joining all vdr-files from directory $dir"
- evecho "joining vdr-files"
-- nice -+19 cat $dir/[0-9][0-9][0-9].vdr > "$tempdir/temp.vdr"
-+ nice -+19 cat $dir/[0-9][0-9][0-9][0-9][0-9].ts > "$tempdir/temp.vdr"
- else
- create_symbolic_link
- fi
- ;;
- "ogm"|"matroska")
-- # demux vdr-recording with vdrsync
-+ # demux vdr-recording with projectx
- if [ "$preview" = "1" ]
- then
- create_symbolic_link
- else
- log_info "demuxing all vdr-files from directory $dir"
- evecho "demuxing vdr-files"
-- execute "$vdrsync $dir -o $tempdir"
-+ execute "$projectx -demux $dir/0*.ts -out $tempdir"
- # vdrsync 0.1.2.2 developer version creates bd.mpa
- if [ -e "$tempdir/bd.mpa" ]
- then
-@@ -369,19 +369,19 @@
-
- function create_symbolic_link() {
- #
--# creates a symbolic link of 001.vdr to $temdir/temp.vdr
-+# creates a symbolic link of 00001.ts to $temdir/temp.vdr
- #
- if [ "$error" ]; then return
- elif [ "$dvd" ]; then return; fi
-
-- log_info "create a symbolic link from $dir/001.vdr to $tempdir/temp.vdr"
-- ln -s "$dir/001.vdr" "$tempdir/temp.vdr"
-+ log_info "create a symbolic link from $dir/00001.ts to $tempdir/temp.vdr"
-+ ln -s "$dir/00001.ts" "$tempdir/temp.vdr"
-
- if [ ! -e "$tempdir/temp.vdr" ]
- then
- log_info "could not create a symolic link"
-- log_info "try to copy $dir/001.vdr to $tempdir/temp.vdr"
-- execute "cp $dir/001.vdr $tempdir/temp.vdr"
-+ log_info "try to copy $dir/00001.ts to $tempdir/temp.vdr"
-+ execute "cp $dir/00001.ts $tempdir/temp.vdr"
- fi
- }
-
-@@ -439,7 +439,7 @@
- # convert mp2-files to ac3, because
- # mp2 isn't supported by ogm
- if [ "$dvd" ]; then dump_audio_mplayer; fi
-- if [ $audio_id -lt 128 ]; then encode_ffmpeg; fi
-+ if [ $audio_id -ge 129 ]; then encode_ffmpeg; fi
- ;;
- *)
- log_error "unknown audio codec $acodec"
-@@ -525,22 +525,22 @@
- # no dvd, ogm/matroska container
-
- # search for the first video-file
-- local num=0
-+ local num=1
- while [ ! "$ifile" ]
- do
-- if [ ! -e "$tempdir/e$num.mpv" ]
-+ if [ ! -e "$tempdir/0000$num.m2v" ]
- then
-- log_info "video-file $tempdir/e$num.mpv not found !"
-+ log_info "video-file $tempdir/0000$num.m2v not found !"
- if [ $num -ge 9 ]
- then
-- log_error "no video-stream found !"
-+ log_error "no video-stream found ! $num"
- # exit loop
- local ifile="dummy"
- fi
- let num=num+1
- else
-- log_info "video-file $tempdir/e$num.mpv found !"
-- local ifile="$tempdir/e$num.mpv"
-+ log_info "video-file $tempdir/0000$num.m2v found !"
-+ local ifile="$tempdir/0000$num.m2v"
- fi
- done
- fi
-@@ -584,24 +584,27 @@
- if [ "$error" ]; then return
- elif [ "$preview" = "1" ]; then return; fi
-
-- if [ $audio_id -ge 128 ]
-+ if [ $audio_id -eq 128 ]
- then
- local ifile="$tempdir/bd.ac3"
- else
-- local ifile="$tempdir/c$audio_id.mpa"
-+ local ifile="$tempdir/00001.mp2"
- local forceinput="-f mp3"
- fi
-
- case "$acodec" in
- "lame")
- local filetype="mp3"
-+ local filecodec="libmp3lame"
- ;;
- "ogg-vorbis")
- local filetype="ogg"
-+ local filecodec="libvorbis"
- ;;
- "copy")
- log_info "ogm doesn't support mp2 audio-streams, i will convert it into ac3"
- local filetype="ac3"
-+ local filecodec="ac3"
- ;;
- *)
- ;;
-@@ -609,7 +612,7 @@
-
- log_info "converting $ifile into $filetype-format"
- evecho "conv. audio into $filetype-format"
-- execute "$ffmpeg -hq -y $forceinput -i $ifile -ab $br_audio $tempdir/c$audio_id.$filetype"
-+ execute "$ffmpeg -y $forceinput -i $ifile -ab ${br_audio}k -acodec $filecodec $tempdir/c$audio_id.$filetype"
- }
-
-
-@@ -642,7 +645,7 @@
- local afile="$tempdir/c$audio_id.ogg"
- ;;
- "copy")
-- if [ $audio_id -ge 128 ]
-+ if [ $audio_id -eq 128 ]
- then
- # ac3
- local afile="$tempdir/bd.ac3"
-@@ -683,13 +686,11 @@
- then
- rm -f "$tempdir/$name.avi"
- fi
-- rm -f "$tempdir"/e[0-9].mpv
-- rm -f "$tempdir"/c[0-9].mpa
-- rm -f "$tempdir"/c[0-9].mp3
-- rm -f "$tempdir"/c[0-9].ogg
-- rm -f "$tempdir"/c[0-9].ac3
-- rm -f "$tempdir"/c[0-9][0-9][0-9].mp3
-- rm -f "$tempdir"/c[0-9][0-9][0-9].ogg
-+ rm -f "$tempdir"/[0-9][0-9][0-9][0-9][0-9].m2v
-+ rm -f "$tempdir"/[0-9][0-9][0-9][0-9][0-9].mp2
-+ rm -f "$tempdir"/c*.mp3
-+ rm -f "$tempdir"/c*.ogg
-+ rm -f "$tempdir"/c*.ac3
- rm -f "$tempdir"/bd.ac3
-
- # temp. queuehandler-files
-diff -Nur vdr-plugin-vdrrip-0.3.0/scripts/queuehandler.sh.conf vdr-plugin-vdrrip-0.3.0-vdr-1.7//scripts/queuehandler.sh.conf
---- vdr-plugin-vdrrip-0.3.0/scripts/queuehandler.sh.conf 2011-01-01 17:15:06.427600001 +0100
-+++ vdr-plugin-vdrrip-0.3.0-vdr-1.7//scripts/queuehandler.sh.conf 2011-01-01 18:40:53.905600001 +0100
-@@ -53,6 +53,7 @@
-
- # optional tools (only needed for ogm/matroska-container)
- vdrsync="/usr/bin/vdrsync.pl"
-+ projectx="/usr/bin/projectx"
- ffmpeg="/usr/bin/ffmpeg"
- ogmmerge="/usr/bin/ogmmerge"
- ogmsplit="/usr/bin/ogmsplit"
--
vdr-plugin-vdrrip packaging repository
More information about the pkg-vdr-dvb-changes
mailing list