Skip to content
This repository has been archived by the owner on Sep 8, 2024. It is now read-only.

Commit

Permalink
Make audioservice load backends without callback
Browse files Browse the repository at this point in the history
  • Loading branch information
forslund committed Jan 15, 2021
1 parent 767d2d6 commit 375adbb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions mycroft/audio/audioservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,13 @@ def __init__(self, bus):
self.volume_is_low = False

self._loaded = MonotonicEvent()
bus.once('open', self.load_services_callback)
self.load_services()

def load_services_callback(self):
"""
Main callback function for loading services. Sets up the globals
service and default and registers the event handlers for the
subsystem.
def load_services(self):
"""Method for loading services.
Sets up the global service, default and registers the event handlers
for the subsystem.
"""
services = load_services(self.config, self.bus)
# Sort services so local services are checked first
Expand Down
10 changes: 5 additions & 5 deletions test/unittests/audio/test_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_audio_backend_shutdown(self, mock_load_services):
backend, second_backend = setup_mock_backends(mock_load_services,
self.emitter)
service = audio_service.AudioService(self.emitter)
service.load_services_callback()
service.load_services()

service.default = backend

Expand All @@ -91,7 +91,7 @@ def test_audio_service_track_start(self, mock_load_services):
backend, second_backend = setup_mock_backends(mock_load_services,
self.emitter)
service = audio_service.AudioService(self.emitter)
service.load_services_callback()
service.load_services()
service.default = backend

self.emitter.reset()
Expand All @@ -112,7 +112,7 @@ def test_audio_service_methods_not_playing(self, mock_load_services):
mock_load_services.return_value = [backend, second_backend]

service = audio_service.AudioService(self.emitter)
service.load_services_callback()
service.load_services()

service.default = backend

Expand Down Expand Up @@ -145,7 +145,7 @@ def test_audio_service_methods_playing(self, mock_load_services):
mock_load_services.return_value = [backend, second_backend]

service = audio_service.AudioService(self.emitter)
service.load_services_callback()
service.load_services()

service.default = backend

Expand Down Expand Up @@ -207,7 +207,7 @@ def test_audio_service_queue_methods(self, mock_load_services):
mock_load_services.return_value = [backend, second_backend]

service = audio_service.AudioService(self.emitter)
service.load_services_callback()
service.load_services()

service.default = backend

Expand Down

0 comments on commit 375adbb

Please sign in to comment.