Rename mopidy.mixers to mopidy.audio.mixers
This commit is contained in:
parent
aab37302a1
commit
4dd95804f2
@ -13,7 +13,7 @@ from mopidy.backends.base import Backend
|
|||||||
from mopidy.utils import process
|
from mopidy.utils import process
|
||||||
|
|
||||||
# Trigger install of gst mixer plugins
|
# Trigger install of gst mixer plugins
|
||||||
from mopidy import mixers
|
from mopidy.audio import mixers
|
||||||
|
|
||||||
logger = logging.getLogger('mopidy.audio')
|
logger = logging.getLogger('mopidy.audio')
|
||||||
|
|
||||||
|
|||||||
@ -38,6 +38,6 @@ def create_track(label, initial_volume, min_volume, max_volume,
|
|||||||
#
|
#
|
||||||
# Keep these imports at the bottom of the file to avoid cyclic import problems
|
# Keep these imports at the bottom of the file to avoid cyclic import problems
|
||||||
# when mixers use the above code.
|
# when mixers use the above code.
|
||||||
from mopidy.mixers.auto import AutoAudioMixer
|
from .auto import AutoAudioMixer
|
||||||
from mopidy.mixers.fake import FakeMixer
|
from .fake import FakeMixer
|
||||||
from mopidy.mixers.nad import NadMixer
|
from .nad import NadMixer
|
||||||
@ -5,7 +5,7 @@ import gst
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
logger = logging.getLogger('mopidy.mixers.auto')
|
logger = logging.getLogger('mopidy.audio.mixers.auto')
|
||||||
|
|
||||||
|
|
||||||
# TODO: we might want to add some ranking to the mixers we know about?
|
# TODO: we might want to add some ranking to the mixers we know about?
|
||||||
@ -3,7 +3,7 @@ pygst.require('0.10')
|
|||||||
import gobject
|
import gobject
|
||||||
import gst
|
import gst
|
||||||
|
|
||||||
from mopidy.mixers import create_track
|
from mopidy.audio.mixers import create_track
|
||||||
|
|
||||||
|
|
||||||
class FakeMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
|
class FakeMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
|
||||||
@ -12,10 +12,10 @@ except ImportError:
|
|||||||
|
|
||||||
from pykka.actor import ThreadingActor
|
from pykka.actor import ThreadingActor
|
||||||
|
|
||||||
from mopidy.mixers import create_track
|
from mopidy.audio.mixers import create_track
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger('mopidy.mixers.nad')
|
logger = logging.getLogger('mopidy.audio.mixers.nad')
|
||||||
|
|
||||||
|
|
||||||
class NadMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
|
class NadMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
|
||||||
Loading…
Reference in New Issue
Block a user