add some color scales in wav2png, update URLs, upgrade to 0.4.0

diff --git a/README b/README
index dc87aa0fe14442481460efa1cdb62a62c0514ac3..c9adfee6f5af9a83963aef8071d5302e92708303 100644 (file)
--- a/README
+++ b/README
@@ -46,7 +46,7 @@ octave2.9-forge, python-tk, python-numpy, python-audiolab, libsndfile1
 Installation and usage
 ======================
 
-See INSTALL and http://svn.parisson.org/telemeta for more informations.
+See INSTALL and http://telemeta.org for more informations.
 
 
 Development
@@ -65,7 +65,7 @@ Bugs and feedback
 
 If you find some bugs, please leave a ticket on this page:
 
-    http://svn.parisson.org/telemeta/newticket
+    http://telemeta.org/newticket
     
 You can also leave a ticket to request some new interesting features for the next versions.
 And even if Telemeta suits you, please give us some feedback (see §6.) !
@@ -75,7 +75,7 @@ Contact
 =======
 
 Homepage: 
-    http://svn.parisson.org/telemeta
+    http://telemeta.org
 
 Emails: 
     Guillaume Pellerin <pellerin@parisson.com>, 

diff --git a/telemeta/__init__.py b/telemeta/__init__.py
index 5c7bda933449c25621b59a8316f4da589237de18..2a20997396bd3775402c69a5c1d47a2f91e67917 100644 (file)
--- a/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@ -4,17 +4,17 @@
 Telemeta
 Parisson SARL
 
-U{http://svn.parisson.org/telemeta}
+U{http://telemeta.org}
 
 @author: Guillaume Pellerin <pellerin@parisson.com>
 @author: Olivier Guilyardi <olivier@samalyse.com>
 """
 
 __docformat__ = 'epytext en'
-__version__ = '0.3.4'
-__url__ = 'http://svn.parisson.org/telemeta'
-__copyright__ = '(C) 2007-2008 Parisson SARL and Samalyse SARL'
-__license__ = 'CeCILL'
+__version__ = '0.4.0'
+__url__ = 'http://telemeta.org'
+__copyright__ = '(C) 2007-2009 Parisson SARL and Samalyse SARL'
+__license__ = 'CeCILL2'
 __license_long__ = """
 CeCILL FREE SOFTWARE LICENSE AGREEMENT
 

diff --git a/telemeta/visualization/wav2png.py b/telemeta/visualization/wav2png.py
index adf2dcb583001a4448fdbec9dd3fa26a5c3156ad..8b0cce3db7b768c6fef80a42cd14d92c2f676597 100755 (executable)
--- a/telemeta/visualization/wav2png.py
+++ b/telemeta/visualization/wav2png.py
@@ -34,6 +34,11 @@ color_schemes = {
         'spectrogram': [(0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100),
                       (224,224,44), (255,60,30), (255,255,255)]
     },
+    'iso': {
+        'waveform': [(0,0,255), (0,255,255), (255,255,0), (255,0,0)],
+        'spectrogram': [(0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100),
+                      (224,224,44), (255,60,30), (255,255,255)]
+    },
     'purple': {
         'waveform': [(173,173,173), (147,149,196), (77,80,138), (108,66,0)],
         'spectrogram': [(0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100),