From 58ee69eccc703d42f823e452bf27ea5e3b9fc1b6 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Sat, 5 Sep 2020 03:18:58 +0200 Subject: [PATCH] various fixes --- .vscode/launch.json | 4 +- frontend/src/components/PlayerOSD.vue | 32 ++- frontend/src/components/PlayerSelect.vue | 4 +- frontend/src/components/VolumeControl.vue | 17 +- frontend/src/locales/en.json | 18 +- frontend/src/locales/nl.json | 17 +- frontend/src/views/Config.vue | 21 +- music_assistant/config.py | 3 +- music_assistant/mass.py | 5 +- music_assistant/models/player.py | 24 +- music_assistant/models/player_queue.py | 5 +- music_assistant/music_manager.py | 2 +- music_assistant/player_manager.py | 235 +++++++----------- .../providers/chromecast/__init__.py | 16 +- .../providers/chromecast/player.py | 5 +- .../providers/demo/demo_playerprovider.py | 6 +- .../providers/home_assistant/__init__.py | 193 +++++++++----- .../{app.efe7d7a1.css => app.051f35c4.css} | 2 +- music_assistant/web/index.html | 2 +- music_assistant/web/js/app.5176fd2b.js | 2 - music_assistant/web/js/app.5176fd2b.js.map | 1 - music_assistant/web/js/app.d45df414.js | 2 + music_assistant/web/js/app.d45df414.js.map | 1 + music_assistant/web/js/config.165ed655.js | 2 + music_assistant/web/js/config.165ed655.js.map | 1 + music_assistant/web/js/config.6e3bd196.js | 2 - music_assistant/web/js/config.6e3bd196.js.map | 1 - ...ifest.7d1a9077241115c1dc586f5d8e7900b1.js} | 16 +- music_assistant/web/service-worker.js | 2 +- requirements_dev.txt | 1 + 30 files changed, 331 insertions(+), 311 deletions(-) rename music_assistant/web/css/{app.efe7d7a1.css => app.051f35c4.css} (60%) delete mode 100644 music_assistant/web/js/app.5176fd2b.js delete mode 100644 music_assistant/web/js/app.5176fd2b.js.map create mode 100644 music_assistant/web/js/app.d45df414.js create mode 100644 music_assistant/web/js/app.d45df414.js.map create mode 100644 music_assistant/web/js/config.165ed655.js create mode 100644 music_assistant/web/js/config.165ed655.js.map delete mode 100644 music_assistant/web/js/config.6e3bd196.js delete mode 100644 music_assistant/web/js/config.6e3bd196.js.map rename music_assistant/web/{precache-manifest.be334d0e4fc2262edf24eb422e508efa.js => precache-manifest.7d1a9077241115c1dc586f5d8e7900b1.js} (94%) diff --git a/.vscode/launch.json b/.vscode/launch.json index f6f2d70c..1c4a7a3c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "type": "python", "request": "launch", "module": "music_assistant", - //"args": ["--debug"] + "args": ["--debug"] }, { "name": "Python: Huidige bestand", @@ -18,7 +18,7 @@ "request": "launch", "program": "${file}", "console": "integratedTerminal", - //"args": ["--debug"] + "args": ["--debug"] }, { "name": "Python: Attach using Process Id", diff --git a/frontend/src/components/PlayerOSD.vue b/frontend/src/components/PlayerOSD.vue index 98142483..c8d95881 100644 --- a/frontend/src/components/PlayerOSD.vue +++ b/frontend/src/components/PlayerOSD.vue @@ -150,7 +150,7 @@ @@ -178,14 +178,13 @@ queue_music - {{ $t("queue") }} + {{ $t("queue") }} @@ -200,10 +199,10 @@ @click.native.prevent >