X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=c472567b08ead7b91477a8185bf844515449a426;hb=54849baefbe39c4c0a09bd8ad27bde7743dac5ef;hp=15fca4338e44ad615fe1364727bc7588713822b8;hpb=75611a590e62f82a6f2651ac176ff619052eaa89;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index 15fca43..c472567 100644
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2013, 2014, 2015 kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -34,12 +34,11 @@ from os.path import isfile
 # local import
 from . import core, info
 from .lib.logger import set_logger
-from .lib.meta import Meta
 from .lib.simadb import SimaDB
 from .utils.config import ConfMan
 from .utils.startopt import StartOpt
 from .utils.utils import exception_log, SigHup
- # core plugins
+# core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
 from .plugins.core.uniq import Uniq
@@ -107,6 +106,10 @@ def start(sopt, restart=False):
 
     # required core plugins
     core_plugins = [History, MpdOptions, Uniq]
+    if config.getboolean('sima', 'mopidy_compat'):
+        logger.warning('Running with mopidy compat. mode!')
+        core_plugins = [History, MpdOptions]
+        config['sima']['musicbrainzid'] = 'False'
     for cplgn in core_plugins:
         logger.debug('Register core {name} ({doc})'.format(**cplgn.info()))
         sima.register_core_plugin(cplgn)
@@ -117,11 +120,7 @@ def start(sopt, restart=False):
 
     #  Loading contrib plugins
     load_plugins(sima, 'contrib')
-    logger.info('plugins loaded, prioriy: {}'.format(' > '.join(map(str, sima.plugins))))
-    #  Set use of MusicBrainzIdentifier
-    if not config.getboolean('sima', 'musicbrainzid'):
-        logger.info('Disabling MusicBrainzIdentifier')
-        Meta.use_mbid = False
+    logger.info('plugins loaded, prioriy: %s', ' > '.join(map(str, sima.plugins)))
 
     # Run as a daemon
     if config.getboolean('daemon', 'daemon'):