ur

fatg3erman · Apr 17, 2021 · 6e48b73 · 6e48b73
1 parent d54cbcc
commit 6e48b73
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/api/player/index.php b/api/player/index.php
@@ -277,6 +277,7 @@
 $mpd_status['radioparam'] = prefs::$prefs['multihosts'][$p]['radioparams']['radioparam'];
 $mpd_status['radiomaster'] = prefs::$prefs['multihosts'][$p]['radioparams']['radiomaster'];
 $mpd_status['radioconsume'] = prefs::$prefs['multihosts'][$p]['radioparams']['radioconsume'];
+$mpd_status['mopidy_radio_domains'] = prefs::$prefs['mopidy_radio_domains'];
 
 header('Content-Type: application/json');
 echo json_encode($mpd_status);

diff --git a/player/controller.js b/player/controller.js
@@ -123,6 +123,7 @@ function playerController() {
 				debug.core('PLAYER', e, player.status[e]);
 				prefs[e] = player.status[e];
 			});
+			$('#radiodomains').makeDomainChooser("setSelection", player.status.mopidy_radio_domains);
 			if (player.status.songid != self.previoussongid) {
 				if (playlist.trackHasChanged(player.status.songid)) {
 					self.previoussongid = player.status.songid;

diff --git a/ui/prefs.js b/ui/prefs.js
@@ -180,7 +180,6 @@ var prefs = function() {
 		"ratman_sortby",
 		"sleeptime",
 		"sleepon",
-		"mopidy_radio_domains",
 		"tradsearch",
 		"sortwishlistby",
 		"player_in_titlebar",

diff --git a/ui/widgets.js b/ui/widgets.js
@@ -1431,18 +1431,24 @@ $.widget("rompr.makeDomainChooser", {
 					i.capitalize()+'</label></div>');
 			}
 		}
+		this.setSelection(this.options.default_domains);
+		this.options.holder.disableSelection();
+	},
+
+	_setOption: function(key, value) {
+		this.options[key] = value;
+	},
+
+	setSelection: function(domains) {
 		this.options.holder.find('.topcheck').each(function() {
 			var n = $(this).attr("id");
 			var d = n.substr(0, n.indexOf('_'));
-			if (self.options.default_domains.indexOf(d) > -1) {
+			if (domains.indexOf(d) > -1) {
 				$(this).prop("checked", true);
+			} else {
+				$(this).prop("checked", false);
 			}
 		});
-		this.options.holder.disableSelection();
-	},
-
-	_setOption: function(key, value) {
-		this.options[key] = value;
 	},
 
 	getSelection: function() {