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

changed SERVER_HOSTNAME and SERVER_PORT settings to MPD_SERVER_HOSTNAME and MPD_SERVER_PORT to support other frontends

Browse Source
This commit is contained in:
Johannes Knutsen 2010-08-13 20:21:31 +02:00
parent 382caba05a
commit 01bba501b5
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api/settings.rst
View File

@ -13,7 +13,7 @@ there.
A complete ``~/.mopidy/settings.py`` may look like this:: A complete ``~/.mopidy/settings.py`` may look like this::
SERVER_HOSTNAME = u'0.0.0.0' MPD_SERVER_HOSTNAME = u'0.0.0.0'
SPOTIFY_USERNAME = u'alice' SPOTIFY_USERNAME = u'alice'
SPOTIFY_PASSWORD = u'mysecret' SPOTIFY_PASSWORD = u'mysecret'

2
docs/changes.rst
View File

@ -17,6 +17,8 @@ Another great release.
- Include Sphinx scripts for building docs, pylintrc, tests and test data in - Include Sphinx scripts for building docs, pylintrc, tests and test data in
the packages created by ``setup.py`` for i.e. PyPI. the packages created by ``setup.py`` for i.e. PyPI.
- Rename :mod:`mopidy.backends.gstreamer` to :mod:`mopidy.backends.local`. - Rename :mod:`mopidy.backends.gstreamer` to :mod:`mopidy.backends.local`.
- Changed ``SERVER_HOSTNAME`` and ``SERVER_PORT`` settings to
``MPD_SERVER_HOSTNAME`` and ``MPD_SERVER_PORT``
- MPD frontend: - MPD frontend:
- Relocate from :mod:`mopidy.mpd` to :mod:`mopidy.frontends.mpd`. - Relocate from :mod:`mopidy.mpd` to :mod:`mopidy.frontends.mpd`.

8
mopidy/frontends/mpd/server.py
View File

@ -29,14 +29,14 @@ class MpdServer(asyncore.dispatcher):
else: else:
self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
self.set_reuse_addr() self.set_reuse_addr()
hostname = self._format_hostname(settings.SERVER_HOSTNAME) hostname = self._format_hostname(settings.MPD_SERVER_HOSTNAME)
port = settings.SERVER_PORT port = settings.MPD_SERVER_PORT
logger.debug(u'Binding to [%s]:%s', hostname, port) logger.debug(u'Binding to [%s]:%s', hostname, port)
self.bind((hostname, port)) self.bind((hostname, port))
self.listen(1) self.listen(1)
logger.info(u'MPD server running at [%s]:%s', logger.info(u'MPD server running at [%s]:%s',
self._format_hostname(settings.SERVER_HOSTNAME), self._format_hostname(settings.MPD_SERVER_HOSTNAME),
settings.SERVER_PORT) settings.MPD_SERVER_PORT)
except IOError, e: except IOError, e:
sys.exit('MPD server startup failed: %s' % e) sys.exit('MPD server startup failed: %s' % e)

4
mopidy/settings.py
View File

@ -120,10 +120,10 @@ SERVER = u'mopidy.frontends.mpd.server.MpdServer'
#: Listens on all IPv4 interfaces. #: Listens on all IPv4 interfaces.
#: ``::`` #: ``::``
#: Listens on all interfaces, both IPv4 and IPv6. #: Listens on all interfaces, both IPv4 and IPv6.
SERVER_HOSTNAME = u'127.0.0.1' MPD_SERVER_HOSTNAME = u'127.0.0.1'
#: Which TCP port Mopidy should listen to. Default: 6600 #: Which TCP port Mopidy should listen to. Default: 6600
SERVER_PORT = 6600 MPD_SERVER_PORT = 6600
#: Your Spotify Premium username. Used by all Spotify backends. #: Your Spotify Premium username. Used by all Spotify backends.
SPOTIFY_USERNAME = u'' SPOTIFY_USERNAME = u''