1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
Description: Use twolame instead of toolame.
---
dvd-menu | 16 ++++++++--------
dvd-slideshow | 48 ++++++++++++++++++++++++------------------------
2 files changed, 32 insertions(+), 32 deletions(-)
--- dvd-slideshow.orig/dvd-menu
+++ dvd-slideshow/dvd-menu
@@ -1679,19 +1679,19 @@ echo "song=$audiofile"
ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab "$audio_bitrate"k -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
fi
else
- ## toolame is way faster! (3x in my test)
- it=`which toolame`
+ ## twolame is way faster! (3x in my test)
+ it=`which twolame`
if [ -n "$it" ] ; then
- toolame_version=`toolame -h | head -n 4 | grep version | awk '{ print $3 }'`
- echo "[dvd-menu] using toolame $toolame_version..."
- if [ "$toolame_version" == '0.2m' ] ; then
- toolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio.wav" "$tmpdir/audio.mp2" >> "$logfile" 2>&1
+ twolame_version=`twolame -h | head -n 4 | grep version | awk '{ print $3 }'`
+ echo "[dvd-menu] using twolame $twolame_version..."
+ if [ "$twolame_version" == '0.2m' ] ; then
+ twolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio.wav" "$tmpdir/audio.mp2" >> "$logfile" 2>&1
else
## need to hard code in the sample rate here because the syntax is bad
if [ "$vcd" -eq 1 ] || [ "$svcd" -eq 1 ] ; then
- toolame -s 44.1 -b $audio_bitrate "$tmpdir/audio.wav" "$tmpdir/audio.mp2" >> "$logfile" 2>&1
+ twolame -s 44100 -b $audio_bitrate "$tmpdir/audio.wav" "$tmpdir/audio.mp2" >> "$logfile" 2>&1
else
- toolame -s 48 -b $audio_bitrate "$tmpdir/audio.wav" "$tmpdir/audio.mp2" >> "$logfile" 2>&1
+ twolame -s 48000 -b $audio_bitrate "$tmpdir/audio.wav" "$tmpdir/audio.mp2" >> "$logfile" 2>&1
fi
fi
else
--- dvd-slideshow.orig/dvd-slideshow
+++ dvd-slideshow/dvd-slideshow
@@ -6876,18 +6876,18 @@ if [ -n "${passed_audio[0]}" ] ; then #
cleanup; exit 1
fi
else
- ## toolame is way faster! (3x in my test)
- it=`which toolame 2> /dev/null`
+ ## twolame is way faster! (3x in my test)
+ it=`which twolame 2> /dev/null`
if [ -n "$it" ] ; then
- toolame_version=`toolame -h | head -n 4 | grep version | awk '{ print $3 }'`
- myecho "[dvd-slideshow] using toolame $toolame_version..."
- if [ "$toolame_version" == '0.2m' ] ; then
- toolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame_version=`twolame -h | head -n 4 | grep version | awk '{ print $3 }'`
+ myecho "[dvd-slideshow] using twolame $twolame_version..."
+ if [ "$twolame_version" == '0.2m' ] ; then
+ twolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
else
if [ "$vcd" -eq 1 ] || [ "$svcd" -eq 1 ] ; then
- toolame -s 44.1 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame -s 44100 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
else
- toolame -s 48 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame -s 48000 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
fi
fi
else
@@ -7125,18 +7125,18 @@ if [ -n "${audio_1[0]}" ] ; then ## au
fi
if [ "$output_format" == 'mpg' ] || [ "$output_format" == "mpeg2" ] ; then
- ## toolame is way faster! (3x in my test)
- it=`which toolame 2> /dev/null`
+ ## twolame is way faster! (3x in my test)
+ it=`which twolame 2> /dev/null`
if [ -n "$it" ] ; then
- toolame_version=`toolame -h | head -n 4 | grep version | awk '{ print $3 }'`
- myecho "[dvd-slideshow] Creating mp2 audio using toolame $toolame_version..."
- if [ "$toolame_version" == '0.2m' ] ; then
- toolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame_version=`twolame -h | head -n 4 | grep version | awk '{ print $3 }'`
+ myecho "[dvd-slideshow] Creating mp2 audio using twolame $twolame_version..."
+ if [ "$twolame_version" == '0.2m' ] ; then
+ twolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
else
if [ "$vcd" -eq 1 ] || [ "$svcd" -eq 1 ] ; then
- toolame -s 44.1 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame -s 44100 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
else
- toolame -s 48 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame -s 48000 -b $audio_bitrate "$tmpdir/audio1.wav" "$tmpdir/audio1.mp2" >> "$outdir"/"$logfile" 2>&1
fi
fi
else
@@ -7355,18 +7355,18 @@ if [ -n "${audio_2[0]}" ] ; then ## au
cleanup; exit 1
fi
else
- ## toolame is way faster! (3x in my test)
- it=`which toolame 2> /dev/null`
+ ## twolame is way faster! (3x in my test)
+ it=`which twolame 2> /dev/null`
if [ -n "$it" ] ; then
- toolame_version=`toolame -h | head -n 4 | grep version | awk '{ print $3 }'`
- myecho "[dvd-slideshow] Creating mp2 audio using toolame $toolame_version..."
- if [ "$toolame_version" == '0.2m' ] ; then
- toolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio2.wav" "$tmpdir/audio2.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame_version=`twolame -h | head -n 4 | grep version | awk '{ print $3 }'`
+ myecho "[dvd-slideshow] Creating mp2 audio using twolame $twolame_version..."
+ if [ "$twolame_version" == '0.2m' ] ; then
+ twolame -s $audio_sample_rate -b $audio_bitrate "$tmpdir/audio2.wav" "$tmpdir/audio2.mp2" >> "$outdir"/"$logfile" 2>&1
else
if [ "$vcd" -eq 1 ] || [ "$svcd" -eq 1 ] ; then
- toolame -s 44.1 -b $audio_bitrate "$tmpdir/audio2.wav" "$tmpdir/audio2.mp2">> "$outdir"/"$logfile" 2>&1
+ twolame -s 44100 -b $audio_bitrate "$tmpdir/audio2.wav" "$tmpdir/audio2.mp2">> "$outdir"/"$logfile" 2>&1
else
- toolame -s 48 -b $audio_bitrate "$tmpdir/audio2.wav" "$tmpdir/audio2.mp2" >> "$outdir"/"$logfile" 2>&1
+ twolame -s 48000 -b $audio_bitrate "$tmpdir/audio2.wav" "$tmpdir/audio2.mp2" >> "$outdir"/"$logfile" 2>&1
fi
fi
else
|
