Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[vdr] vdrconvert ntsc patch for cvs (12-29-04)
I thought I would share my patch for vdrconvert and NTSC compatibility.
This should apply to todays copy of cvs for vdrconvert. Also take
note to convert all the bitmaps found in the vdrconvert source tree to
704x480 (which is not included in this email). Please let me know if
you find any bugs. :)
BTW, this patched install.sh expects the following new ntsc directory
with the *.pnm files in it (converted to 704x480).
Example:
cp vdrconvert/share/vdrconvert/images/pal/*.pnm
vdrconvert/share/vdrconvert/images/ntsc/
Regards,
C.Y.M.
N.B. Known bug with vdr2divx.sh which causes A/V desync because it has
tcmplex hard coded. To do, convert vdr2divx.sh over to use mplex
instead of tcmplex.
diff -ru vdrconvert/bin/burn.sh vdrconvert.ntsc/bin/burn.sh
--- vdrconvert/bin/burn.sh 2004-11-10 07:18:43.000000000 -0800
+++ vdrconvert.ntsc/bin/burn.sh 2004-12-29 01:34:05.000000000 -0800
@@ -53,27 +53,27 @@
# Options
[ -z "$DVDPLUS_RECORD_OPTS" ] && DVDPLUS_RECORD_OPTS="-Z"
[ -z "$DVDMIN_RECORD_OPTS" ] && DVDMIN_RECORD_OPTS="-dao driveropts=burnfree"
-[ -z "$DVD_RECORDCMD" ] && DVD_RECORDCMD="sudo growisofs"
-[ -z "$DVDMIN_RECORDCMD" ] && DVDMIN_RECORDCMD="sudo dvdrecord"
-[ -z "$DAO_RECORDCMD" ] && DAO_RECORDCMD="sudo cdrdao"
-[ -z "$CD_RECORDCMD" ] && CD_RECORDCMD="sudo cdrecord"
-[ -z "$MEDIA_RW_FORMAT" ] && MEDIA_RW_FORMAT="yes"
-[ -z "$DVDPLUS_BLANK_CMD" ] && DVDPLUS_BLANK_CMD="sudo dvd+rw-format -f"
-[ -z "$DVDMIN_BLANK_CMD" ] && DVDMIN_BLANK_CMD="sudo dvdrecord -dao blank=fast"
-[ -z "$DVDSTATUSPRG" ] && DVDSTATUSPRG="sudo dvd+rw-mediainfo"
+[ -z "$DVD_RECORDCMD" ] && DVD_RECORDCMD="growisofs"
+[ -z "$DVDMIN_RECORDCMD" ] && DVDMIN_RECORDCMD="dvdrecord"
+[ -z "$DAO_RECORDCMD" ] && DAO_RECORDCMD="cdrdao"
+[ -z "$CD_RECORDCMD" ] && CD_RECORDCMD="cdrecord"
+[ -z "$MEDIA_RW_FORMAT" ] && MEDIA_RW_FORMAT="no"
+[ -z "$DVDPLUS_BLANK_CMD" ] && DVDPLUS_BLANK_CMD="dvd+rw-format -f"
+[ -z "$DVDMIN_BLANK_CMD" ] && DVDMIN_BLANK_CMD="dvdrecord -dao blank=fast"
+[ -z "$DVDSTATUSPRG" ] && DVDSTATUSPRG="dvd+rw-mediainfo"
[ -z "$DAO_OPTS" ] && DAO_OPTS="--driver generic-mmc --overburn"
[ -z "$CD_OPTS" ] && CD_OPTS="driveropts=dao gracetime=0"
[ -z "$BURN_MAXRETRY" ] && BURN_MAXRETRY=3
-[ -z "$BURN_DISABLE_EJECT" ] && BURN_DISABLE_EJECT="no"
+[ -z "$BURN_DISABLE_EJECT" ] && BURN_DISABLE_EJECT="yes"
# DVD-SVDRPSEND MESSAGES
-[ -z "$MEDIA_MSG_OK" ] && MEDIA_MSG_OK="Medium wurde erfolgreich erstellt"
-[ -z "$MEDIA_MSG_ERROR" ] && MEDIA_MSG_ERROR="Fehler beim Schreibvorgang"
-[ -z "$MEDIA_MSG_INSERT_CD" ] && MEDIA_MSG_INSERT_CD="Bitte legen sie ein CD Medium ein"
-[ -z "$MEDIA_MSG_INSERT_DVD" ] && MEDIA_MSG_INSERT_DVD="Bitte legen sie ein DVD Medium ein"
-[ -z "$MEDIA_MSG_START_FORMAT" ] && MEDIA_MSG_START_FORMAT="Medium wird geloescht"
-[ -z "$MEDIA_MSG_ISO_READYTOBURN" ] && MEDIA_MSG_ISO_READYTOBURN="Isodatei ist fertig zum Brennen"
-[ -z "$MEDIA_MSG_START_WRITE_IMAGE" ] && MEDIA_MSG_START_WRITE_IMAGE="Imagedatei wird gebrannt"
-[ -z "$MEDIA_MSG_RETRY_IN_X_MINUTES" ] && MEDIA_MSG_RETRY_IN_X_MINUTES="Wiederholung in 5 Minuten"
+[ -z "$MEDIA_MSG_OK" ] && MEDIA_MSG_OK="Media was successfully detected"
+[ -z "$MEDIA_MSG_ERROR" ] && MEDIA_MSG_ERROR="Failure to write"
+[ -z "$MEDIA_MSG_INSERT_CD" ] && MEDIA_MSG_INSERT_CD="Please insert CD"
+[ -z "$MEDIA_MSG_INSERT_DVD" ] && MEDIA_MSG_INSERT_DVD="Please insert DVD"
+[ -z "$MEDIA_MSG_START_FORMAT" ] && MEDIA_MSG_START_FORMAT="Beginning to format medium"
+[ -z "$MEDIA_MSG_ISO_READYTOBURN" ] && MEDIA_MSG_ISO_READYTOBURN="ISO ready to burn"
+[ -z "$MEDIA_MSG_START_WRITE_IMAGE" ] && MEDIA_MSG_START_WRITE_IMAGE="Starting to write image"
+[ -z "$MEDIA_MSG_RETRY_IN_X_MINUTES" ] && MEDIA_MSG_RETRY_IN_X_MINUTES="Retry in 5 minutes"
[ -d $BURN_DESTDIR ] || mkdir -p $BURN_DESTDIR
[ -d $TEMPDIR ] || mkdir -p $TEMPDIR
@@ -105,7 +105,7 @@
POSTACTION=`echo $CMDLIN|cut -f3 -d ':'`
if [ ! -r $DATA ]
then
- echo "ERROR : $DATA kann nicht gelesen werden"
+ echo "ERROR : $DATA can not be read"
Exit
fi
echo "`date` : Start burning session for $CMDLIN"
diff -ru vdrconvert/bin/dvd2one.sh vdrconvert.ntsc/bin/dvd2one.sh
--- vdrconvert/bin/dvd2one.sh 2004-09-30 07:28:25.000000000 -0700
+++ vdrconvert.ntsc/bin/dvd2one.sh 2004-12-29 01:34:05.000000000 -0800
@@ -5,11 +5,11 @@
MKISOFS=mkisofs
DVDAUTHOR=dvdauthor
DVDBACKUP=dvdbackup
-DVD_DEVICE=/dev/hdb
+DVD_DEVICE=/dev/hdc
DVD_BACKUP_TARGET=/film/dvdbackup
DVD_TITLE=1
-[ -z "$DVDTRANSCODEOPTS" ] && DVDTRANSCODEOPTS="-I 3 -V -y mpeg -Z 720x576 -b 192"
+[ -z "$DVDTRANSCODEOPTS" ] && DVDTRANSCODEOPTS="-I 3 -V -y mpeg -Z 704x480 -b 192"
[ -z "$DVDTRANSCODEBITRATE" ] && DVDTRANSCODEBITRATE="15000000.0"
[ -z "$DVDTCMPLEXOPTS" ] && DVDTCMPLEXOPTS="-m d"
[ -z "$DVDMKISOFSOPTS" ] && DVDMKISOFSOPTS="-V VDR2DVD_`date +"%d-%m-%Y"`"
diff -ru vdrconvert/bin/grab.sh vdrconvert.ntsc/bin/grab.sh
--- vdrconvert/bin/grab.sh 2004-10-19 06:55:18.000000000 -0700
+++ vdrconvert.ntsc/bin/grab.sh 2004-12-29 01:34:05.000000000 -0800
@@ -7,6 +7,6 @@
homedir=`cat /etc/passwd|grep "^${vco_user}:"|cut -f6 -d ':'`
. $homedir/.vdrconvert/vdrconvert.env
-#printf "%s GRAB '%s/%s' %s %d %d %d" "$SVDRPSEND" "${2}" "${1}" "pnm" 100 720 576|at -c now
-printf "GRAB '%s/%s' %s %d %d %d" "${2}" "${1}" "pnm" 100 720 576|xargs "$SVDRPSEND" >/tmp/vdrgrab 2>&1 &
+#printf "%s GRAB '%s/%s' %s %d %d %d" "$SVDRPSEND" "${2}" "${1}" "pnm" 100 704 480|at -c now
+printf "GRAB '%s/%s' %s %d %d %d" "${2}" "${1}" "pnm" 100 704 480|xargs "$SVDRPSEND" >/tmp/vdrgrab 2>&1 &
logger "`cat /tmp/vdrgrab`"
diff -ru vdrconvert/bin/vdr2ac3.sh vdrconvert.ntsc/bin/vdr2ac3.sh
--- vdrconvert/bin/vdr2ac3.sh 2004-11-10 07:22:50.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2ac3.sh 2004-12-29 01:34:05.000000000 -0800
@@ -151,7 +151,7 @@
px)
# Virtuellen X-Server starten
#$XVFB :1.0 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
[ -d $j ] && pxfiles=$j/[0-9][0-9][0-9].vdr || pxfiles=$j
for l in $vdrfiles
@@ -193,7 +193,7 @@
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
#$XVFB :1.0 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
diff -ru vdrconvert/bin/vdr2divx.sh vdrconvert.ntsc/bin/vdr2divx.sh
--- vdrconvert/bin/vdr2divx.sh 2004-12-21 04:33:49.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2divx.sh 2004-12-29 01:34:05.000000000 -0800
@@ -162,13 +162,13 @@
fi
;;
vdrsync2)
- printf "`date +"%T"`\t: Start ${VDRSYNC}\n"
+ printf "`date +"%T"`\t: Start ${VDRSYNC2}\n"
nice -n $PRIO $VDRSYNC2 -basename 001 -script-output $VDRSYNC_OPTS -o ${UniqueDir[Number]} $j > ${LOG[Number]} 2>&1
status=$?
[ "$DIVX_DEBUG" = "yes" ] && cat ${LOG[Number]} >> $LOGFILE
if [ $status -ne 0 ]
then
- echo "ERROR : $VDRSYNC rc=$status"
+ echo "ERROR : $VDRSYNC2 rc=$status"
# Cleaning
cd $VDRCONVERTDIR
$RM -rf ${UniqueDir[Number]}
@@ -178,7 +178,7 @@
px)
# Virtuellen X-Server starten
#$XVFB :1 >/dev/null 2>&1 &
- export DISPLAY=:1.0
+ export DISPLAY=:0.0
[ -d $j ] && vdrfiles=$j/[0-9][0-9][0-9].vdr || vdrfiles=$j
for l in $vdrfiles
@@ -230,7 +230,7 @@
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
#$XVFB :1 >/dev/null 2>&1 &
- export DISPLAY=:1.0
+ export DISPLAY=:0.0
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
status=$?
diff -ru vdrconvert/bin/vdr2dvd.sh vdrconvert.ntsc/bin/vdr2dvd.sh
--- vdrconvert/bin/vdr2dvd.sh 2004-12-20 01:31:17.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2dvd.sh 2004-12-29 01:34:05.000000000 -0800
@@ -104,16 +104,16 @@
# set mplex tool.
# (migration from USE_ to MULTIPLEXER)
if [ -z "$MULTIPLEXER" ]; then
- MULTIPLEXER="tcmplex" # Default
+ MULTIPLEXER="mplex" # Default
if [ "$USE_DVBMPLEX" = "yes" ]
then
- MULTIPLEXER="dvb_mplex"
+ MULTIPLEXER="dvb-mplex"
elif [ "$USE_TCMPLEX_PANTELTJE" = "yes" ]
then
MULTIPLEXER="tcmplex_panteltje"
- elif [ "$USE_MPLEX" = "yes" ]
+ elif [ "$USE_TCMPLEX" = "yes" ]
then
- MULTIPLEXER="mplex"
+ MULTIPLEXER="tcmplex"
fi
fi
@@ -125,8 +125,8 @@
# No transcode for this values
[ -z "$DVDALLOWEDWIDTH" ] && DVDALLOWEDWIDTH="720 704 352 480"
# more options
-[ -z "$DVDTRANSCODEOPTS" ] && DVDTRANSCODEOPTS="-I 3 -y mpeg2enc,null -Z 720x576 -b 192"
-#[ -z "$DVDTRANSCODEOPTS" ] && DVDTRANSCODEOPTS="-I 3 -y ffmpeg,mp2enc -F mpeg2video -Z 720x576 -b 192"
+[ -z "$DVDTRANSCODEOPTS" ] && DVDTRANSCODEOPTS="-I 3 -y mpeg2enc,null -Z 704x480 -b 192"
+#[ -z "$DVDTRANSCODEOPTS" ] && DVDTRANSCODEOPTS="-I 3 -y ffmpeg,mp2enc -F mpeg2video -Z 704x480 -b 192"
[ -z "$DVDTRANSCODEBITRATE" ] && DVDTRANSCODEBITRATE="3300000.0"
[ -z "$DVDAUTHORMODE" ] && DVDAUTHORMODE=15min
[ -z "$DVDMKISOFSOPTS" ] && DVDMKISOFSOPTS="-V VDRCONVERT_`date +"%d-%m-%Y"`"
@@ -140,10 +140,11 @@
[ -z "$DVD_CREATEISO" ] && DVD_CREATEISO=yes
[ -z "$DVDAUTHORUSERCHAP" ] && DVDAUTHORUSERCHAP=$DVDAUTHORCHAPTERS
-[ -z "$DVDUSESTREAMS" ] && DVDUSESTREAMS="dpid1:ac3+de apid1:mp2+de apid2:mp2+en"
+#[ -z "$DVDUSESTREAMS" ] && DVDUSESTREAMS="dpid1:ac3+en apid1:mp2+en apid2:mp2+en"
+[ -z "$DVDUSESTREAMS" ] && DVDUSESTREAMS="apid1:mp2+en apid2:mp2+en"
[ -z "$DVDSAVEAUTHORDIR" ] && DVDSAVEAUTHORDIR="no"
[ -z "$DVDSAVEAUTHORSRC" ] && DVDSAVEAUTHORSRC="no"
-[ -z "$DVDNORM" ] && DVDNORM="pal"
+[ -z "$DVDNORM" ] && DVDNORM="ntsc"
[ -z "$DVDMAINBACKFILE_USE" ] && DVDMAINBACKFILE_USE="yes"
[ -z "$DVDSUBBACKFILE_USE" ] && DVDSUBBACKFILE_USE="yes"
[ -z "$DVDMAINBACKFILE" ] && DVDMAINBACKFILE="$VDRCONVERTDIR/share/vdrconvert/images/$DVDNORM/Main.pnm"
@@ -151,11 +152,11 @@
[ -z "$DVDMAINSILENCEFILE" ] && DVDMAINSILENCEFILE="$VDRCONVERTDIR/share/vdrconvert/images/silence-30s.mp2"
[ -z "$DVDSUBSILENCEFILE" ] && DVDSUBSILENCEFILE="$DVDMAINSILENCEFILE"
# Text
-[ -z "$DVDTEXTPLAYMOVIE" -o "$DVDTEXTPLAYMOVIE" = "" ] && DVDTEXTPLAYMOVIE="Film abspielen"
-[ -z "$DVDTEXTMENU" -o "$DVDTEXTMENU" = "" ] && DVDTEXTMENU="Titelmenü"
-[ -z "$DVDMENU_MENU_MAIN" -o "$DVDMENU_MENU_MAIN" = "" ] && DVDMENU_MENU_MAIN="Titelmenü"
-[ -z "$DVD_PAGETEXT" -o "$DVD_PAGETEXT" = "" ] && DVD_PAGETEXT="Seite"
-[ -z "$DVD_MINUTESTEXT" -o "$DVD_MINUTESTEXT" = "" ] && DVD_MINUTESTEXT="min"
+[ -z "$DVDTEXTPLAYMOVIE" -o "$DVDTEXTPLAYMOVIE" = "" ] && DVDTEXTPLAYMOVIE="Play Movie"
+[ -z "$DVDTEXTMENU" -o "$DVDTEXTMENU" = "" ] && DVDTEXTMENU="Menu Title"
+[ -z "$DVDMENU_MENU_MAIN" -o "$DVDMENU_MENU_MAIN" = "" ] && DVDMENU_MENU_MAIN="Menu Title"
+[ -z "$DVD_PAGETEXT" -o "$DVD_PAGETEXT" = "" ] && DVD_PAGETEXT="Page"
+[ -z "$DVD_MINUTESTEXT" -o "$DVD_MINUTESTEXT" = "" ] && DVD_MINUTESTEXT="Min"
# Farbe Rahmen select Button
[ -z "$DVDBUTTONCOLOR" ] && DVDBUTTONCOLOR="#C0C0C0"
@@ -322,7 +323,7 @@
[ -z "$DVDXMLCHANNELS" ] && DVDXMLCHANNELS="2"
[ -z "$DVDXMLSAMPLERATE" ] && DVDXMLSAMPLERATE="48khz"
[ -z "$XML_VERSION" ] && XML_VERSION="1.0"
-[ -z "$XML_ENCODING" ] && XML_ENCODING="ISO-8859-15"
+[ -z "$XML_ENCODING" ] && XML_ENCODING="ISO-8859-1"
[ -z "$DVD_EPGCHARSPERLINE" ] && DVD_EPGCHARSPERLINE=60
[ -z "$DVD_EPGLINESPERPAGE" ] && DVD_EPGLINESPERPAGE=12
[ -z "$DVD_CHAPTERPERLINE" ] && DVD_CHAPTERPERLINE=2
@@ -333,7 +334,7 @@
[ -z "$DVD_USESUBVIDEOBACKGROUND" ] && DVD_USESUBVIDEOBACKGROUND="yes"
# By default start on after 1 second (avoid strange pictures at beginning)
-[ -z "$DVD_TIMEFRAME" ] && DVD_TIMEFRAME="00:00:01-00:00:07"
+[ -z "$DVD_TIMEFRAME" ] && DVD_TIMEFRAME="00:00:31-00:00:37"
[ -z "$DVD_TIMESUBFRAME" ] && DVD_TIMESUBFRAME="$DVD_TIMEFRAME"
[ -z "$DVD_TIMEMAINBACKFRAME" ] && DVD_TIMEMAINBACKFRAME="$DVD_TIMEFRAME"
[ -z "$DVD_TIMESUBBACKFRAME" ] && DVD_TIMESUBBACKFRAME="$DVD_TIMEMAINBACKFRAME"
@@ -380,7 +381,7 @@
;;
'ntsc')
# Screen size
- DVDNORM_XRES=640
+ DVDNORM_XRES=704
DVDNORM_YRES=480
# ppmtoy4m
DVDNORM_PPMTOY4M="-F 30000:1001 -A 10:11"
@@ -1040,8 +1041,8 @@
[ "$DEBUG" = "yes" ] && cat ${LOG[Number]} >>$LOGFILE
if [ $status -ne 0 ]
then
- echo "ERROR : $VDRSYNC rc=$status"
- logger "$0 : ERROR : $VDRSYNC rc=$status"
+ echo "ERROR : $VDRSYNC2 rc=$status"
+ logger "$0 : ERROR : $VDRSYNC2 rc=$status"
ExitClean
fi
@@ -1062,7 +1063,7 @@
if [ -z "$VDRCONVERT_ONESHOT" -o "$DISPLAY_XVFB" = "yes" ]
then
# FIXME: display error if display is not available
- export DISPLAY=:1.0
+ export DISPLAY=:0.0
fi
local vdrfiles=`$LS $i/[0-9][0-9][0-9].vdr`
@@ -1118,7 +1119,7 @@
echo "$WINEFILE" >> ${UniqueDir[Number]}/demux.ajb
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
- export DISPLAY=:1.0
+ export DISPLAY=:0.0
[ "$DEBUG" = "yes" ] && cat ${UniqueDir[Number]}/demux.ajb
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
@@ -1798,16 +1799,16 @@
ntsc)
case $ASR in
"4:3")
- local RES="640x480"
+ local RES="704x480"
local ASROPT=""
;;
"16:9")
- local RES="640x360"
+ local RES="704x360"
# Black border top and bottom
local ASROPT="-Y -60,0,-60,0"
;;
*)
- local RES="640x480"
+ local RES="704x480"
local ASROPT="--keep_asr"
;;
esac
diff -ru vdrconvert/bin/vdr2handy.sh vdrconvert.ntsc/bin/vdr2handy.sh
--- vdrconvert/bin/vdr2handy.sh 2004-11-18 07:14:20.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2handy.sh 2004-12-29 01:34:05.000000000 -0800
@@ -142,7 +142,7 @@
px)
# Virtuellen X-Server starten
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
vdrfiles=`$LS $i/[0-9][0-9][0-9].vdr`
for l in $vdrfiles
@@ -192,7 +192,7 @@
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
status=$?
diff -ru vdrconvert/bin/vdr2mp3.sh vdrconvert.ntsc/bin/vdr2mp3.sh
--- vdrconvert/bin/vdr2mp3.sh 2004-11-10 07:25:08.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2mp3.sh 2004-12-29 01:34:05.000000000 -0800
@@ -155,7 +155,7 @@
px)
# Virtuellen X-Server starten
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
[ -d $j ] && vdrfiles=$j/[0-9][0-9][0-9].vdr || vdrpxfiles=$j
for l in $vdrfiles
@@ -209,7 +209,7 @@
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
status=$?
diff -ru vdrconvert/bin/vdr2mpg.sh vdrconvert.ntsc/bin/vdr2mpg.sh
--- vdrconvert/bin/vdr2mpg.sh 2004-11-10 07:25:28.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2mpg.sh 2004-12-29 01:37:57.000000000 -0800
@@ -141,7 +141,7 @@
px)
# Virtuellen X-Server starten
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
vdrfiles=`$LS $i/[0-9][0-9][0-9].vdr`
for l in $vdrfiles
@@ -191,7 +191,7 @@
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
status=$?
diff -ru vdrconvert/bin/vdr2ogg.sh vdrconvert.ntsc/bin/vdr2ogg.sh
--- vdrconvert/bin/vdr2ogg.sh 2004-12-27 05:08:11.000000000 -0800
+++ vdrconvert.ntsc/bin/vdr2ogg.sh 2004-12-29 01:38:22.000000000 -0800
@@ -155,7 +155,7 @@
px)
# Virtuellen X-Server starten
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
[ -d $j ] && vdrfiles=$j/[0-9][0-9][0-9].vdr || vdrpxfiles=$j
for l in $vdrfiles
@@ -209,7 +209,7 @@
cat $VDRCONVERTDIR/share/vdrconvert/pva/demux.template >> ${UniqueDir[Number]}/demux.ajb
#$XVFB :1 >/dev/null 2>&1 &
- #export DISPLAY=:1.0
+ #export DISPLAY=:0.0
nice -n $PRIO $WINE $VDRCONVERTDIR/share/vdrconvert/pva/cPVAS.exe ${UniqueDir[Number]}/demux.ajb > ${LOG[Number]} 2>&1
status=$?
diff -ru vdrconvert/bin/vdrconvert.sh vdrconvert.ntsc/bin/vdrconvert.sh
--- vdrconvert/bin/vdrconvert.sh 2004-12-29 01:39:53.000000000 -0800
+++ vdrconvert.ntsc/bin/vdrconvert.sh 2004-12-29 01:34:05.000000000 -0800
@@ -104,7 +104,7 @@
case $DEMUXER in
pva|px)
echo "INFO : Start Virtual X Server: $XVFB"
- XAUTHORITY="" $XVFB :1 -screen 1 1024x768x24 >/dev/null 2>&1 &
+ XAUTHORITY="" $XVFB :0 -screen 0 1024x768x24 >/dev/null 2>&1 &
XVFB_PID="$!"
sleep 1
# Check for PID
@@ -114,7 +114,7 @@
fi
echo "INFO : Start Virtual Server sucessfully: PID=$XVFB_PID"
- export DISPLAY=:1.0
+ export DISPLAY=:0.0
# Allow localhost to connect
xhost +localhost
;;
diff -ru vdrconvert/doc/vdrconvert.env.template vdrconvert.ntsc/doc/vdrconvert.env.template
--- vdrconvert/doc/vdrconvert.env.template 2004-09-30 07:28:25.000000000 -0700
+++ vdrconvert.ntsc/doc/vdrconvert.env.template 2004-12-29 01:34:05.000000000 -0800
@@ -7,9 +7,9 @@
#
# Template by Helmut Auer modified by Dimitri
#
-export LANG=de_DE@euro
+export LANG=en_US
# SuSE 9.1
-#export LC_CTYPE=de_DE@euro
+#export LC_CTYPE=en_US
RECODE="recode latin1"
@@ -19,8 +19,8 @@
#RECODE="greek..UTF-8"
# Generell
-VDRROOT=/video
-DESTDIR=/video
+VDRROOT=/video/recordings
+DESTDIR=/home/video
CONVERT_JOBS="vdr2divx vdr2dvd vdr2vcd vdr2svcd vdr2mpg vdr2mp3 vdr2ac3 burn"
VDRSYNC=vdrsync.pl
TCMPLEX=tcmplex
@@ -46,12 +46,12 @@
# Project X Java Pfad
#USE_PX=yes
#Suse
-JAVA=/usr/lib/java/bin/java
+#JAVA=/usr/lib/java/bin/java
# Gentoo
#JAVA=/opt/blackdown-jdk-1.4.1/bin/java
# Debian Sarge
#JAVA=/usr/bin/java
-#JAVA=/usr/local/java/j2sdk1.4.1_02/bin/java
+JAVA=/usr/local/java/j2sdk1.4.1_02/bin/java
@@ -89,19 +89,19 @@
DVDTCMPLEXOPTS="-m d"
DVD_DVBMPLEXOPTS="-t DVD"
DVDALLOWEDWIDTH="720 704 352 480"
-DVDTRANSCODEOPTS="-I 3 -V -y mpeg -Z 720x576 -b 192"
+DVDTRANSCODEOPTS="-I 3 -V -y mpeg -Z 704x480 -b 192"
PPMTOY4M_OPTIONS="-n 1 -F 25:1 -A 59:54 -I t -L -r -v 0"
DVDTRANSCODEBITRATE="3300000.0"
DVDAUTHORUSERCHAP="15min"
-DVDUSESTREAMS="bd.ac3:ac3+de c0.mpa:mp2+de c1.mpa:mp2+en"
+DVDUSESTREAMS="bd.ac3:ac3+en c0.mpa:mp2+en c1.mpa:mp2+en"
DVDREMOVEAUTHORDIR="yes"
DVDSIZE=4472
CDSIZE=650
-DVDNORM="pal"
+DVDNORM="ntsc"
#DVDMAINSILENCEFILE="/etc/vdr/vdrconvert/etc/silence-1s.mp2"
#DVDSUBSILENCEFILE="/etc/vdr/vdrconvert/etc/silence-1s.mp2"
-DVDTEXTPLAYMOVIE="Film abspielen"
-DVDTEXTMENU="Titelmenü"
+DVDTEXTPLAYMOVIE="Play Film"
+DVDTEXTMENU="Menu Title"
DVDMAINMENUEPOSTACTION="vtsm"
DVDMENUEPOSTACTION="vtsm"
#DVDMAINBACKFILE=
@@ -188,26 +188,26 @@
MEDIAWRITER="/dev/scd0:0,0,0"
DVDPLUS_RECORD_OPTS="-Z"
DVDMIN_RECORD_OPTS="-delay 0 -dao"
-DVD_RECORDCMD="sudo growisofs"
-DVDMIN_RECORDCMD="sudo dvdrecord"
-DAO_RECORDCMD="sudo cdrdao"
-CD_RECORDCMD="sudo cdrecord"
-MEDIA_RW_FORMAT="yes"
-DVDPLUS_BLANK_CMD="sudo dvd+rw-format -f"
-DVDMIN_BLANK_CMD="sudo dvdrecord -delay 0 -dao blank=fast"
-DVDSTATUSPRG="sudo dvd+rw-mediainfo"
+DVD_RECORDCMD="growisofs"
+DVDMIN_RECORDCMD="dvdrecord"
+DAO_RECORDCMD="cdrdao"
+CD_RECORDCMD="cdrecord"
+MEDIA_RW_FORMAT="no"
+DVDPLUS_BLANK_CMD="dvd+rw-format -f"
+DVDMIN_BLANK_CMD="dvdrecord -delay 0 -dao blank=fast"
+DVDSTATUSPRG="dvd+rw-mediainfo"
DAO_OPTS="--driver generic-mmc"
CD_OPTS="driveropts=dao gracetime=0"
BURN_MAXRETRY=3
#DVD_USE_ONLY_PLUS_CMDS="yes"
-MEDIA_MSG_OK="Medium wurde erfolgreich erstellt"
-MEDIA_MSG_ERROR="Fehler beim Schreibvorgang"
-MEDIA_MSG_INSERT_CD="Bitte legen sie ein CD Medium ein"
-MEDIA_MSG_INSERT_DVD="Bitte legen sie ein DVD Medium ein"
-MEDIA_MSG_START_FORMAT="Medium wird geloescht"
-MEDIA_MSG_ISO_READYTOBURN="Isodatei ist fertig zum Brennen"
-MEDIA_MSG_START_WRITE_IMAGE="Imagedatei wird gebrannt"
-MEDIA_MSG_RETRY_IN_X_MINUTES="Wiederholung in 5 Minuten"
+MEDIA_MSG_OK="Media was successfully detected"
+MEDIA_MSG_ERROR="Failure to write"
+MEDIA_MSG_INSERT_CD="Please insert CD"
+MEDIA_MSG_INSERT_DVD="Please insert DVD"
+MEDIA_MSG_START_FORMAT="Beginning to format medium"
+MEDIA_MSG_ISO_READYTOBURN="ISO ready to burn"
+MEDIA_MSG_START_WRITE_IMAGE="Starting to write image"
+MEDIA_MSG_RETRY_IN_X_MINUTES="Retry in 5 minutes"
# Autowrite
diff -ru vdrconvert/etc/logrotate.d/vdrconvert vdrconvert.ntsc/etc/logrotate.d/vdrconvert
--- vdrconvert/etc/logrotate.d/vdrconvert 2004-09-30 07:28:25.000000000 -0700
+++ vdrconvert.ntsc/etc/logrotate.d/vdrconvert 2004-12-29 01:34:05.000000000 -0800
@@ -1,7 +1,5 @@
/var/log/vdrconvert/vdrconvert.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -10,8 +8,6 @@
}
/var/log/vdrconvert/vdr2dvd.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -20,8 +16,6 @@
}
/var/log/vdrconvert/vdr2divx.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -30,8 +24,6 @@
}
/var/log/vdrconvert/vdr2svcd.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -40,8 +32,6 @@
}
/var/log/vdrconvert/vdr2vcd.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -50,8 +40,6 @@
}
/var/log/vdrconvert/vdr2mp3.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -60,8 +48,6 @@
}
/var/log/vdrconvert/vdr2ac3.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
@@ -70,8 +56,6 @@
}
/var/log/vdrconvert/burn.log {
compress
- dateext
- maxage 365
rotate 99
size=+4096k
notifempty
diff -ru vdrconvert/index.html vdrconvert.ntsc/index.html
--- vdrconvert/index.html 2004-11-13 11:34:22.000000000 -0800
+++ vdrconvert.ntsc/index.html 2004-12-29 01:34:05.000000000 -0800
@@ -240,7 +240,7 @@
</tr>
<tr>
<td>DVDTRANSCODEOPTS</td>
- <td>-I 3 -y mpeg2enc,null -Z 720x576 -b 192<br>
+ <td>-I 3 -y mpeg2enc,null -Z 704x480 -b 192<br>
</td>
<td>Transcode optionen bei RETRANSCODE=yes<br>
</td>
diff -ru vdrconvert/install.sh vdrconvert.ntsc/install.sh
--- vdrconvert/install.sh 2004-12-29 01:39:49.000000000 -0800
+++ vdrconvert.ntsc/install.sh 2004-12-29 01:34:05.000000000 -0800
@@ -80,13 +80,13 @@
homedir=`cat /etc/passwd|grep "^${vdrconvertuser}:"|cut -f6 -d ':'`
[ ! -d "${homedir}/.vdrconvert" ] && mkdir -p "${homedir}/.vdrconvert"
chown ${vdrconvertuser}:${vdrconvertgroup} $homedir
-chmod 0750 $homedir
+chmod 0755 $homedir
chown ${vdrconvertuser}:${vdrconvertgroup} $homedir/.vdrconvert
-chmod 0750 $homedir/.vdrconvert
+chmod 0755 $homedir/.vdrconvert
if [ ! -d $vdrconvertprefix ]
then
mkdir -p $vdrconvertprefix
- chmod 0750 $vdrconvertprefix
+ chmod 0755 $vdrconvertprefix
chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix
fi
@@ -97,7 +97,7 @@
echo "wrong videodir $videodir"
exit
fi
-chmod 0750 $videodir
+chmod 0755 $videodir
chown ${vdrconvertuser}:${vdrconvertgroup} $videodir
echo -n "Enter target directory (/video, /video0, /film, /movies, ...) : "
read destdir
@@ -106,7 +106,7 @@
echo "wrong destdir $destdir"
exit
fi
-chmod 0750 $destdir
+chmod 0755 $destdir
chown ${vdrconvertuser}:${vdrconvertgroup} $destdir
mkdir -p /var/log/vdrconvert
@@ -223,10 +223,10 @@
mkdir -p $vdrconvertprefix/share/vdrconvert/images/logos
chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix/share/vdrconvert/images/logos
fi
-if [ ! -d $vdrconvertprefix/share/vdrconvert/images/pal ]
+if [ ! -d $vdrconvertprefix/share/vdrconvert/images/ntsc ]
then
- mkdir -p $vdrconvertprefix/share/vdrconvert/images/pal
- chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix/share/vdrconvert/images/pal
+ mkdir -p $vdrconvertprefix/share/vdrconvert/images/ntsc
+ chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix/share/vdrconvert/images/ntsc
fi
if [ ! -d $vdrconvertprefix/share/vdrconvert/images/buttons ]
then
@@ -331,13 +331,13 @@
echo "rm $vdrconvertprefix/share/vdrconvert/images/$ii" >> deinstall.sh
done
echo "rmdir $vdrconvertprefix/share/vdrconvert/images" >> deinstall.sh
-for i in share/vdrconvert/images/pal/Main.pnm share/vdrconvert/images/pal/Sub.pnm
+for i in share/vdrconvert/images/ntsc/Main.pnm share/vdrconvert/images/ntsc/Sub.pnm
do
echo -n "Install $i : "
- install -o $vdrconvertuser -g $vdrconvertgroup -m 0644 $i $vdrconvertprefix/share/vdrconvert/images/pal && echo "OK." || echo "Fail"
+ install -o $vdrconvertuser -g $vdrconvertgroup -m 0644 $i $vdrconvertprefix/share/vdrconvert/images/ntsc && echo "OK." || echo "Fail"
ii=`echo $i|xargs basename`
- echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/pal/$ii\"" >> deinstall.sh
- echo "rm $vdrconvertprefix/share/vdrconvert/images/pal/$ii" >> deinstall.sh
+ echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/ntsc/$ii\"" >> deinstall.sh
+ echo "rm $vdrconvertprefix/share/vdrconvert/images/ntsc/$ii" >> deinstall.sh
done
echo "rmdir $vdrconvertprefix/share/vdrconvert/images/buttons/duester" >> deinstall.sh
for i in share/vdrconvert/images/buttons/duester/*.ppm share/vdrconvert/images/buttons/duester/*style
@@ -345,8 +345,8 @@
echo -n "Install $i : "
install -o $vdrconvertuser -g $vdrconvertgroup -m 0644 $i $vdrconvertprefix/share/vdrconvert/images/buttons/duester && echo "OK." || echo "Fail"
ii=`echo $i|xargs basename`
- echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/$ii\"" >> deinstall.sh
- echo "rm $vdrconvertprefix/share/vdrconvert/images/$ii" >> deinstall.sh
+ echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/buttons/duester/$ii\"" >> deinstall.sh
+ echo "rm $vdrconvertprefix/share/vdrconvert/images/buttons/duester/$ii" >> deinstall.sh
done
echo "rmdir $vdrconvertprefix/share/vdrconvert/images" >> deinstall.sh
@@ -409,8 +409,8 @@
PATH=\$PATH:\$VDRCONVERTDIR/bin:/usr/X11R6/bin
export PATH
-export LANG=de_DE@euro
-export LC_CTYPE=de_DE@euro
+export LANG=en_US
+export LC_CTYPE=en_US
ENVEOF
case $system in
@@ -975,16 +975,16 @@
run=\`ps -aef|grep "vdrconvert.sh"|grep -v grep|wc -l\`
if [ \$run -eq 0 ]
then
- echo -n "Starting VDRCONVERT"
+ echo -n -e "Starting VDRCONVERT \n"
su - \$CONV_USER -c "$vdrconvertprefix/bin/vdrconvert.sh" >> \$LOGFILE 2>&1 &
else
- echo -n "VDRCONVERT already running"
+ echo -n -e "VDRCONVERT already running \n"
fi
# Remember status and be verbose
RETVAL=\$?
;;
stop)
- echo -n "Shutting down VDRCONVERT"
+ echo -n -e "Shutting down VDRCONVERT \n"
ps -aef|grep vdrconvert|grep -v grep|awk '{print(\$2)}'|sort -n|xargs kill -n 9 >/dev/null 2>&1
killall \$vdrconvertprefix/bin/vdrconvert.sh
killall Xvfb
@@ -1133,17 +1133,17 @@
run=\`ps -aef|grep "vdrconvert.sh"|grep -v grep|wc -l\`
if [ \$run -eq 0 ]
then
- echo -n "Starting VDRCONVERT "
+ echo -n -e "Starting VDRCONVERT \n"
su - \$CONV_USER -c "nice -n 15 $vdrconvertprefix/bin/vdrconvert.sh" >> \$LOGFILE 2>&1 &
else
- echo -n "VDRCONVERT already running"
+ echo -n -e "VDRCONVERT already running \n"
rc_failed
fi
# Remember status and be verbose
rc_status -v
;;
stop)
- echo -n "Shutting down VDRCONVERT"
+ echo -n -e "Shutting down VDRCONVERT \n"
/sbin/killproc -9 vdrconvert.sh > /dev/null 2>&1
/sbin/killproc -15 Xvfb > /dev/null 2>&1
sleep 1
@@ -1232,14 +1232,14 @@
run=\`ps -aef|grep "vdrconvert.sh"|grep -v grep|wc -l\`
if [ \$run -eq 0 ]
then
- echo -n "Starting VDRCONVERT "
+ echo -n -e "Starting VDRCONVERT \n"
su - \$CONV_USER -c "nice -n 15 $vdrconvertprefix/bin/vdrconvert.sh" >> \$LOGFILE 2>&1 &
else
- echo -n "VDRCONVERT already running"
+ echo -n -e "VDRCONVERT already running \n"
fi
;;
stop)
- echo -n "Shutting down VDRCONVERT"
+ echo -n -e "Shutting down VDRCONVERT \n"
ps -aef|grep vdrconvert|grep -v grep|awk '{print(\$2)}'|sort -n|xargs kill -9 >/dev/null 2>&1
ps -aef|grep Xvfb|grep -v grep|awk '{print(\$2)}'|sort -n|xargs kill -15 >/dev/null 2>&1
sleep 1
@@ -1285,14 +1285,14 @@
run=\`ps -aef|grep "vdrconvert.sh"|grep -v grep|wc -l\`
if [ \$run -eq 0 ]
then
- echo -n "Starting VDRCONVERT "
+ echo -n -e "Starting VDRCONVERT \n"
su - \$CONV_USER -c "nice -n 15 $vdrconvertprefix/bin/vdrconvert.sh" >>\$LOGFILE 2>&1 &
else
- echo -n "VDRCONVERT already running"
+ echo -n -e "VDRCONVERT already running \n"
fi
;;
stop)
- echo -n "Shutting down VDRCONVERT"
+ echo -n -e "Shutting down VDRCONVERT \n"
killall -9 vdrconvert.sh >/dev/null 2>&1
killall -15 Xvfb >/dev/null 2>&1
sleep 1
diff -ru vdrconvert/plugin/config.c vdrconvert.ntsc/plugin/config.c
--- vdrconvert/plugin/config.c 2004-10-20 13:59:54.000000000 -0700
+++ vdrconvert.ntsc/plugin/config.c 2004-12-29 01:34:05.000000000 -0800
@@ -65,7 +65,7 @@
strcpy(DVDTCMPLEXOPTS,"-m d");
strcpy(DVD_DVBMPLEXOPTS,"-t DVD");
strcpy(DVDALLOWEDWIDTH,"720 704 352 480");
- strcpy(DVDTRANSCODEOPTS,"-I 3 -V -y mpeg -Z 720x576 -b 192");
+ strcpy(DVDTRANSCODEOPTS,"-I 3 -V -y mpeg -Z 704x480 -b 192");
strcpy(PPMTOY4M_OPTIONS,"-n 1 -F 25:1 -A 59:54 -I t -L -r -v 0");
strcpy(DVDTRANSCODEBITRATE,"3300000.0");
strcpy(DVDAUTHORUSERCHAP,"15min");
diff -ru vdrconvert/plugin/install.sh vdrconvert.ntsc/plugin/install.sh
--- vdrconvert/plugin/install.sh 2004-10-05 13:13:25.000000000 -0700
+++ vdrconvert.ntsc/plugin/install.sh 2004-12-29 01:34:05.000000000 -0800
@@ -211,10 +211,10 @@
mkdir -p $vdrconvertprefix/share/vdrconvert/images
chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix/share/vdrconvert/images
fi
-if [ ! -d $vdrconvertprefix/share/vdrconvert/images/pal ]
+if [ ! -d $vdrconvertprefix/share/vdrconvert/images/ntsc ]
then
- mkdir -p $vdrconvertprefix/share/vdrconvert/images/pal
- chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix/share/vdrconvert/images/pal
+ mkdir -p $vdrconvertprefix/share/vdrconvert/images/ntsc
+ chown ${vdrconvertuser}:${vdrconvertgroup} $vdrconvertprefix/share/vdrconvert/images/ntsc
fi
if [ ! -d $vdrconvertprefix/share/vdrconvert/images/buttons ]
then
@@ -309,13 +309,13 @@
echo "rm $vdrconvertprefix/share/vdrconvert/images/$ii" >> deinstall.sh
done
echo "rmdir $vdrconvertprefix/share/vdrconvert/images" >> deinstall.sh
-for i in share/vdrconvert/images/pal/*
+for i in share/vdrconvert/images/ntsc/*
do
echo -n "Install $i : "
- install -o $vdrconvertuser -g $vdrconvertgroup -m 0644 $i $vdrconvertprefix/share/vdrconvert/images/pal && echo "OK." || echo "Fail"
+ install -o $vdrconvertuser -g $vdrconvertgroup -m 0644 $i $vdrconvertprefix/share/vdrconvert/images/ntsc && echo "OK." || echo "Fail"
ii=`echo $i|xargs basename`
- echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/pal/$ii\"" >> deinstall.sh
- echo "rm $vdrconvertprefix/share/vdrconvert/images/pal/$ii" >> deinstall.sh
+ echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/ntsc/$ii\"" >> deinstall.sh
+ echo "rm $vdrconvertprefix/share/vdrconvert/images/ntsc/$ii" >> deinstall.sh
done
echo "rmdir $vdrconvertprefix/share/vdrconvert/images/buttons/duester" >> deinstall.sh
for i in share/vdrconvert/images/buttons/duester/*
@@ -323,8 +323,8 @@
echo -n "Install $i : "
install -o $vdrconvertuser -g $vdrconvertgroup -m 0644 $i $vdrconvertprefix/share/vdrconvert/images/buttons/duester && echo "OK." || echo "Fail"
ii=`echo $i|xargs basename`
- echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/$ii\"" >> deinstall.sh
- echo "rm $vdrconvertprefix/share/vdrconvert/images/$ii" >> deinstall.sh
+ echo "echo \"Deinstall $vdrconvertprefix/share/vdrconvert/images/buttons/duester/$ii\"" >> deinstall.sh
+ echo "rm $vdrconvertprefix/share/vdrconvert/images/buttons/duester/$ii" >> deinstall.sh
done
echo "rmdir $vdrconvertprefix/share/vdrconvert/images" >> deinstall.sh
diff -ru vdrconvert/vdr2dvd_wrapper.sh vdrconvert.ntsc/vdr2dvd_wrapper.sh
--- vdrconvert/vdr2dvd_wrapper.sh 2004-11-30 12:26:36.000000000 -0800
+++ vdrconvert.ntsc/vdr2dvd_wrapper.sh 2004-12-29 01:34:05.000000000 -0800
@@ -4,13 +4,13 @@
# This file should contain (remove leading '#'):
#
## Location of vdrconvert
-#VDRCONVERTDIR="/path/to/vdrconvert"
+VDRCONVERTDIR="/usr/local"
#
## Destination/working directory of vdrconvert
-#DIR_VDRCONVERT_DEST="/path/to/big/storage/vdrconvert"
+DIR_VDRCONVERT_DEST="/home/video"
#
## Root directory of vdr
-#DIR_VDR_ROOT="/video"
+DIR_VDR_ROOT="/video/recordings"
#
## You can also preset other variables in this file
Home |
Main Index |
Thread Index