Skip to content

Commit ce49a04

Browse files
committed
0.20180704
Simplify version
1 parent ad7985b commit ce49a04

File tree

5 files changed

+66
-35
lines changed

5 files changed

+66
-35
lines changed

CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.20180704
2+
3+
Simplify version
4+
15
0.20180702
26

37
Stdin

README.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ Latest:
1717

1818
* [Git](https://github.com/Olga-Yakovleva/RHVoice)
1919

20+
0.7:
21+
22+
* [rhvoice-0.7.tar.xz](https://sourceforge.net/projects/debiannoofficial/files/src/sound/speak/rhvoice-0.7.tar.xz)
23+
* [rhvoice_0.7-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/sound/rhvoice_0.7-wheezy_i386.deb)
24+
* [rhvoice-data_0.7-wheezy_all.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/sound/rhvoice-data_0.7-wheezy_all.deb)
25+
* [librhvoice3_0.7-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libs/librhvoice3_0.7-wheezy_i386.deb)
26+
* [librhvoice-audio1_0.7-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libs/librhvoice-audio1_0.7-wheezy_i386.deb)
27+
* [librhvoice-core1_0.7-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libs/librhvoice-core1_0.7-wheezy_i386.deb)
28+
* [librhvoice-dev_0.7-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libdevel/librhvoice-dev_0.7-wheezy_i386.deb)
29+
2030
0.5:
2131

2232
* [rhvoice-0.5.tar.xz](https://sourceforge.net/projects/debiannoofficial/files/src/sound/speak/rhvoice-0.5.tar.xz)
@@ -26,14 +36,16 @@ Latest:
2636
* [librhvoice-audio0_0.5-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libs/librhvoice-audio0_0.5-wheezy_i386.deb)
2737
* [librhvoice-core0_0.5-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libs/librhvoice-core0_0.5-wheezy_i386.deb)
2838
* [librhvoice-dev_0.5-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/libdevel/librhvoice-dev_0.5-wheezy_i386.deb)
29-
* [license-gpl_3.0-20171206_all.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/doc/license-gpl_3.0-20171206_all.deb)
30-
* [license-lgpl_3.0-20171206_all.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/doc/license-lgpl_3.0-20171206_all.deb)
3139

3240
0.3:
3341

3442
* [rhvoice-0.3.0.tar.xz](https://sourceforge.net/projects/debiannoofficial/files/src/sound/speak/rhvoice-0.3.0.tar.xz)
3543
* [rhvoice_0.3-wheezy_i386.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/sound/rhvoice_0.3-wheezy_i386.deb)
44+
45+
all:
46+
3647
* [license-gpl_3.0-20171206_all.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/doc/license-gpl_3.0-20171206_all.deb)
48+
* [license-lgpl_3.0-20171206_all.deb](https://sourceforge.net/projects/debiannoofficial/files/wheezy-update/doc/license-lgpl_3.0-20171206_all.deb)
3749

3850
---
3951
2018

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.20180702
1+
0.20180704

man/man1/rhvoiceplay.1

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
.TH "RHVoicePlay" 0.20180704 "04 Jul 2018" "User documentation"
2+
.SH NAME
3+
rhvoiceplay
4+
.SH DESCRIPTION
5+
SH script book reader of RHVoice speech synthesizer.
6+
.SH SYNOPSIS
7+
rhvoiceplay [options] book.txt|-|string
8+
.SH OPTIONS
9+
.TP
10+
-l N
11+
line begin [N=0-100] (only .txt, default = 0)
12+
.TP
13+
-s str
14+
RHVoice speaker (RHVoice >=0.5, default = aleksandr)
15+
.TP
16+
-h
17+
help
18+
.SH EXAMPLES
19+
rhvoiceplay -s elena book.txt.gz
20+
.SH COPYRIGHT
21+
(c) 2018 zvezdochiot.
22+
All rights reserved.
23+
.SH "SEE ALSO"
24+
speech-dispatcher

rhvoiceplay.sh

100644100755
Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,24 @@
33
#Depends: dash, rhvoice, aplay
44

55
sname="RHVoicePlay"
6-
sversion="0.20180702"
6+
sversion="0.20180704"
77

88
echo "$sname $sversion" >&2
99

10+
tnocomp=""
11+
tcomp="RHVoice"
12+
tcompa="RHVoice-client"
13+
[ ! "$(command -v $tcomp)" -a ! "$(command -v $tcompa)" ] && tnocomp="$tnocomp $tcomp|$tcompa"
14+
tcomp="aplay"
15+
tcompa="play"
16+
[ ! "$(command -v $tcomp)" -a ! "$(command -v $tcompa)" ] && tnocomp="$tnocomp $tcomp|$tcompa"
17+
if [ "x$tnocomp" != "x" ]
18+
then
19+
echo "Not found:${tnocomp}!" >&2
20+
echo "" >&2
21+
exit 1
22+
fi
23+
1024
tln=0
1125
tspeaker="aleksandr"
1226
fhlp="false"
@@ -38,45 +52,22 @@ then
3852
exit 0
3953
fi
4054

41-
if [ ! "$(command -v RHVoice)" -a ! "$(command -v RHVoice-client)" ]
42-
then
43-
echo "WARNING! RHVoice not found" >&2
44-
exit 1
45-
fi
46-
47-
if [ ! "$(command -v aplay)" ]
48-
then
49-
echo "WARNING! aplay not found" >&2
50-
exit 1
51-
fi
55+
trhvoice="RHVoice"
56+
[ ! "$(command -v $trhvoice)" ] && trhvoice="RHVoice-client -s $tspeaker"
57+
tplay="aplay"
58+
[ ! "$(command -v $tplay)" ] && tplay="play -q"
5259

5360
if [ -f "$text" ]
5461
then
5562
textsize=$(zcat "$text" | sed -e 's/[\.\?\!\…]/&\n/g' | sed -e '/^$/d' | wc -l)
5663
echo "$text: $textsize" >&2
5764
tln=$(($tln*$textsize/100))
5865
i=$tln
59-
if [ "$(command -v RHVoice)" ]
60-
then
61-
zcat "$text" | sed -e 's/[\.\?\!\…]/&\n/g' | sed -e '/^$/d' | sed -e "1,${tln}d" | while read tline; do p=$((10000*$i/$textsize)); p1=$(($p/100)); p2=$(($p-$p1*100)); printf "%02d.%02d: " $p1 $p2; echo "$tline"; echo "$tline" | RHVoice | aplay - 2>/dev/null; (( i++ )); done
62-
else
63-
zcat "$text" | sed -e 's/[\.\?\!\…]/&\n/g' | sed -e '/^$/d' | sed -e "1,${tln}d" | while read tline; do p=$((10000*$i/$textsize)); p1=$(($p/100)); p2=$(($p-$p1*100)); printf "%02d.%02d: " $p1 $p2; echo "$tline"; echo "$tline" | RHVoice-client -s "$tspeaker" | aplay - 2>/dev/null; (( i++ )); done
64-
fi
66+
zcat "$text" | sed -e 's/[\.\?\!\…]/&\n/g' | sed -e '/^$/d' | sed -e "1,${tln}d" | while read tline; do p=$((10000*$i/$textsize)); p1=$(($p/100)); p2=$(($p-$p1*100)); printf "%02d.%02d: " $p1 $p2; echo "$tline"; echo "$tline" | $trhvoice | $tplay - 2>/dev/null; i=$(($i+1)); done
6567
elif [ "x$text" = "x-" ]
6668
then
67-
if [ "$(command -v RHVoice)" ]
68-
then
69-
while read tline; do printf ": "; echo "$tline"; echo "$tline" | RHVoice | aplay - 2>/dev/null; done
70-
else
71-
while read tline; do printf ": "; echo "$tline"; echo "$tline" | RHVoice-client -s "$tspeaker" | aplay - 2>/dev/null; done
72-
fi
69+
while read tline; do printf ": "; echo "$tline"; echo "$tline" | $trhvoice | $tplay - 2>/dev/null; done
7370
else
74-
if [ "$(command -v RHVoice)" ]
75-
then
76-
echo "$text"
77-
echo "$text" | RHVoice | aplay - 2>/dev/null
78-
else
79-
echo "$text"
80-
echo "$text" | RHVoice-client -s "$tspeaker" | aplay - 2>/dev/null
81-
fi
71+
echo "$text"
72+
echo "$text" | $trhvoice | $tplay - 2>/dev/null
8273
fi

0 commit comments

Comments
 (0)