Skip to content

Commit 9d95535

Browse files
authored
Merge pull request #171 from readbeyond/devel
Fix bug #168
2 parents fb1e315 + 66948d9 commit 9d95535

35 files changed

+107
-35
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
**aeneas** is a Python/C library and a set of tools to automagically synchronize audio and text (aka forced alignment).
44

5-
* Version: 1.7.2
6-
* Date: 2017-03-03
5+
* Version: 1.7.3
6+
* Date: 2017-03-15
77
* Developed by: [ReadBeyond](http://www.readbeyond.it/)
88
* Lead Developer: [Alberto Pettarin](http://www.albertopettarin.it/)
99
* License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -316,7 +316,7 @@ No copy rights were harmed in the making of this project.
316316
317317
* **April 2016**: the Fruch Foundation kindly sponsored the development and documentation of v1.5.0
318318
319-
* **December 2016**: the [Centro Internazionale Del Libro Parlato "Adriano Sernagiotto"](http://www.libroparlato.org/) (Feltre, Italy) partially sponsored the development of v1.7.0, v1.7.1, and v1.7.2
319+
* **December 2016**: the [Centro Internazionale Del Libro Parlato "Adriano Sernagiotto"](http://www.libroparlato.org/) (Feltre, Italy) partially sponsored the development of the v1.7 series
320320
321321
### Supporting
322322

README.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ aeneas
44
**aeneas** is a Python/C library and a set of tools to automagically
55
synchronize audio and text (aka forced alignment).
66

7-
- Version: 1.7.2
8-
- Date: 2017-03-03
7+
- Version: 1.7.3
8+
- Date: 2017-03-15
99
- Developed by: `ReadBeyond <http://www.readbeyond.it/>`__
1010
- Lead Developer: `Alberto Pettarin <http://www.albertopettarin.it/>`__
1111
- License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -359,8 +359,7 @@ Sponsors
359359

360360
- **December 2016**: the `Centro Internazionale Del Libro Parlato
361361
"Adriano Sernagiotto" <http://www.libroparlato.org/>`__ (Feltre,
362-
Italy) partially sponsored the development of v1.7.0, v1.7.1, and
363-
v1.7.2
362+
Italy) partially sponsored the development of the v1.7 series
364363

365364
Supporting
366365
~~~~~~~~~~

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.2
1+
1.7.3

aeneas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
"""
3636
__license__ = "GNU AGPL v3"
3737
__status__ = "Production"
38-
__version__ = "1.7.2"
38+
__version__ = "1.7.3"

aeneas/audiofile.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,12 @@ def __init__(self, file_path=None, file_format=None, rconf=None, logger=None):
209209
self.__samples = None
210210

211211
def __unicode__(self):
212+
fmt = self.file_format
213+
if isinstance(fmt, tuple):
214+
fmt = u"%s %d %d" % fmt
212215
msg = [
213216
u"File path: %s" % self.file_path,
214-
u"File format: %s" % self.file_format,
217+
u"File format: %s" % fmt,
215218
u"File size (bytes): %s" % gf.safe_int(self.file_size),
216219
u"Audio length (s): %s" % gf.safe_float(self.audio_length),
217220
u"Audio format: %s" % self.audio_format,
@@ -644,4 +647,7 @@ def _update_length(self):
644647
This function fails silently if one of the two is ``None``.
645648
"""
646649
if (self.audio_sample_rate is not None) and (self.__samples is not None):
647-
self.audio_length = TimeValue(self.__samples_length / self.audio_sample_rate)
650+
# NOTE computing TimeValue (... / ...) yields wrong results,
651+
# see issue #168
652+
# self.audio_length = TimeValue(self.__samples_length / self.audio_sample_rate)
653+
self.audio_length = TimeValue(self.__samples_length) / TimeValue(self.audio_sample_rate)

aeneas/cdtw/cdtw_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
setup(
5151
name="cdtw",
52-
version="1.7.2",
52+
version="1.7.3",
5353
description="Python C Extension for computing the DTW as fast as your bare metal allows.",
5454
ext_modules=[CMODULE],
5555
include_dirs=[misc_util.get_numpy_include_dirs()]

aeneas/cew/cew_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
setup(
4949
name="cew",
50-
version="1.7.2",
50+
version="1.7.3",
5151
description="Python C Extension for synthesizing text with eSpeak.",
5252
ext_modules=[CMODULE]
5353
)

aeneas/cfw/cfw_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
setup(
5656
name="cfw",
57-
version="1.7.2",
57+
version="1.7.3",
5858
description="Python C Extension for synthesizing text with Festival.",
5959
ext_modules=[CMODULE]
6060
)

aeneas/cmfcc/cmfcc_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
setup(
5252
name="cmfcc",
53-
version="1.7.2",
53+
version="1.7.3",
5454
description="Python C Extension for computing the MFCCs as fast as your bare metal allows.",
5555
ext_modules=[CMODULE],
5656
include_dirs=[misc_util.get_numpy_include_dirs()]

aeneas/cwave/cwave_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
setup(
5151
name="cwave",
52-
version="1.7.2",
52+
version="1.7.3",
5353
description="Python C Extension for for reading WAVE files.",
5454
ext_modules=[CMODULE],
5555
include_dirs=[misc_util.get_numpy_include_dirs()]

0 commit comments

Comments
 (0)