Merge branch 'develop' into tidy-up-core

This commit is contained in:
Javier Domingo Cansino 2013-08-19 15:20:26 +02:00
commit fa20214bbe
3 changed files with 5 additions and 1 deletions

View File

@ -23,3 +23,4 @@
- Tobias Sauerwein <cgtobi@gmail.com>
- Alli Witheford <alzeih@gmail.com>
- Alexandre Petitjean <alpetitjean@gmail.com>
- Pavol Babincak <scroolik@gmail.com>

View File

@ -45,6 +45,8 @@ v0.15.0 (UNRELEASED)
- Added support for viusalization. :confval:`audio/visualizer` can now be set
to GStreamer visualizers.
- Properly encode localised mixer names before logging.
**Local backend**
- An album's number of discs and a track's disc number are now extracted when

View File

@ -222,7 +222,8 @@ class Audio(pykka.ThreadingActor):
self._mixer_track.min_volume, self._mixer_track.max_volume)
logger.info(
'Audio mixer set to "%s" using track "%s"',
mixer.get_factory().get_name(), track.label)
str(mixer.get_factory().get_name()).decode('utf-8'),
str(track.label).decode('utf-8'))
def _select_mixer_track(self, mixer, track_label):
# Ignore tracks without volumes, then look for track with