Merge pull request #75 from pettarin/nextmajor

Started working on v1.5.0. Rewritten VAD, SD, ExecuteTask. Added Audi…

MANIFEST.in

@@ -1,3 +1,8 @@
+recursive-include aeneas/cdtw *
+recursive-include aeneas/cew *
+recursive-include aeneas/cint *
+recursive-include aeneas/cmfcc *
+recursive-include aeneas/cwave *
 recursive-include aeneas/res *
 recursive-include aeneas/tools/res *
 include aeneas_check_setup.py

README.md

@@ -2,8 +2,8 @@
 
 **aeneas** is a Python/C library and a set of tools to automagically synchronize audio and text (aka forced alignment).
 
-* Version: 1.4.1
-* Date: 2016-02-13
+* Version: 1.5.0
+* Date: 2016-??-??
 * Developed by: [ReadBeyond](http://www.readbeyond.it/)
 * Lead Developer: [Alberto Pettarin](http://www.albertopettarin.it/)
 * License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -118,7 +118,7 @@ for detailed, step-by-step procedures for Linux, OS X, and Windows.
     thanks to the included example files.
 
 3. To compute a synchronization map `map.json` for a pair
-   (`audio.mp3`, `text.txt` in [`plain`](http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.PLAIN) text format), you can run:
+   (`audio.mp3`, `text.txt` in [plain](http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.PLAIN) text format), you can run:
 
     ```bash
     python -m aeneas.tools.execute_task \
@@ -129,7 +129,7 @@ for detailed, step-by-step procedures for Linux, OS X, and Windows.
     ```
 
    To compute a synchronization map `map.smil` for a pair
-   (`audio.mp3`, [`page.xhtml`](http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.UNPARSED) containing fragments marked by `id` attributes like `f001`),
+   (`audio.mp3`, [page.xhtml](http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.UNPARSED) containing fragments marked by `id` attributes like `f001`),
    you can run:
 
     ```bash
@@ -159,8 +159,8 @@ for detailed, step-by-step procedures for Linux, OS X, and Windows.
 
 The [documentation](http://www.readbeyond.it/aeneas/docs/)
 provides an introduction to the concepts of
-[`task`](http://www.readbeyond.it/aeneas/docs/#tasks) and
-[`job`](http://www.readbeyond.it/aeneas/docs/#job),
+[Task](http://www.readbeyond.it/aeneas/docs/#tasks) and
+[Job](http://www.readbeyond.it/aeneas/docs/#job),
 and it lists of all the options and tools available in the library.
 
 

README.rst

@@ -4,8 +4,8 @@ aeneas
 **aeneas** is a Python/C library and a set of tools to automagically
 synchronize audio and text (aka forced alignment).
 
--  Version: 1.4.1
--  Date: 2016-02-13
+-  Version: 1.5.0
+-  Date: 2016-??-??
 -  Developed by: `ReadBeyond <http://www.readbeyond.it/>`__
 -  Lead Developer: `Alberto Pettarin <http://www.albertopettarin.it/>`__
 -  License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -133,7 +133,7 @@ Usage
 
 3. To compute a synchronization map ``map.json`` for a pair
    (``audio.mp3``, ``text.txt`` in
-   ```plain`` <http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.PLAIN>`__
+   `plain <http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.PLAIN>`__
    text format), you can run:
 
    .. code:: bash
@@ -145,7 +145,7 @@ Usage
            map.json
 
 To compute a synchronization map ``map.smil`` for a pair (``audio.mp3``,
-```page.xhtml`` <http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.UNPARSED>`__
+`page.xhtml <http://www.readbeyond.it/aeneas/docs/textfile.html#aeneas.textfile.TextFileFormat.UNPARSED>`__
 containing fragments marked by ``id`` attributes like ``f001``), you can
 run:
 
@@ -177,9 +177,9 @@ to parse the input assets and format the output sync map files. See the
 
 The `documentation <http://www.readbeyond.it/aeneas/docs/>`__ provides
 an introduction to the concepts of
-```task`` <http://www.readbeyond.it/aeneas/docs/#tasks>`__ and
-```job`` <http://www.readbeyond.it/aeneas/docs/#job>`__, and it lists of
-all the options and tools available in the library.
+`Task <http://www.readbeyond.it/aeneas/docs/#tasks>`__ and
+`Job <http://www.readbeyond.it/aeneas/docs/#job>`__, and it lists of all
+the options and tools available in the library.
 
 Documentation and Support
 -------------------------

VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

aeneas/__init__.py

@@ -6,18 +6,23 @@
 to automagically synchronize audio and text (aka forced alignment).
 """
 
+"""
 from __future__ import absolute_import
 from __future__ import print_function
 from aeneas.adjustboundaryalgorithm import AdjustBoundaryAlgorithm
 from aeneas.analyzecontainer import AnalyzeContainer
 from aeneas.audiofile import AudioFile
 from aeneas.audiofile import AudioFileMonoWAVE
 from aeneas.audiofile import AudioFileUnsupportedFormatError
+from aeneas.audiofilemfcc import AudioFileMFCC
+from aeneas.cewsubprocess import CEWSubprocess
+from aeneas.configuration import Configuration
 from aeneas.container import Container
 from aeneas.container import ContainerFormat
 from aeneas.downloader import Downloader
 from aeneas.dtw import DTWAlgorithm
 from aeneas.dtw import DTWAligner
+from aeneas.dtw import DTWAlignerNotInitialized
 from aeneas.espeakwrapper import ESPEAKWrapper
 from aeneas.executejob import ExecuteJob
 from aeneas.executetask import ExecuteTask
@@ -33,8 +38,8 @@
 from aeneas.job import JobConfiguration
 from aeneas.language import Language
 from aeneas.logger import Logger
+from aeneas.runtimeconfiguration import RuntimeConfiguration
 from aeneas.sd import SD
-from aeneas.sd import SDMetric
 from aeneas.syncmap import SyncMap
 from aeneas.syncmap import SyncMapFormat
 from aeneas.syncmap import SyncMapFragment
@@ -50,6 +55,7 @@
 from aeneas.validator import Validator
 import aeneas.globalconstants as gc
 import aeneas.globalfunctions as gf
+"""
 
 __author__ = "Alberto Pettarin"
 __copyright__ = """
@@ -58,7 +64,7 @@
     Copyright 2015-2016, Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.4.1"
+__version__ = "1.5.0"
 __email__ = "[email protected]"
 __status__ = "Production"