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

Add SERVER setting. Remove MPD_ prefix from existing server settings.

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-03-20 01:05:33 +01:00
parent 0e0a9e67dd
commit 1faecdf496
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/mpd/server.py
View File

@ -16,11 +16,11 @@ class MpdServer(asyncore.dispatcher):
self.core_queue = core_queue
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
self.set_reuse_addr()
self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT))
self.bind((settings.SERVER_HOSTNAME, settings.SERVER_PORT))
self.listen(1)
self.started_at = int(time.time())
logger.info(u'Please connect to %s port %s using an MPD client.',
settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT)
settings.SERVER_HOSTNAME, settings.SERVER_PORT)
def handle_accept(self):
(client_socket, client_address) = self.accept()

9
mopidy/settings/default.py
View File

@ -70,16 +70,21 @@ MIXER_EXT_SPEAKERS_A = None
#: *Default:* :class:`None`.
MIXER_EXT_SPEAKERS_B = None
#: Server to use. Default::
#:
#: SERVER = u'mopidy.mpd.server.MpdServer'
SERVER = u'mopidy.mpd.server.MpdServer'
#: Which address Mopidy should bind to. Examples:
#:
#: ``localhost``
#: Listens only on the loopback interface. *Default.*
#: ``0.0.0.0``
#: Listens on all interfaces.
MPD_SERVER_HOSTNAME = u'localhost'
SERVER_HOSTNAME = u'localhost'
#: Which TCP port Mopidy should listen to. *Default: 6600*
MPD_SERVER_PORT = 6600
SERVER_PORT = 6600
#: Your Spotify Premium username. Used by all Spotify backends.
SPOTIFY_USERNAME = u''