pax_global_header00006660000000000000000000000064127454275250014527gustar00rootroot0000000000000052 comment=e55f16b7fd43854fd62c9a209af26e750f03999e espeakup-0.80/000077500000000000000000000000001274542752500132735ustar00rootroot00000000000000espeakup-0.80/.gitignore000066400000000000000000000000271274542752500152620ustar00rootroot00000000000000espeakup *.d *.o *.swp espeakup-0.80/.indent.pro000066400000000000000000000000111274542752500153440ustar00rootroot00000000000000-kr -ts4 espeakup-0.80/COPYING000066400000000000000000001045131274542752500143320ustar00rootroot00000000000000 GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. A "covered work" means either the unmodified Program or a work based on the Program. To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. 4. Conveying Verbatim Copies. You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. 12. No Surrender of Others' Freedom. If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . espeakup-0.80/ChangeLog000066400000000000000000001617441274542752500150620ustar00rootroot00000000000000commit 2964310b2411c10756712ba902687e8388c78142 Author: William Hubbs Commit: William Hubbs makefile: add target to generate changelog commit 918e8853cdd8270c77f641c69871851effe18416 Author: William Hubbs Commit: William Hubbs version 0.80 commit 3e5815429bd702d9b0af68d793e6c83f035f9e23 Author: William Hubbs Commit: William Hubbs Add my email address to the copyright statement commit 8b49d9d211f917f7ee2009569f746659ec9096a8 Author: Christopher Brannon Commit: William Hubbs Fix implicit function declaration warning. This fixes #7 commit 97adab70de5e49dde3ac26774a636cbca48558c0 Author: Christopher Brannon Commit: William Hubbs Replace usage of daemon(3). Original patch and commit message courtesy of: Samuel Thibault currently espeakup uses daemon() to do the daemonizing stuff. Unfortunately, daemon() does things not very appropriately, and there is notably a delay between the parent exit()ing and the child writing the pid file. The attached patch reimplements it properly, espeakup then notably plays much more nicely with systemd. Modified by Chris to apply to master. This fixes #8. commit 92903254894d2b6f2c398a104e78d15553de6017 Author: Christopher Brannon Commit: William Hubbs Fix spelling keystrokes and char-by-char echo. Use ssml's interpret-as="characters" setting when the kernel reports just one character. This allows the use of espeak's internationalized spelling of letters instead of having to maintain spelling ourselves in speakup. Original patch courtesy of Samuel Thibault and modified to work with the current code by Chris. This fixes #6. commit ee099174d849e32bf7b555e458963d27f84c64b2 Author: Samuel Thibault Commit: William Hubbs Allow a voice to be selected by language name This allows the -V option on the command line to be a language name. commit c1ad891f2e321b052802a2c3c121522757948e61 Author: Samuel Thibault Commit: William Hubbs Create pid file when espeakup is really ready This makes sure that we do not report that we are ready until everything is initialized. commit d97724373556e5ad6d632249bcc0ba4ef7aec4d8 Author: Christopher Brannon Commit: William Hubbs Add a missing #include, so that this can be built with musl. This closes #5. commit d95ee07775f6a63d80323e5ea242c530adf9c79b Author: William Hubbs Commit: William Hubbs Revert "add indexing support" This reverts commit e84e000b3ec9d393d720845a5f5fd05aa2ee7302. I need to think more about how to implement this. commit e84e000b3ec9d393d720845a5f5fd05aa2ee7302 Author: William Hubbs Commit: William Hubbs add indexing support commit 3fbbdf19224c26b80b161666b37cec70ac5dd6d2 Author: William Hubbs Commit: William Hubbs Do not try to remove the pid file unless we are in speakup mode commit 58ed438f00c0f79c87885b73292c3b4e5c44e0d4 Author: William Hubbs Commit: William Hubbs rework two if statements These if statements were executing code if we were not in acsint mode. They have been combined and the code is now executed when we are in speakup mode, which is what we want. commit b2bd1d33a8a8d08ea9316bcf3cf8169545e7df78 Author: William Hubbs Commit: William Hubbs make espeakup's default rate closer to espeak's default commit 3b4b6d0cbc98d175f00a9f1e744406e3491c6d85 Author: William Hubbs Commit: William Hubbs change code to use allocMem wrapper for memory allocation One of the new string handling routines is a wrapper for allocating memory. This commit changes the rest of the code to take advantage of that wrapper. commit 6180ff6e49371d9fc1cfb5afb05941222d925d70 Author: Christopher Brannon Commit: Christopher Brannon Don't check to see if espeakup is running in acsint mode. This check is important when running with speakup, since there can only be one instance accessing /dev/softsynth. It is unnecessary in acsint mode. commit ba316a4cd4ad42b5cf7a550953c1dc26338e3569 Author: William Hubbs Commit: William Hubbs separate string handling routines into their own module commit c06f18c4544a6e9e3d28b8f037bc40588fbff3f5 Author: Christopher Brannon Commit: William Hubbs support adapters using the acsint module commit 70f74657c274d37f94cf7a4eabcd1d06bafbfcb5 Author: William Hubbs Commit: William Hubbs fix Makefile to use MANMODE to install man pages commit 999e6551b5999f5779299e51858e4bbb587f5561 Author: William Hubbs Commit: William Hubbs add pid path option to help commit 3353241a79f0e2b130dce5e98d656284a7da84f8 Author: William Hubbs Commit: William Hubbs add command line option to change the pid path This adds a -P or --pid-path option to the command line which allows the user to change the path and the name of the pid file created when espeakup is running as a daemon. I would like to thank Chris Brannon for the original idea for this. commit 49dcacb2eca6f808f1f52a4faaf96f1fae24e4b5 Author: William Hubbs Commit: William Hubbs adjust rate offset and multiplier for espeak 1.45.04 commit 2154d1a23157cc2b0ff72f1ed51e5c8a26b452cb Author: William Hubbs Commit: William Hubbs use memset to initialize sigaction structure commit 1990e8e25d23fd4cbaa924ac7af480e2a079b9dc Author: Christopher Brannon Commit: William Hubbs Properly initialize sigaction struct. The sigaction struct used in signal_thread was stored in an automatic variable. The fields which were not set manually had undefined values. commit 701074fd9685ce4133672fbb35f046e76ab13422 Author: William Hubbs Commit: William Hubbs go back to just using a makefile The reason I went to autotools was the multiple sound systems, but since we are now just using espeak's audio processing we can go back to a more simple build system. commit 7bf2eee07a6c5d2120e62d13e0385e4c8e9c6782 Author: William Hubbs Commit: William Hubbs remove experimental alsa support The direct alsa support was experimental and never worked well. It had a setting which was system specific. Also, I feel that it is better to let espeak control the audio processing. commit c7ae47dfe59481b29ec80de2faaa6c8d3bd63379 Author: William Hubbs Commit: William Hubbs add experimental support for building a static binary This is done by adding a --enable-standalone switch to the configure script. commit 3bfc662bae54038172de1c52b04e9c589d2f7bd0 Author: William Hubbs Commit: William Hubbs update location of latest version and git repository commit 037e6422179424dd40667765039c6584ac306514 Author: William Hubbs Commit: William Hubbs rename todo file commit 0d9d7b61419eb37247e8f7afb6c5b7ff198f0ab7 Author: William Hubbs Commit: William Hubbs update readme commit 056dcf70fe5a6850b73193ea06480bd955695e2e Author: William Hubbs Commit: William Hubbs convert to autotools commit d1630432ba55033c82da0dcae4a409f14da8d03f Author: William Hubbs Commit: William Hubbs re-organized the makefile. commit 8fda956e020abcde9365c20c6e14f3ebc15cd2e1 Author: William Hubbs Commit: William Hubbs fixed permissions in makefile It turns out that the install commands need to have the permission options otherwise the permission of everything that is installed is 755, which is not correct. commit 4cfcd7ba116ddd3e1c80744b4eb7e0b83438ec86 Author: William Hubbs Commit: William Hubbs fixed mandir the mandir variable in the makefile should point only to the top level of the man tree. commit 1a10788c5f140f75e0f54a2baaf8625125bb52ac Author: William Hubbs Commit: William Hubbs lowered latency setting to 1/40 of a second. commit edb5e50fcd52d6f0ed9d2decb5c874dfd9395998 Author: William Hubbs Commit: William Hubbs make alsa code more readable This changes the code to use constants for the parameters to snd_pcm_set_params. This makes it easier to read the code and to update the values if needed. commit dec561324df67bd64eede09bcb2eb25273a04081 Author: William Hubbs Commit: William Hubbs updates to alsa support After studying pcm_min.c in the alsa library git repository, I updated the alsa support to be similar to what I saw there. commit 486fe27f47d12a0482060aac4fc6c1568fab0613 Author: William Hubbs Commit: William Hubbs removed permission settings from makefile commit 311b6911959263a81f4dd74b44ad93af53a981b1 Author: William Hubbs Commit: William Hubbs fix makefile to not define variables if they are already defined commit ffe397fb911b0de8a14cacfc69bf9e683c9ef402 Author: William Hubbs Commit: William Hubbs removed the minimum function This function really wasn't needed. I also attempted to make the callback functionn more like the test code in the alsa library git repository. commit e66311bb992122ca4797eab1d2a79b1619c71b9b Author: William Hubbs Commit: William Hubbs added automatic dependency tracking to the Makefile commit 11cc053d822d563b9c040ce50341f8c8cd8b4f86 Author: William Hubbs Commit: William Hubbs reworked the makefile This version of the makefile should be more compatible with allowing users to pass in cflags. commit 48fa03faf5529a4072ae50fe9ff983333bc6fca0 Author: William Hubbs Commit: William Hubbs renamed espeak_sound.c to portaudio.c This better describes the sound system that espeak uses natively. commit 654fc810fe981907d3f17d212ae51d9d6124fa42 Author: William Hubbs Commit: William Hubbs default prefix to /usr/local Without packaging, we should be installing espeakup in /usr/local. commit e4e3f0979e1820712a6a88bfcf60da34a8a747f0 Author: William Hubbs Commit: William Hubbs the status handle should be static commit 57547e8efa0dcf9f7f1750d7e8472f7207d20329 Author: William Hubbs Commit: William Hubbs renamed synth.c to espeak.c The name was changed because it describes the function of this code more accurately. commit ac9e12414b2f4a1b38f8dabdaf7eb5ae33276008 Author: William Hubbs Commit: William Hubbs made stop_requested a global variable The two variables, stop_requested and runner_must_stop were performing the same function, so I am using one variable, stop_requested for this function. commit 18ebab3247934c71320abed559021fe6eebab530 Author: William Hubbs Commit: William Hubbs indentation fixes commit cc7e77eb9db904f27b9de12f4b25b17c2f6d5b02 Author: William Hubbs Commit: William Hubbs move stop_audio call to synth thread Since there is no reason currently for the softsynth thread to do this, it makes better sense to have the synth thread control all interaction with espeak. commit 32d848cb76de9853564d7e2ea37725c1f9af1ae4 Author: William Hubbs Commit: William Hubbs make callback honor should_run The callback should return and abort synthesis if should_run is 0. This fixes slow shutdown times in alsa mode. commit 4de82bf24cff9e5a82a2645f30af0dbfae6ded05 Author: William Hubbs Commit: William Hubbs added a couple of #defines to the alsa code commit 739e074072100dd420b10eb1d8b8d55451b9bdea Author: William Hubbs Commit: William Hubbs reworked the queue_remove function Now, when queue_remove is called, it returns the pointer to the data of the first entry in the queue and removes the entry. commit 014d27b7aa218db968ab19b2b493fe95406b4b8b Author: William Hubbs Commit: William Hubbs removed some unlock_audio_mutex() calls commit 82490a98d253d5201f93f309289346fff5169abc Author: William Hubbs Commit: William Hubbs call snd_pcm_prepare after snd_pcm_drop in stop_audio commit 101e14901e0517f6f09024dc8dc1f47dc682227a Author: William Hubbs Commit: William Hubbs removed white space in the makefile commit dc056e6c773e203af74d290393819b7fdc4043e0 Author: William Hubbs Commit: William Hubbs broke the queue definitions out into their own header file commit 0a9a8cce9bcb0310903aaffafd2dbdbe5a6458c4 Author: William Hubbs Commit: William Hubbs small style changes commit 40479540b4c8dd6a876b084bce0e6c806033da06 Author: Christopher Brannon Commit: William Hubbs Fix a memory leak. If we fail to add entries to the queue in queue_add_cmd or queue_add_text, properly free the entry. commit ccb8cea91ee1537e24070dbd3cc568e6f24ddb28 Author: William Hubbs Commit: William Hubbs stop speech before clearing the queue Thanks to Kirk Reiser for pointing out that this makes the cancel response faster. commit 31ad5f04ca691228889bd839852d8b19321c86c1 Author: Christopher Brannon Commit: William Hubbs Completely data-agnostic queue functions. The functions in queue.c no longer use static variables. We can now use them for multiple queues, if necessary. commit 011ec271627615be44e1bacd6d269745c86028e9 Author: Christopher Brannon Commit: William Hubbs Create pipe before starting the signal handler thread. The thread can write to the pipe, so the pipe must be initialized before the thread starts. commit 04d10d88ec0bb2161885bc3358a9bc6b5e06ce35 Author: William Hubbs Commit: William Hubbs more sound updates removed the user_data processing code and put the call to snd_pcm_drop in stop_audio. commit ceaae3640a51fad408386f27bb30fe2063cdf58e Author: William Hubbs Commit: William Hubbs audio should be stopped in softsynth_thread not espeak_thread commit c9f871f687c6bd6ef1a562000c53c6762cfa7205 Author: William Hubbs Commit: William Hubbs see if we need to silence speech before we process the queue commit a82bbd81400cfa002835c35ce46a956cc81460ad Author: William Hubbs Commit: William Hubbs fixed a memory leak If we processed an entry from the queue successfully, we were removing the entry itself from the queue but not freeing the memory allocated to the entry. commit 58f09983f856703e8a06d9b16ef17b7d8728eb4d Author: William Hubbs Commit: William Hubbs fixed callback return code The callback should use the value of stop_requested as its return code. commit 0238baa5c29f9fef26b4608be24e4f63b2927e82 Author: William Hubbs Commit: William Hubbs more alsa updates Made an 'if' statement in the callback more clear and added some locking for the audio mutex. commit bcd64cb263745e3994484156713a601db1b59990 Author: William Hubbs Commit: William Hubbs created a start_audio function This moves audio control to the specific files, espeak_sound.c and alsa.c, which are tied to the sound systems. commit 9b7dcebb6d3dd84d19a448e7e79a1746cd939a62 Author: William Hubbs Commit: William Hubbs alsa updates The first while loop in the callback doesn't need to be a loop. If the audio fails, we can just print an error and return. commit 46bf3d99d51960c7a179d9bfd6724c4a428e0658 Author: William Hubbs Commit: William Hubbs all access of the audio mutex should go through our functions commit 87ab6c6ea822f9f7b393d1cb83c9f579d728326a Author: William Hubbs Commit: William Hubbs make sure that snd_pcm_drop is successful. This was suggested by Kirk Reiser and Chris Brannon. commit 4889572ad18a8be877916d131d9a101b6563773c Author: William Hubbs Commit: William Hubbs use user_data to detect old events When espeak_Cancel is called, change the value of user_data that is passed to the events, and, in the callback, use this to test to see if cancel was received. If the value of user_data has changed, discarde events that have the old value. This patch is from Chris Brannon. commit a9398bdeb413f8c9b88178756e0cdc7ede55b0bc Author: William Hubbs Commit: William Hubbs Added another error check for alsa commit be879d206b52221546e4b8e00b60e0c0cf70f855 Author: William Hubbs Commit: William Hubbs alsa update I changed the name of the callback to alsa_callback and removed a line that was making the amount of data written to the sound card very small. commit c1d33d673838faf8b70cc42c72c119f5c0002d44 Author: William Hubbs Commit: William Hubbs Set the espeak audio buffer size to 50 ms This should help make the cancel command more responsive. commit 0471ff47f4dc031cf70b14eb15128fd60fb185dd Author: William Hubbs Commit: William Hubbs add support for the user_data parameter to espeak_synth The user_data parameter is just a pointer that is passed into the espeak_synth call that is passed back to the callback. In native mode, we are not using it since there is not a callback. However, in alsa mode, it will be used to indicate when a cancel was processed. commit 520bbae36512731bc075870c0baa9339929b4fde Author: William Hubbs Commit: William Hubbs renamed stopped to stop_requested This is more descriptive of what the variable actually does. It signals the callback to stop the audio. commit 8f3e8f196711d729de6c2dc1ed1ef2d086f99955 Author: William Hubbs Commit: William Hubbs moved the audio_mutex code to alsa This is not needed for native sound support, so it has been moved into the alsa specific code. commit e49acbb59acdbad827da2fc4dd7061e7fe2de35a Author: William Hubbs Commit: William Hubbs removed a debug print commit 24bcdf5666d2546b9177b54b25d2fbfc54ab804b Author: William Hubbs Commit: William Hubbs another termination fix espeak_thread needs to signal softsynth_thread once more as it is going town so that softsynth_thread will see that should_run is now 0 and terminate. commit 5ec3809c599981f79db87f41f4b181eb5456a4f7 Author: William Hubbs Commit: William Hubbs wake up espeak_thread when softsynth_thread terminates espeak_thread needs a signal since it might be sleeping and should_run has changed. This makes sure it terminates. commit 5ebe506026cf2a5953ba9773d2e2c434e8bbc6f4 Author: William Hubbs Commit: William Hubbs more mutex fixes Make sure that should_run is protected by the mutex in the softsynth thread. commit d5fd5d69b84cdcde67357a5a934b343e46a32cb2 Author: Chris Brannon Commit: William Hubbs don't wait on a condition variable if should_run is false commit 633743117c7067bb7f7a7a12f2edbe6bb463a366 Author: William Hubbs Commit: William Hubbs mutex fixes We need to make sure that should_run is protected by the mutex. commit 1750b92cfb0e5d5a39564ea8d949113c4e0c3409 Author: William Hubbs Commit: William Hubbs fixed signal handling issue The signal handler stopped working after I moved the initialization calls to the main function. Creating the signal handler thread first fixed this issue. commit eb74a3ce171515dd1f2970dfb3d1b6c2f07c6d79 Author: William Hubbs Commit: William Hubbs removed an unnecessary call to espeak_Terminate() commit dd00775695f713667b2fc295feab6a2a2fe1926e Author: William Hubbs Commit: William Hubbs initialization update The main function now initializes espeak and opens the softsynth before starting the threads. This insures that the resources we need are active. commit 6a15f2cccf4d98e112f09ae64e68773c028b76f6 Author: William Hubbs Commit: William Hubbs fixed first wait in softsynth thread The thread should wait if there is nothing in the queue and if there is not a request to stop. Thanks to Chris Brannon for the patch. commit 3687f16b09d7ff37f73ca0f98acd8dedd4ce18c1 Author: William Hubbs Commit: William Hubbs wait for acknowledgements correctly pthread_cond_wait() can have spurious wakeups, so we need to be sure that the condition is actually true when we return from this function. Thanks to Chris Brannon for the patch. commit 938e10b66a14237cdff734ae5b97525f9c4ae9cc Author: William Hubbs Commit: William Hubbs removed a nested lock/unlock commit 975765289b3348219d0db8b2d64e2f4f7747f9f2 Author: William Hubbs Commit: William Hubbs made sure all cond_wait and cond_signal calls are inside lock/unlock calls commit b8c7247feb05a07bab653cab2a6be50a4a17fd5d Author: William Hubbs Commit: William Hubbs removed acknowledge_guard and substituted queue_guard commit 1091182f884cb8187ce3cdaf3723243deaa4dcb2 Author: William Hubbs Commit: William Hubbs removed a debug print call commit 0bf2cae5a6cd35ea7ee78fbb136ccb58f6937b3e Author: William Hubbs Commit: William Hubbs moved lock/unlock in queue_process_entry The only time queue_process_entry should lock the queue gard is when it is removing the item from the queue. This happens only when the item was successfully processed. commit 554a03d26c147958b99b78690214e195cda65c41 Author: William Hubbs Commit: William Hubbs white space fix commit b7f324072f26fa31a8d9772f38bdf1f920504223 Author: Christopher Brannon Commit: William Hubbs Fix concurrency bugs. 1. Don't lock or unlock queue_guard during queue_clear. It is locked when queue_clear is called, and it should remain so. 2. Protect runner_must_stop with queue_guard in the request_espeak_stop function. The following condition should always hold: queue_guard is locked while testing or modifying runner_must_stop. 3. Rename stop_guard to acknowledge_guard. This is a more descriptive name. This mutex simply protects the acknowledgement of the stop request from being lost. 4. Remove the pthread_mutex_lock from the top of queue_process_entry, because queue_guard is already locked when the function is called. commit a8cad20de898002465fad6f3cf42f381f2a33812 Author: William Hubbs Commit: William Hubbs more multithreading work Rearranged the queue handling code so that queue.c is generic. Also rearranged several functions in the threads. commit 42c3f76a083890c49fcb7d92a2f695f69e4882b4 Author: William Hubbs Commit: William Hubbs moved include for pthread.h to espeakup.h commit 3e8e7d12ae89b4b2c00596cf88fcb35fd4b5b20e Author: William Hubbs Commit: William Hubbs added back the declaration for softFD commit af5717b8cb3d9c2232f20f90d32601c0f7021fca Author: William Hubbs Commit: William Hubbs moved queue_add_xxx functions to softsynth thread commit c6b57885c9479f4d85831b2082206bef685cd74d Author: William Hubbs Commit: William Hubbs removed declaration of rate from main commit d82bfcd09ccd4145d17473bc9ae60af223a5f66e Author: Christopher Brannon Commit: William Hubbs Make one thread responsible for handling espeak interaction. Most of the idea for this change came from William: Renamed queue_runner to espeak_thread. Moved espeak initialization and termination to espeak_thread. The while loops that process the queue now use the variable should_run. commit 0fdca827b851fd0beb9f476c52ec5568ed36174e Author: William Hubbs Commit: William Hubbs check for terminalFD after select() If terminalFD has something to read, we break out of the loop in the softsynth thread. commit 474580b08b32d713ffb6f23c486685f1927e12c0 Author: William Hubbs Commit: William Hubbs add pipe to wake up the softsynth thread This adds a pipe to wake up the softsynth thread, in case we receive a signal while it is in a select. Thanks to Chris Brannon. commit c5fce64f259bce473cd3c9371d7b095639a87fe5 Author: William Hubbs Commit: William Hubbs removed open_softsynth and close_softsynth The thread can now handle the softsynth device, so main doesn't need to call these functions. commit a58f93cd74fead43927093d36fc775a976788a4b Author: William Hubbs Commit: William Hubbs renamed reader_thread to softsynth_thread commit dfc9bbff6518b2de6e4464fd348ae460766606fb Author: William Hubbs Commit: William Hubbs fixed should_run declaration Removed the local declaration of should_run and set up the extern. commit 9d1cabdd0d513c45bafdf7cc9c62b503f4a0f31d Author: William Hubbs Commit: William Hubbs started work on multi-threading more of the program The goal is to create threads for the reader, que runner/espeak processing and signal handling. As of this commit, this code is still being worked on, so it is broken. commit f58d9984ce6d615158d53a6cf1b5d503296973ab Author: William Hubbs Commit: William Hubbs Now the queue runner/softsynth handler clears the queue Thanks to Chris Brannon for the patch. commit 24e7d667bce7568585e1e644b1935c8fe0709b75 Author: William Hubbs Commit: William Hubbs queue fixes This adds retry processing back to the queue functions. queue_remove should only be called after the head entry on the queue is processed successfully. commit 26ab109bd8e14fd3d26a434cac2e5760b23dbf0a Author: William Hubbs Commit: William Hubbs moved the check for stop out of the loop In the callback, we should check to see if the stopped flag is true whether or not we are processing audio. commit b108764b02e0d6eb1e8a3074cf2f85f10eb01d03 Author: William Hubbs Commit: William Hubbs removed the audio_callback variable commit 739d79cff89f2792aa47813e08bdcbb3065c32de Author: Christopher Brannon Commit: William Hubbs Select audio mode before initializing espeak. commit ec9d8b1ee23095afadd07bd05cbf1ca21df11b8f Author: Christopher Brannon Commit: William Hubbs Add error-checking to the snd_pcm_set_* calls. These can fail. They do more than simply manipulate a structure. commit a5d1a48f42bbb3de67551113c1f15da10f7b916d Author: Christopher Brannon Commit: William Hubbs Obtain sample rate from the value of espeak_Initialize. espeak uses a sample rate of 22050 HZ, but let's not rely on that knowledge. espeak_Initialize returns the sample rate on success, so rely on that value when selecting a rate. commit 3bb78df86c3a135660864e1e07c1d5266a575bce Author: William Hubbs Commit: William Hubbs Do not set the period. commit 94e23a3a027dfd887f6713e745a0b97ec09dfbc7 Author: William Hubbs Commit: William Hubbs fixed error condition check in alsa.c The check was looking for a specific error when it should have been just checking for failure. commit a69342fcada7fe6533b81c1ae0bad23f983a399a Author: William Hubbs Commit: William Hubbs removed some blank lines and put the variables at the top of the file commit 91b8960b6add66a982327e68d51f75d25f828af8 Author: Christopher Brannon Commit: William Hubbs Protect the stopped variable with a mutex. An oversight. Should have done this in the initial commit. volatile does not imply atomic. commit 0ad70b4eaa35d57867f20c631f60841fde824e20 Author: William Hubbs Commit: William Hubbs Revert "fixed stop_speech issue" This reverts commit 1c440e5a42ef2606c0330f816b00172ab309505c. commit 1d02169aa584ebb8c8739c4b1255abd3ee51e709 Author: William Hubbs Commit: William Hubbs alsa support is conditional This commit updates the makefile and the documentation to explain how to build alsa support. It has not been fully tested, so it is not built by default. Also, I was able to remove the conditional compile directives from the source. commit 1c440e5a42ef2606c0330f816b00172ab309505c Author: William Hubbs Commit: William Hubbs fixed stop_speech issue The stop_speech function needs to test the return code from espeak_Cancel() to be sure the operation was successful before signaling the callback to stop the audio. commit 08e46c58a804c380f73a8be3403663af790a48bd Author: William Hubbs Commit: William Hubbs indentation fixes commit d373fb2aa7fbf673594cd98225877c6998dc99ad Author: Christopher Brannon Commit: William Hubbs An initial stab at ALSA support. It's very raw right now. commit b31985f97c30b043dba7b77c5af0b42d3a65fcdd Author: William Hubbs Commit: William Hubbs released v0.71 commit d7dd0f919dc82cc0e497700412980ce771a5d7df Author: William Hubbs Commit: William Hubbs fixed initialization issues We were not returning exit codes properly if we were unable to open the softsynth or if the daemon was already running. commit 2db53856a90a82c99c759399a1dfa5e704ce4f4a Author: William Hubbs Commit: William Hubbs fixed typo in tarball script commit 55f8ebf98a0fd2caef675e22499798b8ead99b12 Author: William Hubbs Commit: William Hubbs released v0.70 commit 69f1e8554a65b3eb0bdfcaf56bbcea86acc7e926 Author: William Hubbs Commit: William Hubbs The tarball script now adds a ChangeLog commit 0e47c95015a8d0ca3c777717f3187bafc615f201 Author: William Hubbs Commit: William Hubbs updated README commit c235a3b063a524cd308f2512c14502b5dee71434 Author: William Hubbs Commit: William Hubbs added .indent.pro to the repository commit d7c81f5117442d66358efb52232d51f45a90d4e8 Author: William Hubbs Commit: William Hubbs indentation fixes commit 3ddbb94e37a5183a0010a2e1ae46f4a64d39bba4 Author: Christopher Brannon Commit: William Hubbs multithreading Make espeakup a multi-threaded program. One thread reads from the softsynth device, queuing text and synthesis commands. The other thread processes items from the queue. commit 3a8323f98c702443f65b35bbfa84d3ae2c4c9b39 Author: William Hubbs Commit: William Hubbs Fixed typo in README commit e7d300a183668d24cc1250083bd09ab1abcc4cfb Author: William Hubbs Commit: William Hubbs turn off espeak's default processing of uppercase letters This needs to be turned off since speakup processes upper case by raising the pitch. commit a1510b5e93de11dbf70fec2295b30a87656b4824 Author: William Hubbs Commit: William Hubbs indentation fixes commit 3dbdcb21cbb28dc6cebd80077a6e774cc2673bb6 Author: William Hubbs Commit: William Hubbs Aespeakup should not drop all non-ascii characters. This fixes an issue with non-english languages. Thanks to Samuel Thibault for the patch. commit 9551ba81d9bffad667f0d5f864d07c767e2e70e6 Author: William Hubbs Commit: William Hubbs espeakup 0.60 commit 6366b41bdf7b28b392de8ca0c2a246a8360f9293 Author: William Hubbs Commit: William Hubbs espeakup v0.6 commit 40f152e11fb4a89546e459861ac0348c58c8d449 Author: William Hubbs Commit: William Hubbs allow users to override CFLAGS This fixes an issue with the Makefile that was not allowing users to override cflags and keeping -Wall in the flags when compiling. commit 4e7ae23757290ef299a3ba4285bc031de425d788 Author: William Hubbs Commit: William Hubbs created tarball script This commit adds a script to create a tarball from the repository and removes this functionality from the makefile. commit 9ee3fd433cb2513462327fd815f108dc9abc8e8e Author: William Hubbs Commit: William Hubbs documented --default-voice in man page This commit adds the documentation for --default-voice to the espeakup man page. commit e2493db48e69307eeee3390d9329212cb6403613 Author: William Hubbs Commit: William Hubbs add --default-voice option to the help and README This commit adds the documentation to the help and README files for the --default-voice command line option. commit 2351b5d489454c32c4a5c2ccdb1da609ded03b70 Author: William Hubbs Commit: William Hubbs add support for setting the default voice This adds support for a --default-voice or -V (upper case) command line option which will set the default voice espeakup uses. This takes a name of an espeak voice -- for example: espeakup --default-voice=en-us or espeakup -V en-us commit da15136aa7b8c12024d9178d1ba6b29037984a75 Author: William Hubbs Commit: William Hubbs only one espeakup daemon should be running This fixes a bug which would allow espeakup in debug mode to be run even if espeakup was already running as a daemon. commit 8dca597f29e0ef54525f5f717a7058a037d2e9fc Author: William Hubbs Commit: William Hubbs Added a version script I added a version script. This is used in the Makefile to get the version of espeakup when none is specified when a tarball is created. commit bbf77d918dac93e1bec7fc90c0b8b34dfb5a8e65 Author: William Hubbs Commit: William Hubbs Cleaned up warnings and adjusted CFLAGS This commit cleans up warnings and adjusts CFLAGS. Thanks to samuel.thibault@ens-lyon.org. commit 7db55303088588a19fcde1c804268c984f6008d8 Author: William Hubbs Commit: William Hubbs Espeakup version 0.51. commit 341fa7ba425892c12ae293584aacd9028d520e62 Author: William Hubbs Commit: William Hubbs fixed install command in makefile. commit 0f24afef95c2bdda474d77bc774f19003015da46 Author: William Hubbs Commit: William Hubbs espeakup v0.5 commit c12ec3e1b060b6e3ec1ac53db33b6f87877e9109 Author: William Hubbs Commit: William Hubbs moved version definition This commit moves the version definition to espeakup.c instead of cli.c commit a8876a79644f36453a7edaef4c0860c7d2402c9b Author: William Hubbs Commit: William Hubbs fixed the license in the man page The man page said that espeakup is under gpl version 2 or later, but it is under version 3 or later, so I fixed the man page. commit 2b96dd2a026bb2220071699fc51cdf11b9412d82 Author: William Hubbs Commit: William Hubbs updated man page This commit re-words the description of espeakup in the man page. commit 17553c3c391e011a1ccf90179c634003d2a61519 Author: William Hubbs Commit: William Hubbs fixed the makefile This commit removes the definitions for CC, RM and INSTALL from the makefile so that it will use system defaults for these commands. commit ace8acf7d01cc256c1df96d3b03e21806772edb5 Author: William Hubbs Commit: William Hubbs fixed hyphenation This commit turns off hypenation in the man page. commit 84c473b690633999f47478dbf00c766d1a31628b Author: William Hubbs Commit: William Hubbs added man page This commit adds a man page for espeakup. Thanks to Chris Brannon for writing it. commit f7ddd8dc77927d21a07479f80969df031af396f2 Author: William Hubbs Commit: William Hubbs Released v0.4. commit a3901a7e4c0d273f2ad5352f939714fe235166e4 Author: William Hubbs Commit: William Hubbs fixed a bug in process_command One of the switch statements in process_command did not have a default label, which lead to undefined behavior. Thanks to Chris Brannon for the patch. commit 36b05aec419a7ab7bc3b66358f62122096ec9ce2 Author: William Hubbs Commit: William Hubbs Added support for the punctuation command from speakup commit c48b05d7437435c0c7513e9d98ab04b565c87f92 Author: William Hubbs Commit: William Hubbs moved all variable definitions to the top of the Makefile. commit 82fa63600b9377fa590a2c97ed737fd8c85a622c Author: William Hubbs Commit: William Hubbs fixed the makefile Added espeakup.h as a dependency in the makefile so that the sources will be compiled if it changes. commit d7e8dc2b342b5a810ec561535ca0426969f519ea Author: William Hubbs Commit: William Hubbs Revert "fixed the length calculation when a flush is processed." This reverts commit 66cb5a7b5cfe0e569525935d03b0843ee85a8afc. commit 66cb5a7b5cfe0e569525935d03b0843ee85a8afc Author: William Hubbs Commit: William Hubbs fixed the length calculation when a flush is processed. commit 62deb008bc658d925bd86fb4172b12779b9cad18 Author: William Hubbs Commit: William Hubbs fixed the number of bytes to move in the memmove() call commit 14858818d3cf38886aef5089982522feb9a8edfb Author: William Hubbs Commit: William Hubbs changed strcpy to memmove The areas pointed to by strcpy() cannot overlap, so we need to use memmove() in case that happens. Thanks to Chris Brannon for pointing this out. commit 6bec55ca5789e26ee315e890f4937c1451b8cd07 Author: William Hubbs Commit: William Hubbs changed process_buffer to use the isprint() call. commit 1b608481a4062f3a8f98192e50acfcb73cf577e2 Author: William Hubbs Commit: William Hubbs the main loop now uses strrchr and strcpy The idea for this change came from another patch submitted by Chris Brannon. We now use strrchr to look for the flush character and strcpy to move the remainder of the buffer to the beginning. commit faab1893893fa0c97263a0edf965cf4f67bd1294 Author: William Hubbs Commit: William Hubbs Fixed the select call The select call was moved to be in the if statement below it since the return code is not needed after that statement is processed. commit 24607b1cc8000d4d95128e96662240dbce385358 Author: William Hubbs Commit: William Hubbs made the synth flush character a constant for readability commit c8e2a35763624463d1006a83ab0125603813d239 Author: William Hubbs Commit: William Hubbs fixed an off-by-one error The loop can start at length-1 since we know that the last character in the buffer is a null. Thanks again to Chris Brannon for finding this. commit f76d00f6afefb8de92bf205d16d84f488b91615d Author: William Hubbs Commit: William Hubbs removed the callback function This commit removes the synthcallback function since it wasn't doing anything. Also, it has been reported that this may be causing the sluggishness when espeakup is asked to shut up. Thanks to Chris Brannon for finding this. commit 17f07e8cd175520c8fe16880f9f578e0f49579fc Author: William Hubbs Commit: William Hubbs released v0.3. commit 9b0c6a8224980c8637302d9e680cccef4ed0043d Author: William Hubbs Commit: William Hubbs fixed the volume multiplier The volume range is actually 0-200 instead of 0-100, so the multiplier needed to be adjusted. commit c7e3835fbd2ab4d9ae5162488163d22c8bd9c811 Author: William Hubbs Commit: William Hubbs Updated ToDo list commit 527fb136de9d01c752f6f6d03d2ac42b89a94499 Author: William Hubbs Commit: William Hubbs starting work toward supporting changing voices This commit adds a set_voice() function which will ultimately allow the user to switch voices. commit f52c03ec2be8cc67e680eda0cdb6bbb051b858cd Author: William Hubbs Commit: William Hubbs Fixed a typo. commit 8d3552c9642aec00f5ecc89dbbccd181244d9bfa Author: William Hubbs Commit: William Hubbs updated readme commit 1f784be8911bd2917e697630de3da05da2814ab4 Author: William Hubbs Commit: William Hubbs added support for long command line options commit 037019de3a74c191349bebc03289a11ab7cead42 Author: William Hubbs Commit: William Hubbs Espeakup v0.2 commit 943ff9d3dc50184a359ee7b39d57b4baaba0657c Author: William Hubbs Commit: William Hubbs updated README commit 5ddeb1e978bc637b4db22f19d0db8e448599f5e0 Author: William Hubbs Commit: William Hubbs indentation fixes commit ccc9c4aa4ed3f16d3781b92fbd6d6ec013627c5c Author: William Hubbs Commit: William Hubbs modified rate offset This commit moves the rate offset to 84 instead of 80 so that the highest espeak rate can be reached by setting the speakup rate to the maximum. commit 96a3b198508172e30bb0614563db94f83e45ce03 Author: William Hubbs Commit: William Hubbs fix flush processing This removes flush processing from process_command() and fixes the code in the main loop so that it does not ignore the 0 position in the buffer. commit 5bc67dc49d61468968b25cda1340091fced573a0 Author: William Hubbs Commit: William Hubbs updated ToDo list. commit 02e72bda39b4c26bcc1a67d701a405427e3a6f8a Author: William Hubbs Commit: William Hubbs adjusted the rate multiplier This gets us closer to espeak's top speed, which is 390 wpm. commit ebcbcac9d2b230a37347f60aa3e2715a07bb13a6 Author: William Hubbs Commit: William Hubbs removed an extra assignment statement commit d2d763b36ba477c18a04933ee49b68f71dd641a2 Author: William Hubbs Commit: William Hubbs moved flush processing into main loop This patch from Kirk Reiser attempts to increase responsiveness by moving the flush processing into the main loop. commit 564db7981e1aeda4eb84958d1f66c6474803991f Author: William Hubbs Commit: William Hubbs put back the select code This needed to be put back to keep espeakup from using 100% of the cpu. commit 5005b9ddde90aeab3948f9123491463d0e319528 Author: William Hubbs Commit: William Hubbs removed code that uses select I was using the wrong type for the return value for read(). commit 3e7e5be2b78bdc1dbaa400d3b8e35ac66eab3cbd Author: William Hubbs Commit: William Hubbs fixed bug with volume setting Now the volume setting should be announced again. commit f973c9ec3fa92560279acede8386beeaa5f6835b Author: William Hubbs Commit: William Hubbs cleaned up prototypes This commit gets rid of extra spaces in some function prototypes. commit 498ce65db7d789b9639b96240555e48ab3a910b6 Author: William Hubbs Commit: William Hubbs cleaned up process_command commit aac77a3cf1edd6b503bcaada06a575ac06efa6f7 Author: William Hubbs Commit: William Hubbs ignore object files commit de8d4d9dc3bb7afd51eef89c0c7c2fb6d630b7a7 Author: William Hubbs Commit: William Hubbs fixed an include for gcc 4.3 commit b34e397717bae998bd2280a0774a04cd37ea1791 Author: William Hubbs Commit: William Hubbs clear the queue when we catch a signal commit 4c30dac5e16c84d92f12aa06c3cf5279c726d8db Author: William Hubbs Commit: William Hubbs added prototypes for queue functions commit 2bf3b17ffcbb3705afc23957e77fba2dc7abbda9 Author: William Hubbs Commit: William Hubbs removed debug flag from cflags commit 655894ee2a240036e966a5854fc71bb788aebe25 Author: William Hubbs Commit: William Hubbs added queueing support I have added queueing support so that when we read from the softsynth we can put the text and commands we have read into a queue. This will allow us to retry calling espeak_synth() if we fill espeak's internal buffer. commit 86e93edeb09774d3689cca7f9fe96aa484f3bd6d Author: William Hubbs Commit: William Hubbs removed softsynth code from main module commit 261c6db032a0c4654c0b77055701223bee055dcb Author: William Hubbs Commit: William Hubbs Added ToDo list commit 029dd03251d24dc5c0a1b0e5a16706c0ca73180d Author: William Hubbs Commit: William Hubbs modularize the code This commit just re-arranges the source so that it is easier to work with. commit 882e9c20a547707c2d63a70414de951c50e5d4db Author: William Hubbs Commit: William Hubbs clean up the main function This commit cleans up the main function and moves command line processing to a separate function. commit 4d2f76d6e111bb45cdf336f4be8140bcab3d51b6 Author: William Hubbs Commit: William Hubbs removed makedist The functionality to create a tarball has been moved into the makefile. Now it is possible to create a tarball by doing: make tarball - creates a tarball of the llast tagged version. make TAG=gittag tarball creates a tarball based on the tag that is given to it. commit 1802877912be8e4b68541ed07d738841947463fd Author: William Hubbs Commit: William Hubbs Removed init scripts. It will be best to let packagers write init scripts for their distributions, so I am removing them from this repository. commit 3d83e0f6d152035890d7dbecb5961ee79234d476 Author: William Hubbs Commit: William Hubbs updated readme I added an acknowledgements section. commit b76fada0b61873bb5228246e2585fea3ca690aba Author: William Hubbs Commit: William Hubbs fixed makefile The reference to $(PROGRAM) should have been $<. This is fixed. commit c2c1d429db31693a60b8e93479a4d4fe5d31588a Author: William Hubbs Commit: William Hubbs added redhat init script, thanks to William Acker. commit c7bece776d13a1c5ac1a52967ffb5cd1b3ed9a9c Author: William Hubbs Commit: William Hubbs fixed makefile There was a bug in the makefile which was not installing the binary correctly. This is now fixed. commit 22ea5c4d1d5db2d4d24e5a89437fac0d6940edf7 Author: William Hubbs Commit: William Hubbs updated makedist The makedist script now excludes itself and .gitignore when creating a tarball. commit 9402716c32c124fff4614b1555f7219f0bbe7135 Author: William Hubbs Commit: William Hubbs cleaned up command line option processing commit 05b115abbb8aa1d14b0f1c38c1212918fc9d8c24 Author: William Hubbs Commit: William Hubbs fixed typos in makedist script. commit 16beed096923abea8a7768d1ee6224419faabd0b Author: William Hubbs Commit: William Hubbs added a script to make tarball releases. commit 6ecc3182dab397d7b197e18d7bf78ca8c1316f71 Author: William Hubbs Commit: William Hubbs added a version command line option and variable. commit 96871c66201b77fddf5b80106b8f136fe825df87 Author: William Hubbs Commit: William Hubbs added destdir and prefix to the makefile for packaging. commit c7e0e28ad1102c395958c3baab70b4a8d20203bc Author: William Hubbs Commit: William Hubbs added gpl commit 02c88e949a9e44e16fa7ad6c289f3c476e0becb2 Author: William Hubbs Commit: William Hubbs adjusted multipliers I adjusted the pitch and volume multipliers. This should allow us to come closer to the maximum espeak settings. commit d7de943a3a1b748e2cb27f42af483339de8aa444 Author: William Hubbs Commit: William Hubbs added frequency support This patch, also from Kirk Reiser, adds frequency support. commit cddead8aa951e0ad68ba241456a8e5f36c6fb2f5 Author: William Hubbs Commit: William Hubbs pid file support This commit adds support for a pid file so that we can be stopped and started by init systems. commit b51cf9d774cc5a2abd13480238b951e20680ec24 Author: William Hubbs Commit: William Hubbs Added a signal handler This commit adds a signal handler so that espeakup will terminate cleanly. commit 61aac5ecb58ac49fc9060d19dde2dbda996e8e9f Author: William Hubbs Commit: William Hubbs moved some variables This commit removes the softsynth file descriptor and the debug flag from the synth structure. These will need to be accessed from a signal handler and there is no way to pass the structure to it. Also, the process_data function now works with local variables and assigns them to the synth structure, avoiding allocating a buffer with malloc/free. commit eb5cb3d36d35887907e13aeee0cad8fcc1b73baa Author: William Hubbs Commit: William Hubbs fixed volume I applied another patch from Kirk Reiser which fixes the volume setting. Thanks to Kirk for the patch. commit 7604cac68c53dd3c01cfc0e131e2a7f985b40ff7 Author: William Hubbs Commit: William Hubbs fixed the garbage characters bug This fixes the bug that was causing garbage characters to be spoken. Also it sets the initial voice to "default". commit b745e0c48b614143fb4df04ba878af29f4ece587 Author: William Hubbs Commit: William Hubbs more error checking I moved the read call out of process_data and into the main loop. Also, error checking was added for select() and read(). commit c3b0e8d0da9efdf9e719ba3fbe599640a5db7dce Author: William Hubbs Commit: William Hubbs code cleanup This patch adds the length of the buffer to the synth structure and clears the buffer before we use it. Thanks to Kirk Reiser for the patch. commit c4839ac78b967b4677531afe7568156c907e6bda Author: William Hubbs Commit: William Hubbs added maxBufferSize constant commit 754358f1731e58990b4c4131d4b900a5d2a5049a Author: William Hubbs Commit: William Hubbs added cli option support This commit adds support for command line options and also adds a debug option. commit 572f33337811973091f44e54e6b4fcb13ae689d9 Author: William Hubbs Commit: William Hubbs added volume support I added support for setting the volume. commit 4e3bbdb0b02eb1f12c087909e6437a31a9c60d7b Author: William Hubbs Commit: William Hubbs initial import espeakup-0.80/Makefile000066400000000000000000000013761274542752500147420ustar00rootroot00000000000000PREFIX = /usr/local BINDIR = ${PREFIX}/bin MANDIR = ${PREFIX}/share/man DEPFLAGS = -MMD WARNFLAGS = -Wall CFLAGS += ${DEPFLAGS} ${WARNFLAGS} LDLIBS = -lespeak -lpthread INSTALL = install BINMODE = 0755 MANMODE = 0644 CHANGELOG_LIMIT?= --after="1 year ago" SRCS = cli.c \ espeak.c \ espeakup.c \ queue.c \ signal.c \ softsynth.c \ stringhandling.c OBJS = ${SRCS:.c=.o} all: espeakup changelog: git log ${CHANGELOG_LIMIT} --format=full > ChangeLog install: espeakup ${INSTALL} -d ${DESTDIR}${BINDIR} ${INSTALL} -m ${BINMODE} $< ${DESTDIR}${BINDIR} ${INSTALL} -d ${DESTDIR}${MANDIR}/man8 ${INSTALL} -m ${MANMODE} espeakup.8 ${DESTDIR}${MANDIR}/man8 espeakup: ${OBJS} clean: ${RM} *.d *.o distclean: clean ${RM} espeakup -include ${SRCS:.c=.d} espeakup-0.80/README000066400000000000000000000044161274542752500141600ustar00rootroot00000000000000espeakup connector ======================= espeakup is a program which makes it possible for speakup to use the espeak software synthesizer. It does this by reading speakup's softsynth device and passing the text to espeak which actually speaks. Requirements ============ This program works with the speakup screen reader, which can be obtained from http://linux-speakup.org, and the espeak software speech synthesizer which can be obtained from http://espeak.sourceforge.net. You must have both of these installed and operational. Setting them up is beyond the scope of this document. Installation ============ The preferred way to install espeakup is using your distribution's packaging system, but if your distribution does not have a package for espeakup yet, espeakup just uses a Makefile, so you should be able to change to the source directory, then type make, then as root, make install. Starting Up =========== This program should be run after speakup is set up to communicate with a software synthesizer and after /dev/softsynth exists. The way this is done is distribution specific, so it is beyond the scope of this documentation. Command Line Options ==================== Espeakup currently accepts the following command line options: --default-voice=voice, -V voice Set default voice. --debug, -d Debug mode (stay in the foreground). --help, -h Show this help. --version, -v Display the software version. Getting the Latest Version ========================== It is possible to download a tarball from github of any released version as follows: wget http://www.github.com/williamh/espeakup/tarball/vx.y If you need a tarball for packaging purposes, one is available from ftp://ftp.linux-speakup.org/pub/linux/goodies/espeakup-x.y.tar.bz2. The url for the git repository is git://github.com/williamh/espeakup.git. Acknowledgements ================ I would like to thank Marc Mulcahy, the author of the speakup to TTSynth connector, on which this work is based. Also, I would like to thank Kirk Reiser and Jonathan Duddington, the authors of Speakup and Espeak, respectively, for their work. Questions ========= You can contact me with questions, bugs, patches, etc, at w.d.hubbs@gmail.com or on the speakup mailing list. I hope you find this software to be useful. espeakup-0.80/TODO000066400000000000000000000006431274542752500137660ustar00rootroot00000000000000This file contains a list of improvements that need to be made to espeakup. Voice and language support should be added at some point. This will consist of the following: - add a function which will allow switching voices. (completed on 9/27) - add a function/command which will allow speakup to find out which voices espeak supports. - define and add the command to speakup which will allow it to switch voices. espeakup-0.80/cli.c000066400000000000000000000051511274542752500142100ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #include #include #include #include #include "espeakup.h" /* pid path */ extern char *pidPath; /* default voice */ extern char *defaultVoice; /* command line options */ const char *shortOptions = "P:V:adhv"; const struct option longOptions[] = { {"pid-path", required_argument, NULL, 'P'}, {"default-voice", required_argument, NULL, 'V'}, {"acsint", no_argument, NULL, 'a'}, {"debug", no_argument, NULL, 'd'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'v'}, {0, 0, 0, 0} }; static void show_help() { printf("Usage: espeakup [options]\n\n"); printf("Options are as follows:\n"); printf(" --pid-path=path, -P path\t\tSet path for pid file.\n"); printf(" --default-voice=voice, -V voice\tSet default voice.\n"); printf(" --debug, -d\t\t\t\tDebug mode (stay in the foreground).\n"); printf(" --help, -h\t\t\t\tShow this help.\n"); printf(" --version, -v\t\t\t\tDisplay the software version.\n"); exit(0); } static void show_version(void) { printf("ESpeakup %s\n", PACKAGE_VERSION); printf("Copyright (C) 2008 William Hubbs \n"); printf("License GPLv3+: GNU GPL version 3 or later\n"); printf("You are free to change and redistribute this software.\n"); printf("Please report bugs to %s\n", PACKAGE_BUGREPORT); exit(0); } void process_cli(int argc, char **argv) { int opt; char *cp; do { opt = getopt_long(argc, argv, shortOptions, longOptions, NULL); switch (opt) { case 'p': cp = strdup(optarg); if (cp != NULL) pidPath = cp; break; case 'V': defaultVoice = strdup(optarg); break; case 'a': espeakup_mode = ESPEAKUP_MODE_ACSINT; break; case 'd': debug = 1; break; case 'h': show_help(); break; case 'v': show_version(); break; case -1: break; default: show_help(); break; } } while (opt != -1); } espeakup-0.80/espeak.c000066400000000000000000000200701274542752500147060ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #define _GNU_SOURCE #include #include #include #include #include "espeakup.h" /* default voice settings */ const int defaultFrequency = 5; const int defaultPitch = 5; const int defaultRate = 2; const int defaultVolume = 5; char *defaultVoice = NULL; /* multipliers and offsets */ const int frequencyMultiplier = 11; const int pitchMultiplier = 11; const int rateMultiplier = 41; const int rateOffset = 80; const int volumeMultiplier = 22; volatile int stop_requested = 0; static int acsint_callback(short *wav, int numsamples, espeak_EVENT * events) { int i; for (i = 0; events[i].type != espeakEVENT_LIST_TERMINATED; i++) { if (events[i].type == espeakEVENT_MARK) { int mark = atoi(events[i].id.name); if ((mark < 0) || (mark > 255)) continue; putchar(mark); fflush(stdout); } } return 0; } static espeak_ERROR set_frequency(struct synth_t *s, int freq, enum adjust_t adj) { espeak_ERROR rc; if (adj == ADJ_DEC) freq = -freq; if (adj != ADJ_SET) freq += s->frequency; rc = espeak_SetParameter(espeakRANGE, freq * frequencyMultiplier, 0); if (rc == EE_OK) s->frequency = freq; return rc; } static espeak_ERROR set_pitch(struct synth_t *s, int pitch, enum adjust_t adj) { espeak_ERROR rc; if (adj == ADJ_DEC) pitch = -pitch; if (adj != ADJ_SET) pitch += s->pitch; rc = espeak_SetParameter(espeakPITCH, pitch * pitchMultiplier, 0); if (rc == EE_OK) s->pitch = pitch; return rc; } static espeak_ERROR set_punctuation(struct synth_t *s, int punct, enum adjust_t adj) { espeak_ERROR rc; if (adj == ADJ_DEC) punct = -punct; if (adj != ADJ_SET) punct += s->punct; rc = espeak_SetParameter(espeakPUNCTUATION, punct, 0); if (rc == EE_OK) s->punct = punct; return rc; } static espeak_ERROR set_rate(struct synth_t *s, int rate, enum adjust_t adj) { espeak_ERROR rc; if (adj == ADJ_DEC) rate = -rate; if (adj != ADJ_SET) rate += s->rate; rc = espeak_SetParameter(espeakRATE, rate * rateMultiplier + rateOffset, 0); if (rc == EE_OK) s->rate = rate; return rc; } static espeak_ERROR set_voice(struct synth_t *s, char *voice) { espeak_ERROR rc; espeak_VOICE voice_select; rc = espeak_SetVoiceByName(voice); if (rc != EE_OK) { memset(&voice_select, 0, sizeof(voice_select)); voice_select.languages = voice; rc = espeak_SetVoiceByProperties(&voice_select); } if (rc == EE_OK) strcpy(s->voice, voice); return rc; } static espeak_ERROR set_volume(struct synth_t *s, int vol, enum adjust_t adj) { espeak_ERROR rc; if (adj == ADJ_DEC) vol = -vol; if (adj != ADJ_SET) vol += s->volume; rc = espeak_SetParameter(espeakVOLUME, (vol + 1) * volumeMultiplier, 0); if (rc == EE_OK) s->volume = vol; return rc; } static espeak_ERROR stop_speech(void) { espeak_ERROR rc; rc = espeak_Cancel(); return rc; } static espeak_ERROR speak_text(struct synth_t *s) { espeak_ERROR rc; int synth_mode = 0; if (espeakup_mode == ESPEAKUP_MODE_ACSINT) synth_mode |= espeakSSML; if (espeakup_mode == ESPEAKUP_MODE_SPEAKUP && (s->len == 1)) { char *buf; int n; n = asprintf(&buf, "%c", s->buf[0]); if (n == -1) { /* D'oh. Not much to do on allocation failure. * Perhaps espeak will happen to say the character */ rc = espeak_Synth(s->buf, s->len + 1, 0, POS_CHARACTER, 0, synth_mode, NULL, NULL); } else { rc = espeak_Synth(buf, n + 1, 0, POS_CHARACTER, 0, espeakSSML, NULL, NULL); free(buf); } } else rc = espeak_Synth(s->buf, s->len + 1, 0, POS_CHARACTER, 0, synth_mode, NULL, NULL); return rc; } static void free_espeak_entry(struct espeak_entry_t *entry) { assert(entry); if (entry->cmd == CMD_SPEAK_TEXT) free(entry->buf); free(entry); } static void synth_queue_clear() { struct espeak_entry_t *current; while (queue_peek(synth_queue)) { current = (struct espeak_entry_t *) queue_remove(synth_queue); free_espeak_entry(current); } } static void queue_process_entry(struct synth_t *s) { espeak_ERROR error; static struct espeak_entry_t *current = NULL; if (current != queue_peek(synth_queue)) { if (current) free_espeak_entry(current); current = (struct espeak_entry_t *) queue_remove(synth_queue); } pthread_mutex_unlock(&queue_guard); switch (current->cmd) { case CMD_SET_FREQUENCY: error = set_frequency(s, current->value, current->adjust); break; case CMD_SET_PITCH: error = set_pitch(s, current->value, current->adjust); break; case CMD_SET_PUNCTUATION: error = set_punctuation(s, current->value, current->adjust); break; case CMD_SET_RATE: error = set_rate(s, current->value, current->adjust); break; case CMD_SET_VOICE: error = EE_OK; break; case CMD_SET_VOLUME: error = set_volume(s, current->value, current->adjust); break; case CMD_SPEAK_TEXT: s->buf = current->buf; s->len = current->len; error = speak_text(s); break; default: break; } if (error == EE_OK) { free_espeak_entry(current); current = NULL; } } int initialize_espeak(struct synth_t *s) { int rate; /* initialize espeak */ rate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 50, NULL, 0); if (rate < 0) { fprintf(stderr, "Unable to initialize espeak.\n"); return -1; } /* We need a callback in acsint mode, but not in speakup mode. */ if (espeakup_mode == ESPEAKUP_MODE_ACSINT) espeak_SetSynthCallback(acsint_callback); /* Setup initial voice parameters */ if (defaultVoice) { set_voice(s, defaultVoice); free(defaultVoice); defaultVoice = NULL; } set_frequency(s, defaultFrequency, ADJ_SET); set_pitch(s, defaultPitch, ADJ_SET); set_rate(s, defaultRate, ADJ_SET); set_volume(s, defaultVolume, ADJ_SET); espeak_SetParameter(espeakCAPITALS, 0, 0); return 0; } /* espeak_thread is the "main" function of our secondary (queue-processing) * thread. * First, lock queue_guard, because it needs to be locked when we call * pthread_cond_wait on the runner_awake condition variable. * Next, enter an infinite loop. * The wait call also unlocks queue_guard, so that the other thread can * manipulate the queue. * When runner_awake is signaled, the pthread_cond_wait call re-locks * queue_guard, and the "queue processor" thread has access to the queue. * While there is an entry in the queue, call queue_process_entry. * queue_process_entry unlocks queue_guard after removing an item from the * queue, so that the main thread doesn't have to wait for us to finish * processing the entry. So re-lock queue_guard after each call to * queue_process_entry. * * The main thread can add items to the queue in exactly two situations: * 1. We are waiting on runner_awake, or * 2. We are processing an entry that has just been removed from the queue. */ void *espeak_thread(void *arg) { struct synth_t *s = (struct synth_t *) arg; pthread_mutex_lock(&queue_guard); while (should_run) { while (should_run && !queue_peek(synth_queue) && !stop_requested) pthread_cond_wait(&runner_awake, &queue_guard); if (stop_requested) { stop_speech(); synth_queue_clear(); stop_requested = 0; pthread_cond_signal(&stop_acknowledged); } while (should_run && queue_peek(synth_queue) && !stop_requested) { queue_process_entry(s); pthread_mutex_lock(&queue_guard); } } pthread_cond_signal(&stop_acknowledged); pthread_mutex_unlock(&queue_guard); return NULL; } espeakup-0.80/espeakup.8000066400000000000000000000054361274542752500152110ustar00rootroot00000000000000.\" Hey, Emacs! This is an -*- nroff -*- source file. .\" Espeakup is Copyright 2008 by William Hubbs. .\" This is free software; see the GNU General Public Licence version 3 .\" or later for copying conditions. There is NO warranty. .TH ESPEAKUP 8 "5 Nov 2008" "0.60" .nh .SH NAME espeakup \(em connect Speakup to the ESpeak TTS engine .SH SYNOPSIS .B espeakup [ .B \-\^\-pid-path=path ] [ .B \-\^\-default-voice=voicename ] [ .B \-\^\-debug ] [ .B \-\^\-help ] [ .B \-\^\-version ] .SH OPTIONS .TP .B \-P path, \-\^\-pid-path=path Set the full path for the pid file espeakup uses when in daemon mode. .TP .B \-V voicename, \-\^\-default-voice=voicename Set the espeak voice to be used by default. .TP .B \-d, \-\^\-debug run in the foreground, rather than becoming a daemon process. .TP .B \-h, \-\^\-help display a brief help message and exit. .TP .B \-v, \-\^\-version output version information and exit. .SH DESCRIPTION Espeakup bridges the gap between two tools: the Speakup screen review system and the ESppeak text-to-speech engine. Each of these tools performs a well-defined task. Speakup is a kernel-based screen reader for the Linux console. It extracts and processes the text that is displayed on the foreground virtual console. It supports several hardware based speech synthesizers directly. However, since it is in kernel space, it cannot support a software speech synthesizer directly since these are in user space. ESpeak is a popular software speech synthesizer. It is small, light weight, very responsive, and supports multiple languages. Espeakup is a connector which will read text sent to it by speakup and forward it to ESpeak. This allows Speakup to use ESpeak as its speech synthesizer. .PP Espeakup is a daemon. Typically, it is started at boot time, and it terminates when the system is halted or rebooted. It should be started by the system's init scripts. This process varies among Linux distributions, but the details are usually managed by the person who packaged Espeakup for your distribution. From the perspective of an average user, Espeakup's operation is invisible. .SH BUGS .PP Espeakup is still classified as alpha software. Bugs are periodically found and fixed. If you find a bug, please do report it to the author. You might also consider mentioning it on the mailing list for the Speakup screenreader. Visit http://speech.braille.uwo.ca/mailman/listinfo/speakup to learn more about the mailing list. .SH SEE ALSO .PP For more information about Speakup, visit its homepage: http://linux-speakup.org. ESpeak's home page is http://espeak.sourceforge.net. .SH AUTHOR .PP William Hubbs is the author and maintainer of Espeakup. He may be reached via the email address . This manual page was written by Chris Brannon, and his email address is . espeakup-0.80/espeakup.c000066400000000000000000000124541274542752500152620ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #include #include #include #include #include #include #include #include #include "espeakup.h" /* path to our pid file */ char *pidPath = "/var/run/espeakup.pid"; int debug = 0; enum espeakup_mode_t espeakup_mode = ESPEAKUP_MODE_SPEAKUP; struct queue_t *synth_queue = NULL; int self_pipe_fds[2]; volatile int should_run = 1; espeak_AUDIO_OUTPUT audio_mode; pthread_cond_t runner_awake = PTHREAD_COND_INITIALIZER; pthread_cond_t stop_acknowledged = PTHREAD_COND_INITIALIZER; pthread_mutex_t queue_guard = PTHREAD_MUTEX_INITIALIZER; int espeakup_start_daemon(void) { int fds[2]; pid_t pid; char c; if (pipe(fds) < 0) { perror("pipe"); exit(1); } pid = fork(); if (pid < 0) { perror("fork"); exit(1); } if (pid) { /* Parent, just wait for daemon */ if (read(fds[0], &c, 1) < 0) { printf("Espeakup is already running!\n"); exit(1); } exit(c); } /* Child, create new session */ setsid(); pid = fork(); if (pid) /* Intermediate child, just exit */ exit(0); /* Child */ if (chdir("/") < 0) { c = 1; (void)write(fds[1], &c, 1); exit(1); } return fds[1]; } int espeakup_is_running(void) { int pidFile; int n; char s[16]; pid_t pid; pidFile = open(pidPath, O_RDWR | O_CREAT, 0666); if (pidFile < 0) { printf("Can not work with the pid file %s: %s\n", pidPath, strerror(errno)); return -1; } if (flock(pidFile, LOCK_EX) < 0) { printf("Can not lock the pid file %s: %s\n", pidPath, strerror(errno)); goto error; } n = read(pidFile, s, sizeof(s) - 1); if (n < 0) { printf("Can not read the pid file %s: %s\n", pidPath, strerror(errno)); goto error; } s[n] = 0; n = sscanf(s, "%d", &pid); if (n == 1 && (!kill(pid, 0) || errno != ESRCH)) { /* Already running */ close(pidFile); return 1; } if (ftruncate(pidFile, 0) < 0) { printf("Could not truncate the pid file %s: %s\n", pidPath, strerror(errno)); goto error; } lseek(pidFile, 0, SEEK_SET); n = snprintf(s, sizeof(s), "%d", getpid()); if (write(pidFile, s, n) < 0) { printf("Could not write to the pid file %s: %s\n", pidPath, strerror(errno)); goto error; } close(pidFile); return 0; error: close(pidFile); return -1; } int main(int argc, char **argv) { int fd, devnull; char ret = 0; sigset_t sigset; int err; pthread_t signal_thread_id; pthread_t espeak_thread_id; pthread_t softsynth_thread_id; struct synth_t s = { .voice = "", }; synth_queue = new_queue(); if (!synth_queue) { fprintf(stderr, "Unable to allocate memory.\n"); return 2; } /* set up the pipe used to wake the espeak thread */ if (pipe(self_pipe_fds) < 0) { perror("Unable to create pipe"); return 5; } /* process command line options */ process_cli(argc, argv); if (!debug && espeakup_mode == ESPEAKUP_MODE_SPEAKUP) { fd = espeakup_start_daemon(); if (espeakup_is_running()) { printf("Espeakup is already running!\n"); ret = 1; goto out; } devnull = open("/dev/null", O_RDWR); dup2(devnull, STDIN_FILENO); dup2(devnull, STDOUT_FILENO); dup2(devnull, STDERR_FILENO); if (devnull > 2) close(devnull); } /* create the signal processing thread here. */ err = pthread_create(&signal_thread_id, NULL, signal_thread, NULL); if (err != 0) { ret = 4; goto out; } /* * Set up the signal mask which will be the default for all threads. * We are handling sigint and sigterm, so block them. */ sigemptyset(&sigset); sigaddset(&sigset, SIGINT); sigaddset(&sigset, SIGTERM); sigprocmask(SIG_BLOCK, &sigset, NULL); /* Initialize espeak */ if (initialize_espeak(&s) < 0) { ret = 2; goto out; } /* open the softsynth */ if (open_softsynth() < 0) { ret = 2; goto out; } /* Spawn our softsynth thread. */ err = pthread_create(&softsynth_thread_id, NULL, softsynth_thread, &s); if (err != 0) { ret = 4; goto out; } /* Spawn our espeak-interacting thread. */ err = pthread_create(&espeak_thread_id, NULL, espeak_thread, &s); if (err != 0) { ret = 4; goto out; } if (!debug && espeakup_mode == ESPEAKUP_MODE_SPEAKUP) (void)write(fd, &ret, 1); /* wait for the threads to shut down. */ pthread_join(signal_thread_id, NULL); pthread_join(softsynth_thread_id, NULL); pthread_join(espeak_thread_id, NULL); espeak_Terminate(); close_softsynth(); out: if (!debug && espeakup_mode == ESPEAKUP_MODE_SPEAKUP) { if (ret != 1) unlink(pidPath); if (ret != 0) (void)write(fd, &ret, 1); /* If ret was 0, the status byte was written before joining * the threads. */ } return ret; } espeakup-0.80/espeakup.h000066400000000000000000000043121274542752500152610ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #ifndef __ESPEAKUP_H #define __ESPEAKUP_H /* This was added for gcc 4.3 */ #include #include #include #include "queue.h" #define PACKAGE_VERSION "0.80" #define PACKAGE_BUGREPORT "http://github.com/williamh/espeakup/issues" enum espeakup_mode_t { ESPEAKUP_MODE_SPEAKUP, ESPEAKUP_MODE_ACSINT }; enum command_t { CMD_SET_FREQUENCY, CMD_SET_PITCH, CMD_SET_PUNCTUATION, CMD_SET_RATE, CMD_SET_VOICE, CMD_SET_VOLUME, CMD_SPEAK_TEXT, CMD_FLUSH, CMD_UNKNOWN, }; enum adjust_t { ADJ_DEC, ADJ_SET, ADJ_INC, }; struct espeak_entry_t { enum command_t cmd; enum adjust_t adjust; int value; char *buf; int len; }; struct synth_t { int frequency; int pitch; int punct; int rate; char voice[10]; int volume; char *buf; int len; }; extern struct queue_t *synth_queue; extern int debug; extern enum espeakup_mode_t espeakup_mode; extern void process_cli(int argc, char **argv); extern void *signal_thread(void *arg); extern int initialize_espeak(struct synth_t *s); extern void *espeak_thread(void *arg); extern int open_softsynth(void); extern void close_softsynth(void); extern void *softsynth_thread(void *arg); extern volatile int should_run; extern volatile int stop_requested; extern int self_pipe_fds[2]; #define PIPE_READ_FD (self_pipe_fds[0]) #define PIPE_WRITE_FD (self_pipe_fds[1]) extern pthread_cond_t runner_awake; extern pthread_cond_t stop_acknowledged; extern pthread_mutex_t queue_guard; #endif espeakup-0.80/queue.c000066400000000000000000000036561274542752500145750ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Note that these functions are meant to be used in either a single or * multi-threaded environment, so they know nothing about mutexes, etc. * Handling this is up to the caller. * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #include #include #include "stringhandling.h" struct queue_entry_t { void *data; struct queue_entry_t *next; }; struct queue_t { struct queue_entry_t *head; struct queue_entry_t *tail; }; struct queue_t *new_queue(void) { struct queue_t *q = allocMem(sizeof(struct queue_t)); q->head = NULL; q->tail = NULL; return q; } int queue_add(struct queue_t *q, void *data) { struct queue_entry_t *tmp; assert(data); tmp = allocMem(sizeof(struct queue_entry_t)); tmp->data = data; tmp->next = NULL; if (!q->tail) { q->tail = tmp; } else { q->tail->next = tmp; q->tail = q->tail->next; } if (!q->head) q->head = tmp; return 1; } void *queue_remove(struct queue_t *q) { void *data = NULL; struct queue_entry_t *tmp; if (q->head) { tmp = q->head; data = tmp->data; q->head = tmp->next; free(tmp); if (!q->head) q->tail = q->head; } return data; } void *queue_peek(struct queue_t *q) { if (q->head) return q->head->data; else return NULL; } espeakup-0.80/queue.h000066400000000000000000000020241274542752500145660ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #ifndef __QUEUE_H #define __QUEUE_H struct queue_t; /* An opaque type. */ extern struct queue_t *new_queue(void); extern int queue_add(struct queue_t *q, void *entry); extern void *queue_remove(struct queue_t *q); extern void *queue_peek(struct queue_t *q); #endif espeakup-0.80/signal.c000066400000000000000000000036031274542752500147160ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #include #include #include #include #define STOP_MSG "s" #include "espeakup.h" /* * We install a dummy signal handler to let the o/s know that we * do not want the default action to be performed since we are * handling the signal. */ static void dummy_handler(int sig) { } void *signal_thread(void *arg) { struct sigaction temp; sigset_t sigset; int sig; memset(&temp, 0, sizeof (struct sigaction)); /* install dummy handlers for the signals we want to process */ temp.sa_handler = dummy_handler; sigemptyset(&temp.sa_mask); sigaction(SIGINT, &temp, NULL); sigaction(SIGTERM, &temp, NULL); pthread_mutex_lock(&queue_guard); while (should_run) { pthread_mutex_unlock(&queue_guard); sigfillset(&sigset); sigwait(&sigset, &sig); switch (sig) { case SIGINT: case SIGTERM: pthread_mutex_lock(&queue_guard); should_run = 0; pthread_mutex_unlock(&queue_guard); break; default: printf("espeakup caught signal %d\n", sig); break; } } /* Tell the reader to stop, if it is in a select() call. */ write(PIPE_WRITE_FD, STOP_MSG, strlen(STOP_MSG)); return NULL; } espeakup-0.80/softsynth.c000066400000000000000000000155071274542752500155100ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2008 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #include #include #include #include #include #include #include #include #include "espeakup.h" #include "stringhandling.h" /* max buffer size */ static const size_t maxBufferSize = 16 * 1024 + 1; /* synth flush character */ static const int synthFlushChar = 0x18; static int softFD = 0; /* Text accumulator: */ char *textAccumulator; int textAccumulator_l; static void queue_add_cmd(enum command_t cmd, enum adjust_t adj, int value) { struct espeak_entry_t *entry; int added = 0; entry = allocMem(sizeof(struct espeak_entry_t)); entry->cmd = cmd; entry->adjust = adj; entry->value = value; pthread_mutex_lock(&queue_guard); added = queue_add(synth_queue, (void *) entry); if (!added) free(entry); else pthread_cond_signal(&runner_awake); pthread_mutex_unlock(&queue_guard); } static void queue_add_text(char *txt, size_t length) { struct espeak_entry_t *entry; int added = 0; entry = allocMem(sizeof(struct espeak_entry_t)); entry->cmd = CMD_SPEAK_TEXT; entry->adjust = ADJ_SET; entry->buf = strdup(txt); if (!entry->buf) { perror("unable to allocate space for text"); free(entry); return; } entry->len = length; pthread_mutex_lock(&queue_guard); added = queue_add(synth_queue, (void *) entry); if (!added) { free(entry->buf); free(entry); } else { pthread_cond_signal(&runner_awake); } pthread_mutex_unlock(&queue_guard); } static int process_command(struct synth_t *s, char *buf, int start) { char *cp; int value; enum adjust_t adj; enum command_t cmd; cp = buf + start; switch (*cp) { case 1: cp++; switch (*cp) { case '+': adj = ADJ_INC; cp++; break; case '-': adj = ADJ_DEC; cp++; break; default: adj = ADJ_SET; break; } value = 0; while (isdigit(*cp)) { value = value * 10 + (*cp - '0'); cp++; } switch (*cp) { case 'b': cmd = CMD_SET_PUNCTUATION; break; case 'f': cmd = CMD_SET_FREQUENCY; break; case 'p': cmd = CMD_SET_PITCH; break; case 's': cmd = CMD_SET_RATE; break; case 'v': cmd = CMD_SET_VOLUME; break; default: cmd = CMD_UNKNOWN; break; } cp++; break; default: cmd = CMD_UNKNOWN; cp++; break; } if (cmd != CMD_FLUSH && cmd != CMD_UNKNOWN) { if (espeakup_mode == ESPEAKUP_MODE_ACSINT && textAccumulator_l != 0) { queue_add_text(textAccumulator, textAccumulator_l); free(textAccumulator); textAccumulator = initString(&textAccumulator_l); } queue_add_cmd(cmd, adj, value); } return cp - (buf + start); } static void process_buffer(struct synth_t *s, char *buf, ssize_t length) { int start; int end; char txtBuf[maxBufferSize]; size_t txtLen; start = 0; end = 0; while (start < length) { while ((buf[end] < 0 || buf[end] >= ' ') && end < length) end++; if (end != start) { txtLen = end - start; strncpy(txtBuf, buf + start, txtLen); *(txtBuf + txtLen) = 0; queue_add_text(txtBuf, txtLen); } if (end < length) start = end = end + process_command(s, buf, end); else start = length; } } static void process_buffer_acsint(struct synth_t *s, char *buf, ssize_t length) { int start = 0; int i; int flushIt = 0; while (start < length) { for (i = start; i < length; i++) { if (buf[i] == '\r' || buf[i] == '\n') flushIt = 1; if (buf[i] >= 0 && buf[i] < ' ') break; } if (i > start) stringAndBytes(&textAccumulator, &textAccumulator_l, buf + start, i - start); if (flushIt) { if (textAccumulator != EMPTYSTRING) { queue_add_text(textAccumulator, textAccumulator_l); free(textAccumulator); textAccumulator = initString(&textAccumulator_l); } flushIt = 0; } if (i < length) start = i = i + process_command(s, buf, i); else start = length; } } static void request_espeak_stop(void) { pthread_mutex_lock(&queue_guard); stop_requested = 1; pthread_cond_signal(&runner_awake); /* Wake runner, if necessary. */ while (should_run && stop_requested) pthread_cond_wait(&stop_acknowledged, &queue_guard); /* wait for acknowledgement. */ pthread_mutex_unlock(&queue_guard); } int open_softsynth(void) { int rc = 0; /* If we're in acsint mode, we read from stdin. No need to open. */ if (espeakup_mode == ESPEAKUP_MODE_ACSINT) { softFD = STDIN_FILENO; return 0; } /* open the softsynth. */ softFD = open("/dev/softsynth", O_RDWR | O_NONBLOCK); if (softFD < 0) { perror("Unable to open the softsynth device"); rc = -1; } return rc; } void close_softsynth(void) { if (softFD) close(softFD); } void *softsynth_thread(void *arg) { struct synth_t *s = (struct synth_t *) arg; fd_set set; ssize_t length; char buf[maxBufferSize]; char *cp; int terminalFD = PIPE_READ_FD; int greatestFD; textAccumulator = initString(&textAccumulator_l); if (terminalFD > softFD) greatestFD = terminalFD; else greatestFD = softFD; pthread_mutex_lock(&queue_guard); while (should_run) { pthread_mutex_unlock(&queue_guard); FD_ZERO(&set); FD_SET(softFD, &set); FD_SET(terminalFD, &set); if (select(greatestFD + 1, &set, NULL, NULL, NULL) < 0) { if (errno == EINTR) { pthread_mutex_lock(&queue_guard); continue; } perror("Select failed"); pthread_mutex_lock(&queue_guard); break; } if (FD_ISSET(terminalFD, &set)) { pthread_mutex_lock(&queue_guard); break; } if (!FD_ISSET(softFD, &set)) { pthread_mutex_lock(&queue_guard); continue; } length = read(softFD, buf, maxBufferSize - 1); if (length < 0) { if (errno == EAGAIN || errno == EINTR) { pthread_mutex_lock(&queue_guard); continue; } perror("Read from softsynth failed"); pthread_mutex_lock(&queue_guard); break; } *(buf + length) = 0; cp = strrchr(buf, synthFlushChar); if (cp) { request_espeak_stop(); memmove(buf, cp + 1, strlen(cp + 1) + 1); length = strlen(buf); } if (espeakup_mode == ESPEAKUP_MODE_SPEAKUP) process_buffer(s, buf, length); else process_buffer_acsint(s, buf, length); pthread_mutex_lock(&queue_guard); } pthread_cond_signal(&runner_awake); pthread_mutex_unlock(&queue_guard); return NULL; } espeakup-0.80/stringhandling.c000066400000000000000000000050651274542752500164600ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2011 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ /* * These string routines were borrowed from edbrowse, which was * originally written by Karl Dahlke, and is being currently maintained * by Christopher Brannon. * I would like to thank both of them for their work on this software. */ #include #include #include char *EMPTYSTRING = ""; void *allocMem(size_t n) { void *s; if (!n) return EMPTYSTRING; if (!(s = malloc(n))) { fprintf(stderr, "Out of memory!\n"); exit(1); } return s; } void *reallocMem(void *p, size_t n) { void *s; if (!n) { fprintf(stderr, "Trying to reallocate memory with size of 0.\n"); exit(1); } if (!p) { fprintf(stderr, "realloc called with a NULL pointer!\n"); exit(1); } if (p == EMPTYSTRING) return allocMem(n); if (!(s = realloc(p, n))) { fprintf(stderr, "Failed to allocate memory.\n"); exit(1); } return s; } char *initString(int *l) { *l = 0; return EMPTYSTRING; } void stringAndString(char **s, int *l, const char *t) { char *p = *s; int oldlen, newlen, x; oldlen = *l; newlen = oldlen + strlen(t); *l = newlen; ++newlen; /* room for the 0 */ x = oldlen ^ newlen; if (x > oldlen) { /* must realloc */ newlen |= (newlen >> 1); newlen |= (newlen >> 2); newlen |= (newlen >> 4); newlen |= (newlen >> 8); newlen |= (newlen >> 16); p = reallocMem(p, newlen); *s = p; } strcpy(p + oldlen, t); } void stringAndBytes(char **s, int *l, const char *t, int cnt) { char *p = *s; int oldlen, newlen, x; oldlen = *l; newlen = oldlen + cnt; *l = newlen; ++newlen; x = oldlen ^ newlen; if (x > oldlen) { /* must realloc */ newlen |= (newlen >> 1); newlen |= (newlen >> 2); newlen |= (newlen >> 4); newlen |= (newlen >> 8); newlen |= (newlen >> 16); p = reallocMem(p, newlen); *s = p; } memcpy(p + oldlen, t, cnt); p[oldlen + cnt] = 0; } espeakup-0.80/stringhandling.h000066400000000000000000000021021274542752500164520ustar00rootroot00000000000000/* * espeakup - interface which allows speakup to use espeak * * Copyright (C) 2011 William Hubbs * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #ifndef __STRINGHANDLING_H #define __STRINGHANDLING_H #include extern char *EMPTYSTRING; void *allocMem(size_t n); void *reallocMem(void *p, size_t n); char *initString(int *l); void stringAndString(char **s, int *l, const char *t); void stringAndBytes(char **s, int *l, const char *t, int cnt); #endif