andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://github.com/jodal/mopidy

Browse Source
This commit is contained in:
Thomas Adamcik 2010-05-05 20:43:19 +02:00
commit 3dac4f9474
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/changes.rst
View File

@ -7,7 +7,12 @@ This change log is used to track all major changes to Mopidy.
0.1.0a2 (unreleased)
====================
- (nothing yet)
- Improvements to MPD protocol handling, making Mopidy work much better with a
group of clients, including ncmpc, MPoD, and Theremin.
- New command line flag ``--dump`` for dumping debug log to ``dump.log`` in the
current directory.
- New setting :attr:`mopidy.settings.MIXER_ALSA_CONTROL` for forcing what ALSA
control :class:`mopidy.mixers.alsa.AlsaMixer` should use.
0.1.0a1 (2010-05-04)

22
mopidy/settings.py
View File

@ -30,11 +30,13 @@ CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(asctime)s' + \
' [%(process)d:%(threadName)s] %(name)s\n %(message)s'
#: The log format used for dump logs. Default::
#: DUMP_LOG_FILENAME = CONSOLE_LOG_FORMAT
#:
#: DUMP_LOG_FILENAME = CONSOLE_LOG_FORMAT
DUMP_LOG_FORMAT = CONSOLE_LOG_FORMAT
#: The file to dump debug log data to. Default::
#: DUMP_LOG_FILENAME = u'dump.log'
#:
#: DUMP_LOG_FILENAME = u'dump.log'
DUMP_LOG_FILENAME = u'dump.log'
#: Protocol frontend to use. Default::
@ -64,28 +66,28 @@ elif sys.platform == 'darwin':
#: ALSA mixer only. What mixer control to use. If set to :class:`False`, first
#: ``Master`` and then ``PCM`` will be tried.
#:
#: Example: ``Master Front``. *Default:* :class:`False`
#: Example: ``Master Front``. Default: :class:`False`
MIXER_ALSA_CONTROL = False
#: External mixers only. Which port the mixer is connected to.
#:
#: This must point to the device port like ``/dev/ttyUSB0``.
#: *Default:* :class:`None`
#: Default: :class:`None`
MIXER_EXT_PORT = None
#: External mixers only. What input source the external mixer should use.
#:
#: Example: ``Aux``. *Default:* :class:`None`
#: Example: ``Aux``. Default: :class:`None`
MIXER_EXT_SOURCE = None
#: External mixers only. What state Speakers A should be in.
#:
#: *Default:* :class:`None`.
#: Default: :class:`None`.
MIXER_EXT_SPEAKERS_A = None
#: External mixers only. What state Speakers B should be in.
#:
#: *Default:* :class:`None`.
#: Default: :class:`None`.
MIXER_EXT_SPEAKERS_B = None
#: Server to use. Default::
@ -96,12 +98,12 @@ SERVER = u'mopidy.mpd.server.MpdServer'
#: Which address Mopidy should bind to. Examples:
#:
#: ``localhost``
#: Listens only on the loopback interface. *Default.*
#: Listens only on the loopback interface. Default.
#: ``0.0.0.0``
#: Listens on all interfaces.
SERVER_HOSTNAME = u'localhost'
#: Which TCP port Mopidy should listen to. *Default: 6600*
#: Which TCP port Mopidy should listen to. Default: 6600
SERVER_PORT = 6600
#: Your Spotify Premium username. Used by all Spotify backends.
@ -122,7 +124,7 @@ PLAYLIST_FOLDER = u'~/.mopidy/playlists'
#: Path to folder with local music.
MUSIC_FOLDER = u'~/music'
#: Path to MPD tag_cache for local music
#: Path to MPD tag_cache for local music.
TAG_CACHE = u'~/.mopidy/tag_cache'
# Import user specific settings