Commit Graph
1001 Commits
Author SHA1 Message Date
Reece Dunn 296d62378b Merge pull request #37 from michaelDCurran/allowNULLLogInCompilationFunctions
Allow compilePhonemeData and compileIntonations to be called with a NULL log argument
2015-12-17 12:37:21 +00:00
Reece Dunn fe1e1f203d Merge pull request #35 from michaelDCurran/loadSpectSeq_fclose
Stop leaking file streams in libespeak-ng's LoadSpectSeq function.
2015-12-17 12:36:33 +00:00
Michael Curran 5353e125dc Allow compilePhonemeData and compileIntonations to be called with a NULL log argument. If so, log is set to stderr. 2015-12-17 20:02:24 +10:00
Michael Curran 9d187f0588 Stop leaking file streams in libespeak-ng's LoadSpectSeq function. 2015-12-17 19:25:53 +10:00
Reece H. Dunn 36be9ac13f Use the default uncrustify config (with indentation changes) to reformat the code. 2015-12-17 07:40:24 +00:00
Reece H. Dunn 603f046154 Avoid implicit function messages when building the project. 2015-12-15 22:58:10 +00:00
Reece H. Dunn 5e0050419d Remove comments that deliniate the start and end of functions, etc.. 2015-12-15 22:26:02 +00:00
Reece H. Dunn 08821f262f Remove commented out code. 2015-12-14 23:13:56 +00:00
Reece H. Dunn 5edf8f8548 Remove the platforms directory.
The code portability will be provided through the autotools build
system. Any additional portability code will be provided in the
top-level source structure along side the other code (e.g. `src/compat`).
2015-12-13 18:48:37 +00:00
Reece H. Dunn 406d74b216 Restructure the Makefile to simplify its layout. 2015-12-13 18:41:56 +00:00
Reece H. Dunn 3d6b0d15d1 Remove wxWidgets and the remaining parts of espeakedit from the build. 2015-12-13 17:54:11 +00:00
Reece H. Dunn bda5252b3f espeak-ng: implement and use --compile-intonations and --compile-phonemes command-line options 2015-12-13 17:45:11 +00:00
Reece H. Dunn 8b358594f7 Expose the CompileIntonations and CompilePhonemeData functions via the espeak_ng.h API. 2015-12-13 17:28:56 +00:00
Reece H. Dunn 8218109400 Convert src/compiledata.cpp to src/libespeak-ng/compiledata.c. 2015-12-13 17:20:29 +00:00
Reece H. Dunn 408a12a79f Convert src/spect.cpp to src/libespeak-ng/spect.c. 2015-12-13 16:57:21 +00:00
Reece H. Dunn e2ba3703bb espeakedit: remove wxWidgets from spect.cpp 2015-12-13 16:37:57 +00:00
Reece H. Dunn 7d3a8f9983 LoadSpectSeq: use an fread API to read wxInputStream data
This creates an fread compatible API on wxInputStream objects and
uses that API in LoadSpectSeq. This is to help the transition from
the wxWidgets wxInputStream API to the C FILE API.
2015-12-13 14:33:01 +00:00
Reece H. Dunn 56ddf6c339 espeakedit: remove wxWidgets from compiledata.cpp 2015-12-13 12:54:41 +00:00
Reece H. Dunn d1b06c6591 espeakedit: convert SpectSeq to a struct 2015-12-13 12:21:39 +00:00
Reece H. Dunn 6ad68e2082 espeakedit: convert SpectFrame to a struct 2015-12-13 12:07:00 +00:00
Reece H. Dunn e5610301b0 espeakedit: move the definition of SpectFrame::GetRms out of the class 2015-12-13 11:41:44 +00:00
Reece H. Dunn cfb0a8a111 espeakedit: move the definition of SpectFrame::Load into spect.cpp 2015-12-13 11:36:03 +00:00
Reece H. Dunn bb2d73a875 espeakedit: move the definition of GetFrameLength into spect.cpp 2015-12-13 11:30:52 +00:00
Reece H. Dunn d35da4b8b8 espeakedit: inline SpectSeq::Load2 into SpectSeq::Load 2015-12-13 11:25:26 +00:00
Reece H. Dunn c5407fe147 espeakedit: remove unused methods from spect.h 2015-12-13 11:20:45 +00:00
Reece H. Dunn aa3bc83139 espeakedit: remove support for importing the old SPC2 files (these are not present when building the project) 2015-12-13 11:03:44 +00:00
Reece H. Dunn ab9e1d9b4e espeakedit: remove the epseakedit praat data import code 2015-12-13 10:40:51 +00:00
Reece H. Dunn 1a19319979 espeakedit: move the remaining prosodydisplay.cpp code into compiledata.cpp 2015-12-13 10:29:41 +00:00
Reece H. Dunn a008fb4f8b espeakedit: move the spectseq.cpp code into spect.cpp 2015-12-13 10:22:38 +00:00
Reece H. Dunn d64df4c0a2 espeakedit: remove wxWidgets from prosodydisplay.cpp 2015-12-13 09:03:52 +00:00
Reece H. Dunn 3fde1a2d53 espeakedit: simplify and inline the ConfigInit logic 2015-12-13 08:59:13 +00:00
Reece H. Dunn 917619c914 espeakedit: further removal of code not relevant to --compile 2015-12-13 08:17:21 +00:00
Michael Curran 7ebca8cb53 strftime on windows no longer supports %F. Therefore use %Y-%m-%d which is equivilent. Stops a crash in espeakEdit on Windows. 2015-12-12 23:14:09 +00:00
Reece H. Dunn 50377416cf espeakedit: remove all but the --compile support
This removes the GUI part of espeakedit, keeping the part that is
responsible for compiling the voice and intonation data. The
motivation for this is:

  1.  the voice and intonation data compilation will move into
      libespeak-ng after removing the wxWidgets logic and converting
      the code to C;

  2.  the espeakedit code is tightly coupled to the internals of
      libespeak-ng at a source code level, not a binary/API level,
      making the code harder to maintain;

  3.  a new GUI will be written in Qt that better supports creating
      and editing voices and languages.
