diff -pur mythburn.orig/scripts/getmyth.sh mythburn/scripts/getmyth.sh --- mythburn.orig/scripts/getmyth.sh 2005-08-29 02:44:21.000000000 +1200 +++ mythburn/scripts/getmyth.sh 2005-10-31 23:26:09.000000000 +1300 @@ -44,8 +44,7 @@ fi # Thanks to "ille" from http://mysettopbox.tv/phpBB2/viewtopic.php?t=2132&postdays=0&postorder=asc&start=345 # for this fix. mchannel=$( echo $file | cut --delimiter="_" -f 1 ) -mstarttime=$( echo $file | cut --delimiter="_" -f 2 ) -mendtime=$( echo $file | cut --delimiter="_" -f 3 | cut --delimiter="." -f 1 ) +mstarttime=$( echo $file | cut --delimiter="_" -f 2 | cut --delimiter="." -f 1 ) mnicemonth=$(echo $mstarttime | cut --delimiter="_" -f 2 | cut -c5-6 ) @@ -68,7 +67,7 @@ mnicestarttime="$( echo $mstarttime | cu # extract the details from MYSQL database for this NUV title #old statement sqlstatement=" from recorded left join program on program.chanid=recorded.chanid and program.starttime=recorded.starttime and program.endtime=recorded.endtime where recorded.chanid=$mchannel and recorded.starttime=$mstarttime and recorded.endtime=$mendtime;" -sqlstatement=" from recorded where recorded.chanid=$mchannel and recorded.starttime=$mstarttime and recorded.endtime=$mendtime;" +sqlstatement=" from recorded where recorded.chanid=$mchannel and recorded.starttime=$mstarttime;" echo $mnicestarttime > ${tempdir}/date.txt diff -pur mythburn.orig/scripts/mpeg2cut-mod mythburn/scripts/mpeg2cut-mod --- mythburn.orig/scripts/mpeg2cut-mod 2005-03-04 07:04:25.000000000 +1300 +++ mythburn/scripts/mpeg2cut-mod 2005-10-29 18:39:42.000000000 +1300 @@ -64,7 +64,7 @@ EOF fi FILENAME=$1 -BASENAME=`basename ${FILENAME} .nuv` +BASENAME=`basename ${FILENAME} .mpg` OUTFILE=$2 LASTGOP=$3 VERSION=`echo '$Revision: 1.1 $' | sed -e 's/\$Revision\(\: \)*\([^ $]*\).*\$/\2/'` diff -pur mythburn.orig/scripts/mpeg2cut-px.sh mythburn/scripts/mpeg2cut-px.sh --- mythburn.orig/scripts/mpeg2cut-px.sh 2005-08-30 04:32:00.000000000 +1200 +++ mythburn/scripts/mpeg2cut-px.sh 2005-10-31 23:25:39.000000000 +1300 @@ -18,24 +18,24 @@ function cutlist_x { #cutlist is just a sequence of cutpoints #first entry is cut-in, i.e start recording line=0 - rm ${tempdir}/cutlist_x.txt 2>/dev/null + rm ${tempdir}/cutlist_x.Xcl 2>/dev/null cat ${tempdir}/cutlist.txt | while read do first=$(echo $REPLY|cut -f1 -d-) second=$(echo $REPLY|cut -f2 -d-) if [ "$line" -eq "0" ]; then - echo "(2) use Frame number for cuts" > ${tempdir}/cutlist_x.txt + echo "CollectionPanel.CutMode=2" > ${tempdir}/cutlist_x.Xcl if [ "$first" -ne "0" -a "$first" != "" ]; then - echo "0" >> ${tempdir}/cutlist_x.txt + echo "0" >> ${tempdir}/cutlist_x.Xcl fi fi line=$((line+1)) if [ "$first" != "" -a "${first}0" -ne "0" ]; then - echo $first >> ${tempdir}/cutlist_x.txt + echo $first >> ${tempdir}/cutlist_x.Xcl fi if [ "$second" != "" ]; then - echo $second >> ${tempdir}/cutlist_x.txt + echo $second >> ${tempdir}/cutlist_x.Xcl fi done } @@ -66,7 +66,7 @@ shift outfile=$1 shift -base=`basename ${file} .nuv` +base=`basename ${file} .mpg` # read config file cfg=${myfolder}/mythburn.conf @@ -87,24 +87,24 @@ cd ${tempdir} echo Filename \"${file}\" echo OutFile \"${outfile}\" -echo Cutting out commercials + demultiplexing with projectx +echo Cutting out commercials + demultiplexing with projectx cutlist_x -nice -n 19 ${projectx} -o . -p cutlist_x.txt $file +nice -n 19 ${projectx} -out . -cut cutlist_x $file -if ! [ -f "${base}_X.log" ]; then +if ! [ -f "${base}_log.txt" ]; then echo "Error running projectx, no log file created. giving up" exit 1 fi # sort audiofiles, optionaly reencode first track to ac3 for NTSC -audio=`${myfolder}/scripts/prepare_audio.sh ${myfolder} ${base}_X.log ${videoformat} ${recode_ntsc}` +audio=`${myfolder}/scripts/prepare_audio.sh ${myfolder} ${base}_log.txt ${videoformat} ${recode_ntsc}` echo Remultiplexing video echo mplex -o ${outfile} -f 8 ${base}.m2v ${audio} nice -n 19 mplex -o ${outfile} -f 8 ${base}.m2v ${audio} > /dev/null echo Cleaning up -rm ${base}.m2v ${audio} cutlist_x.txt +rm ${base}.m2v ${audio} cutlist_x.Xcl if [ "$mode" == "XVFB" ]; then # Shut down Xvfb if we used it kill ${XVFB_PID} 2>/dev/null diff -pur mythburn.orig/scripts/remplex.sh mythburn/scripts/remplex.sh --- mythburn.orig/scripts/remplex.sh 2005-10-08 06:00:37.000000000 +1300 +++ mythburn/scripts/remplex.sh 2005-10-29 18:39:59.000000000 +1300 @@ -61,7 +61,7 @@ function multiplex () { function remux_projectx() { local src=$1 dst=$2 - base=`basename $src .nuv` + base=`basename $src .mpg` if [ -z "$projectx" ]; then echo "projectx not definedd, can't use remux_projectx remux method" exit 1 @@ -82,23 +82,24 @@ function remux_projectx() { fi pushd . > /dev/null cd ${tempdir} - ${projectx} -o . ${src} + ${projectx} -out . ${src} checkreturnvalue - if ! [ -f "${base}_X.log" ]; then + if ! [ -f "${base}_log.txt" ]; then + echo "Can't find ${base}_log.txt in ${tempdir}" echo "Error Running project X, no log file created. giving up." exit 1 fi # sort audiofiles, optionaly reencode first track to ac3 for NTSC - audio=`${myfolder}/scripts/prepare_audio.sh ${myfolder} ${base}_X.log ${videoformat} ${recode_ntsc}` + audio=`${myfolder}/scripts/prepare_audio.sh ${myfolder} ${base}_log.txt ${videoformat} ${recode_ntsc}` echo mplex -o $dst -f 8 ${base}.m2v ${audio} 2> /dev/null mplex -o $dst -f 8 ${base}.m2v ${audio} 2> /dev/null checkreturnvalue if [ "$mode" == "XVFB" ]; then kill ${XVFB_PID} 2>/dev/null fi - rm ${base}_X.log ${audio} ${base}.m2v + rm ${base}_log.txt ${audio} ${base}.m2v popd > /dev/null }