[SCM] dvd-slideshow/master: refreshed: almost everything applied by the upstream

hpfn-guest at users.alioth.debian.org hpfn-guest at users.alioth.debian.org
Tue Nov 1 14:34:40 UTC 2016


The following commit has been merged in the master branch:
commit 7855f727bfa2f4aa75c84fc298d6c06cd787c7cc
Author: Herbert Parentes Fortes Neto <hpfn at debian.org>
Date:   Tue Nov 1 12:17:18 2016 -0200

    refreshed: almost everything applied by the upstream

diff --git a/debian/patches/04_obsolete-commands.patch b/debian/patches/04_obsolete-commands.patch
index b5f8d00..afcaa3c 100644
--- a/debian/patches/04_obsolete-commands.patch
+++ b/debian/patches/04_obsolete-commands.patch
@@ -1,30 +1,15 @@
-Description: Fix numerous syntax errors.
+cription: A lot of changes made by the upstream made
+          the patch do one change only.
 Author: Theppitak Karoonboonyanan <thep at debian.org>
+Reviewed-by: Herbert Parentes Fortes Neto <hpfn at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750626
 Forwarded: no
----
- dvd-slideshow |   72 ++++++++++++++++++++++++++++++++--------------------------
- 1 file changed, 40 insertions(+), 32 deletions(-)
-
+Last-Update: 2016-11-01
+Index: dvd-slideshow/dvd-slideshow
+===================================================================
 --- dvd-slideshow.orig/dvd-slideshow
 +++ dvd-slideshow/dvd-slideshow
-@@ -913,11 +913,11 @@ if [ "$mpeg_encoder" == 'avconv' ] ; the
- 	# use avconv's -loop option to see if it's faster with a single image piped to the yuv4mpegpipe
- 	if [ "$yuvfirstfile" -eq 1 ]; then
- 		yuvfirstfile=0
--#		avconv -f image2 -loop_input -i "$1" -vframes "$myframes" -y -aspect $aspect_ratio -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" >&9
--		avconv -f image2 -loop_input -i "$1" -vframes "$myframes" -y -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" >&9
-+#		avconv -f image2 -loop 1 -i "$1" -vframes "$myframes" -y -aspect $aspect_ratio -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" >&9
-+		avconv -f image2 -loop 1 -i "$1" -vframes "$myframes" -y -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" >&9
- 	else
--#		avconv -f image2 -loop_input -i "$1" -vframes "$myframes" -y -aspect $aspect_ratio -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" | yuvstrip >&9
--		avconv -f image2 -loop_input -i "$1" -vframes "$myframes" -y -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" | yuvstrip >&9
-+#		avconv -f image2 -loop 1 -i "$1" -vframes "$myframes" -y -aspect $aspect_ratio -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" | yuvstrip >&9
-+		avconv -f image2 -loop 1 -i "$1" -vframes "$myframes" -y -s "$dvd_width"x"$dvd_height" -r $framerate -an -pix_fmt yuv420p -f yuv4mpegpipe - 2>> "$avconv_err" | yuvstrip >&9
- 	fi
- else # use old method using ppmtoy4m pipe
- 	if [ "$yuvfirstfile" -eq 1 ]; then
-@@ -2522,7 +2522,7 @@ wavlength ()
+@@ -2534,7 +2534,7 @@ wavlength ()
  	# wavlength $file 
  	# returns song length in ms
  	if [ "$soxi" == '1' ] ; then
@@ -33,206 +18,3 @@ Forwarded: no
  		song_length=`cat "$tmpdir"/trash.txt` 
  	else
  		sox "$1" $sox_nop stat 2> "$tmpdir"/trash.txt 
