blob: ff372b216e58a3c0cd609283f221200dc3456e74 (
plain)
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
|
$NetBSD: patch-aa,v 1.1 2007/12/28 20:30:47 darcy Exp $
--- dvd-slideshow.orig 2006-03-10 00:56:54.000000000 -0500
+++ dvd-slideshow
@@ -877,7 +877,7 @@ hms ()
it=$(( $1 - $minutes * 60000 ))
seconds=$(( $it / 1000 )) ; [ $seconds -eq 0 ] && seconds="0"
thousandths=$(( $it - $seconds * 1000 )) ;
- characters=`echo "$thousandths" | wc --chars`
+ characters=`echo "$thousandths" | wc -m`
if [ $characters -eq 1 ] ; then
thousandths_out="000" # empty string!
elif [ $characters -eq 2 ] ; then
@@ -923,7 +923,7 @@ hms2seconds ()
minutes=`echo $1 | cut -d: -f2`
seconds=`echo $1 | cut -d: -f3 | cut -d. -f1`
fraction=`echo $1 | cut -d: -f3 | cut -d. -f2`
- characters=`echo "$fraction" | wc --chars`
+ characters=`echo "$fraction" | wc -m`
if [ "$characters" -eq 1 ] ; then ## no decimal was specified
duration_ms="0"
elif [ "$characters" -eq 2 ] ; then ## 1 decimal was specified
@@ -1121,7 +1121,7 @@ duration2ms ()
local l_duration_sec=`echo $1 | awk -F. '{ print $1 }'`
[ -z "$l_duration_sec" ] && l_duration_sec=0
local l_duration_ms=`echo $1 | awk -F. '{ print $2 }'`
- local l_characters=`echo "$l_duration_ms" | wc --chars`
+ local l_characters=`echo "$l_duration_ms" | wc -m`
if [ -z "$l_duration_ms" ] ; then
l_duration_ms=0
elif [ "$l_characters" -eq 1 ] ; then
@@ -4422,7 +4422,7 @@ if [ -z "${audio_1[0]}" ] && [ "$command
audio_1[0]='silence' # no duration needed
myecho "[dvd-slideshow] No audio files passed. Using $end_hms silence."
audio1_start=0
- audio1_end="$end_time"
+ audio1_end="5"
fi
## let's split this audio processing into two loops: one just prepares the
|