2015-12-12 22:37:47 +00:00
Reece H. Dunn bd608a8451 CompileIntonation: pass the file to log errors to as a parameter 2015-12-12 18:54:26 +00:00
Reece H. Dunn 0a48ca015f compiledata - don't include options.h
This is part of the process of making compiledata.cpp independent
of espeakedit.
2015-12-12 17:50:45 +00:00
Reece H. Dunn 83d26f48fc compiledata - don't include main.h
This is part of the process of making compiledata.cpp independent
of espeakedit.
2015-12-12 17:43:54 +00:00
Reece H. Dunn 156c622ed6 Rename compiledata.c => compilembrola.c. 2015-12-12 17:03:48 +00:00
Reece H. Dunn cf872e5e5a Use espeak-ng to build the mbrola voices, not espeakedit. 2015-12-12 13:36:34 +00:00
Reece H. Dunn 6bd44bd926 espeak-ng: implement a --compile-mbrola command-line option 2015-12-12 13:27:37 +00:00
Reece H. Dunn b8378c2667 Expose the CompileMbrola function via a new espeak_ng.h API. 2015-12-12 12:29:48 +00:00
Reece H. Dunn 257b6b33a5 Move CompileMbrola to libespeak-ng. 2015-12-12 11:26:20 +00:00
Reece H. Dunn 4e4a0e8f40 frame_t3 is not used, so remove it 2015-12-12 09:58:05 +00:00
Reece H. Dunn aeed4dcf59 Remove mkdictlist -- this was used for importing upstream espeak versions. 2015-12-12 09:51:25 +00:00
Reece H. Dunn 72ebe9d25e Remove the executable flag from some merged files. 2015-12-12 09:48:03 +00:00
Reece H. Dunn 186916afb6 Remove the code within '#ifdef deleted' statements. 2015-12-12 09:46:03 +00:00
Reece H. Dunn 96cc9dbae2 Always build espeakedit specific data in libespeak-ng. 2015-12-11 20:56:24 +00:00
Reece H. Dunn d9771ada20 Link speak-ng to the static library build of libespeak-ng. 2015-12-11 20:41:18 +00:00
Reece H. Dunn 74b461070f Use LT_INIT to initialize libtool. 2015-12-11 20:29:29 +00:00
Reece H. Dunn 83939f3b08 Fix references to espeak-ng in the README. 2015-12-11 20:06:04 +00:00