-@@ -2535,7 +2535,7 @@ wavlength ()
- 
- rawlength ()
- {
--		sox -t raw -r $audio_sample_rate $sox_word -s -c 2 "$1" $sox_nop stat 2> "$tmpdir"/trash.txt 
-+		sox -t raw -r $audio_sample_rate $sox_word $sox_int -c 2 "$1" $sox_nop stat 2> "$tmpdir"/trash.txt
- 		song_length=`cat "$tmpdir"/trash.txt | grep 'Length (seconds):' | awk -F: '{print $2}' | tr -d \[:blank:\]`
- 		song_length=$( echo "scale=0; 1000 * $song_length" | bc | awk -F. '{printf ("%3.0f", $0)}' )
- 		rm "$tmpdir"/trash.txt
-@@ -3516,12 +3516,20 @@ else
- 	progver=`sox -h 2>&1 | head -n 1 | awk '{ print $3 }'`
- 	logecho "[dvd-slideshow] Found sox version $progver"
- 	progver1="$( echo ${progver#v} | awk -F. '{print $1}' )"
-+	progver2="$( echo ${progver#v} | awk -F. '{print $2}' )"
- 	if [ $progver1 -lt 14 ] ; then  # use old sox commands:
- 		sox_word='-w'
-+		sox_int='-s'
- 		sox_nop='-e'
- 		soxi=0
--	else # use new commands ( > 14.0.0 )
-+	elif [ $progver2 -lt 4 ]; then  # use new commands ( < 14.4.0 )
- 		sox_word='-2'
-+		sox_int='-s'
-+		sox_nop='-n'
-+		soxi=1
-+	else # use new commands ( >= 14.4.0 )
-+		sox_word='-b 16'
-+		sox_int='-e signed-integer'
- 		sox_nop='-n'
- 		soxi=1
- 	fi
-@@ -6545,9 +6553,9 @@ for file in "${image[@]}"; do
- 			elif [ "$file" == 'silence' ]; then
- 				myecho "[dvd-slideshow] creating silent audio track... we will splice it later."
- 				if [ "$audiosmp" -eq 1 ] ; then
--					sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero -t wav -c 2 -r $audio_sample_rate "$tmpdir/audio$track"_"$audio_index_padded.wav" trim 0 1 &
-+					sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero -t wav -c 2 -r $audio_sample_rate "$tmpdir/audio$track"_"$audio_index_padded.wav" trim 0 1 &
- 				else
--					sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero -t wav -c 2 -r $audio_sample_rate "$tmpdir/audio$track"_"$audio_index_padded.wav" trim 0 1
-+					sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero -t wav -c 2 -r $audio_sample_rate "$tmpdir/audio$track"_"$audio_index_padded.wav" trim 0 1
- 				fi
- 			else
- 				myecho "[dvd-slideshow] ERROR:  Unknown audio file format. Must be mp3, ogg, mp4/aac, wav, or silence"
-@@ -6845,7 +6853,7 @@ if [ -n "${passed_audio[0]}" ] ; then  #
- 		myecho "[dvd-slideshow] fade_in_time=$fade_in_hms fade_out_time=$fade_out_hms"
- 		total_audio_length="$(( $total_audio_length + $song_length ))"
- 		myecho "[dvd-slideshow] total_audio_length=`hms $total_audio_length`"
--		sox -v 0.95 "$tmpdir/audio$track"_"$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" fade t "$fade_in_hms" "$song_length_hms" "$fade_out_hms"
-+		sox -v 0.95 "$tmpdir/audio$track"_"$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" fade t "$fade_in_hms" "$song_length_hms" "$fade_out_hms"
- 		let i=$i+1
- 		myecho "[dvd-slideshow] ###############"
- 	done
-@@ -6855,11 +6863,11 @@ if [ -n "${passed_audio[0]}" ] ; then  #
- 		# video is longer than audio. need to add silence to end.
- 		thetime_hms=`hms $(( $end_time - $total_audio_length + 1000 ))` #plus 10 so sox actually crops.
- 		myecho "[dvd-slideshow] Buffering end of audio file with silence for $thetime_hms"
--		sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" trim 0 "$thetime_hms"
-+		sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" trim 0 "$thetime_hms"
- 	fi
- 	
- 	## cat all the audio files together: 
--	cat "$tmpdir"/audio1_????.raw | sox -t raw $sox_word -s -c 2 -r $audio_sample_rate - "$tmpdir/audio1.wav"
-+	cat "$tmpdir"/audio1_????.raw | sox -t raw $sox_word $sox_int -c 2 -r $audio_sample_rate - "$tmpdir/audio1.wav"
- 	## fade out at end of video:
- 	sox "$tmpdir/audio1.wav" "$tmpdir/audio_out.wav" fade t 0 "$end_hms" "$fade_out_hms"
- 	mv "$tmpdir/audio_out.wav" "$tmpdir/audio1.wav"
-@@ -6951,7 +6959,7 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
- 			song_end_hms=`hms $song_end_ms`
- 			song_start_hms="0"  # cannot modify starting point yet...
- 			myecho "[dvd-slideshow] Creating silence audio file for $song_end_hms"
--			sox -t raw -s $sox_word -c 1 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir"/audio1_$i_padded.raw trim "0" "$song_end_hms"
-+			sox -t raw $sox_int $sox_word -c 1 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir"/audio1_$i_padded.raw trim "0" "$song_end_hms"
- 		else
- 			## file should only be wav format at this point since it was decoded before
- 			## all audio files are of the format "$tmpdir"/audio_1.wav
-@@ -7046,13 +7054,13 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
- 				# fade only to the end of song length now, because we may have to add silence:
- 				# We should probably eventually add the silence first, and then chop the song?
- 				if [ "$fade_in_time" -eq 0 ] && [ "$fade_out_time" -eq 0 ] ; then
--					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw"
-+					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw"
- 				else  # fade in or out
--					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" fade t "$fade_in_hms" "$song_length_hms" "$fade_out_hms"
-+					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" fade t "$fade_in_hms" "$song_length_hms" "$fade_out_hms"
- 				fi
- 				thetime_hms=`hms $(( $song_end_ms - $song_length_ms ))` 
- 				myecho "[dvd-slideshow] Adding $thetime_hms of silence to end of original audio file"
--				sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
-+				sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
- 				cat "$tmpdir/audio1_$i_padded.raw" "$tmpdir/silence.raw" > "$tmpdir/audio.raw" 
- 				mv "$tmpdir/audio.raw" "$tmpdir/audio1_$i_padded.raw"
- 				rm "$tmpdir"/silence.raw
-@@ -7067,13 +7075,13 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
- #				echo "song_length_ms=$song_length_ms song_end_ms=$song_end_ms fade_in_time=$fade_in_time fade_out_time=$fade_out_time"
- 				if [ "$song_length_ms" -ne "$song_end_ms"  ] && [ "$fade_in_time" -eq 0 ] && [ "$fade_out_time" -eq 0 ] ; then
- #					echo "cropping"
--					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" trim 0 "$song_end_hms"
-+					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" trim 0 "$song_end_hms"
- 				elif [ "$fade_out_time" -ne 0 ] || [ "$fade_in_time" -ne 0 ] ; then
- #					echo "fading"
--					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" fade t "$fade_in_hms" "$song_end_hms" "$fade_out_hms"
-+					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" fade t "$fade_in_hms" "$song_end_hms" "$fade_out_hms"
- 				else
- #					echo "converting"
--					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw" 
-+					sox -v $volume "$tmpdir/audio1_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio1_$i_padded.raw"
- 				fi
- 			fi
- 			# now, audio should span to the end mark
-@@ -7082,7 +7090,7 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
- 			## buffer beginning with silence:
- 			thetime_hms=`hms "${audio1_start[$i]}"`
- 			myecho "[dvd-slideshow] Adding $thetime_hms to beginning of audio file"
--			sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
-+			sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
- 			cat "$tmpdir"/silence.raw "$tmpdir/audio1_$i_padded.raw" > "$tmpdir/audio.raw" 
- 			mv "$tmpdir/audio.raw" "$tmpdir/audio1_$i_padded.raw"
- 			rm "$tmpdir"/silence.raw
-@@ -7101,7 +7109,7 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
- 		myecho "[dvd-slideshow] Creating ac3 audio..."
- 		checkforprog avconv
- 		rm -f "$tmpdir/audio1.ac3"
--		cat "$tmpdir"/audio1_????.raw | sox -t raw $sox_word -s -c 2 -r $audio_sample_rate - -t wav - 2> /dev/null >"$tmpdir/audio1.wav"
-+		cat "$tmpdir"/audio1_????.raw | sox -t raw $sox_word $sox_int -c 2 -r $audio_sample_rate - -t wav - 2> /dev/null >"$tmpdir/audio1.wav"
- 		if [ $? -ne 0 ] ; then
- 			## sox errored
- 			myecho "[dvd-slideshow] ERROR during sox execution!"
-@@ -7118,7 +7126,7 @@ if [ -n "${audio_1[0]}" ] ; then   ## au
- 		fi
- 	else
- 		myecho "[dvd-slideshow] Converting all track 1 audio files..."
--		cat "$tmpdir"/audio1_????.raw | sox -t raw $sox_word -s -c 2 -r $audio_sample_rate - "$tmpdir/audio1.wav"
-+		cat "$tmpdir"/audio1_????.raw | sox -t raw $sox_word $sox_int -c 2 -r $audio_sample_rate - "$tmpdir/audio1.wav"
- 		if [ "$debug" -ge 1 ] ; then
- 			length=`wavlength "$tmpdir/audio1.wav"`
- 			myecho "[dvd-slideshow] Actual length of .raw file=`hms $length`"
-@@ -7184,7 +7192,7 @@ if [ -n "${audio_2[0]}" ] ; then   ## au
- 			song_end_hms=`hms $song_end_ms`
- 			song_start_hms="0"  # cannot modify starting point yet...
- 			myecho "[dvd-slideshow] Creating silence audio file for $song_end_hms"
--			sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir"/audio2_$i_padded.raw trim "0" "$song_end_hms"
-+			sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir"/audio2_$i_padded.raw trim "0" "$song_end_hms"
- 		else # not silence
- 			## file should only be wav format at this point since it was decoded before
- 			## all audio files are of the format "$tmpdir"/audio_2.wav
-@@ -7283,19 +7291,19 @@ if [ -n "${audio_2[0]}" ] ; then   ## au
- 				# fade only to the end of song length now, because we may have to add silence:
- 				# We should probably eventually add the silence first, and then chop the song?
- 				if [ "$fade_in_time" -eq 0 ] && [ "$fade_out_time" -eq 0 ] ; then
--					sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw"
-+					sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw"
- 				else # one of the fades is nonzero:
--					sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" fade t "$fade_in_hms" "$song_length_hms" "$fade_out_hms"
-+					sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" fade t "$fade_in_hms" "$song_length_hms" "$fade_out_hms"
- 				fi
- 				thetime_hms=`hms $(( $song_end_ms - $song_length_ms + 1000 ))` #plus 1s so sox actually crops.
- 				thetime2_hms=`hms $(( $song_end_ms - $song_length_ms ))` 
- 				myecho "[dvd-slideshow] Adding $thetime2_hms of silence to end of original audio file"
--				sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
-+				sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
- 				cat "$tmpdir/audio2_$i_padded.raw" "$tmpdir/silence.raw" > "$tmpdir/audio.raw" 
- 				mv "$tmpdir/audio.raw" "$tmpdir/audio2_$i_padded.raw"
- 				# hopefully there won't be many times where the audio needs to be buffered 
- 				# at the end, so we'll add one extra step to make the coding easier:
--				sox -t raw -s $sox_word -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" "$tmpdir/audio2_$i_padded.wav"
-+				sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" "$tmpdir/audio2_$i_padded.wav"
- 				rm "$tmpdir"/silence.raw
- 			fi
- 			if [ "$debug" -ge 2 ] ; then
-@@ -7307,20 +7315,20 @@ if [ -n "${audio_2[0]}" ] ; then   ## au
- 			fi
- 			if [ "$song_length_ms" -ne "$song_end_ms"  ] && [ "$fade_in_time" -eq 0 ] && [ "$fade_out_time" -eq 0 ] ; then
- #				echo "cropping"
--				sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" trim 0 "$song_end_hms"
-+				sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" trim 0 "$song_end_hms"
- 			elif [ "$fade_out_time" -ne 0 ] || [ "$fade_in_time" -ne 0 ] ; then
- #				echo "fading"
--				sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" fade t "$fade_in_hms" "$song_end_hms" "$fade_out_hms"
-+				sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" fade t "$fade_in_hms" "$song_end_hms" "$fade_out_hms"
- 			else
- #				echo "converting"
--				sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw" 
-+				sox -v $volume "$tmpdir/audio2_$i_padded.wav" $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/audio2_$i_padded.raw"
- 			fi
- 		fi  # end of if silence or not
- 		if [ $i -eq 0 ] && [ "${audio2_start[$i]}" -ne 0 ] ; then
- 			## buffer beginning with silence:
- 			thetime_hms=`hms "${audio2_start[$i]}"`
- 			myecho "[dvd-slideshow] Adding $thetime_hms to beginning of audio file"
--			sox -t raw -s $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word -s -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
-+			sox -t raw $sox_int $sox_word -c 2 -r $audio_sample_rate /dev/zero $sox_word $sox_int -c 2 -r $audio_sample_rate "$tmpdir/silence.raw" trim 0 "$thetime_hms"
- 			cat "$tmpdir"/silence.raw "$tmpdir/audio2_$i_padded.raw" > "$tmpdir/audio.raw" 
- 			mv "$tmpdir/audio.raw" "$tmpdir/audio2_$i_padded.raw"
- 			rm "$tmpdir"/silence.raw
-@@ -7337,7 +7345,7 @@ if [ -n "${audio_2[0]}" ] ; then   ## au
- 	myecho "[dvd-slideshow] Concatenating all track 2 audio files..."
- 	## cat all the audio files together: 
- #	find "$tmpdir" -name audio2_????.raw -print0 | xargs -0 sox -t raw $sox_word -s -c 2 -r $audio_sample_rate - "$tmpdir/audio2.wav"
--	cat "$tmpdir"/audio2_????.raw | sox -t raw $sox_word -s -c 2 -r $audio_sample_rate - "$tmpdir/audio2.wav"
-+	cat "$tmpdir"/audio2_????.raw | sox -t raw $sox_word $sox_int -c 2 -r $audio_sample_rate - "$tmpdir/audio2.wav"
- 	if [ "$debug" -ge 1 ] ; then
- 		length=`wavlength "$tmpdir/audio2.wav"`
- 		myecho "[dvd-slideshow] Actual length of .raw file=`hms $length`"

-- 
dvd-slideshow packaging



More information about the pkg-multimedia-commits mailing list