Merge pull request #57 from hifiberry/dev

Merge dev into master for version 0.21

Author: hifiberry

hifiberrydsp/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.20"
-_called_from_test = False
+__version__ = "0.21"
+_called_from_test = False

hifiberrydsp/parser/rew.py

@@ -46,7 +46,7 @@ def readfilters(filename, fs=48000):
                         fc = float(parts[5])
                         gain = float(parts[8])
                         q = float(parts[11])
-                        logging.info("Filter EQ fc=%s, q=%s, gaion=%s, fs=%s",
+                        logging.info("Filter EQ fc=%s, q=%s, gain=%s, fs=%s",
                                      fc, q, gain, fs)
                         filters.append(
                             Biquad.peaking_eq(fc, q, gain, fs))
@@ -109,7 +109,7 @@ def readfilters(filename, fs=48000):
                             parts[4] == "Fc" and parts[6] == "Hz":
                         fc = float(parts[5])
                         q = 0.707
-                        logging.info("Filter NO fc=%s", fc, db)
+                        logging.info("Filter NO fc=%s q=%s", fc, q)
                         filters.append(
                             Biquad.notch(fc, q, fs))
 

hifiberrydsp/parser/xmlprofile.py

@@ -142,7 +142,7 @@ def read_from_file(self, filename):
         logging.info("reading profile %s", filename)
         try:
             with open(filename) as fd:
-                self.doc = xmltodict.parse(fd.read())
+                self.doc = xmltodict.parse(fd.read(), dict_constructor=OrderedDict)
         except IOError:
             logging.error("can't read file %s", filename)
             return