secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Averaging group volume plus bias

Browse Source
This commit is contained in:
James Barnsley
2018-05-03 07:56:48 +12:00
parent 7b08a3a859
commit 7e03eb4c37
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mopidy_iris/static/app.css
View File

@ -4291,6 +4291,9 @@ input[type="submit"] {
left: 0; left: 0;
right: 0; } } right: 0; } }
.snapcast button {
margin-bottom: 0; }
.snapcast .volume-control .mute-control { .snapcast .volume-control .mute-control {
display: inline-block; display: inline-block;
float: left; float: left;

8
mopidy_iris/static/app.js
View File

@ -51676,8 +51676,6 @@ var PusherMiddleware = function () {
clients_ids.splice(clients_ids_index, 1); clients_ids.splice(clients_ids_index, 1);
} }
console.log(clients_ids, action.id, clients_ids_index);
var data = { var data = {
method: 'Group.SetClients', method: 'Group.SetClients',
params: { params: {
@ -70576,7 +70574,7 @@ var Snapcast = function (_React$Component) {
// Don't add our existing group // Don't add our existing group
if (groups[i].id !== group.id) { if (groups[i].id !== group.id) {
groups_dropdown.push({ groups_dropdown.push({
label: groups[i].name ? groups[i].name : 'Group ' + (i + 1), label: groups[i].name ? groups[i].name : 'Group ' + groups[i].id.substring(0, 3),
value: groups[i].id value: groups[i].id
}); });
} }
@ -70749,7 +70747,7 @@ var Snapcast = function (_React$Component) {
) )
) )
), ),
groups.map(function (group, i) { groups.map(function (group) {
// Average our clients' volume for an overall group volume // Average our clients' volume for an overall group volume
var group_volume = 0; var group_volume = 0;
@ -70776,7 +70774,7 @@ var Snapcast = function (_React$Component) {
_react2.default.createElement( _react2.default.createElement(
'div', 'div',
{ className: 'text' }, { className: 'text' },
group.name ? group.name : 'Group ' + (i + 1), group.name ? group.name : 'Group ' + group.id.substring(0, 3),
' \xA0', ' \xA0',
_react2.default.createElement( _react2.default.createElement(
'span', 'span',

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

6
src/js/components/Snapcast.js
View File

@ -63,7 +63,7 @@ class Snapcast extends React.Component{
// Don't add our existing group // Don't add our existing group
if (groups[i].id !== group.id){ if (groups[i].id !== group.id){
groups_dropdown.push({ groups_dropdown.push({
label: (groups[i].name ? groups[i].name : 'Group '+(i+1)), label: (groups[i].name ? groups[i].name : 'Group '+groups[i].id.substring(0,3)),
value: groups[i].id value: groups[i].id
}); });
} }
@ -199,7 +199,7 @@ class Snapcast extends React.Component{
</div> </div>
{ {
groups.map((group, i) => { groups.map(group => {
// Average our clients' volume for an overall group volume // Average our clients' volume for an overall group volume
var group_volume = 0; var group_volume = 0;
@ -217,7 +217,7 @@ class Snapcast extends React.Component{
</div> </div>
<div className="input"> <div className="input">
<div className="text"> <div className="text">
{group.name ? group.name : 'Group '+(i+1)} &nbsp; {group.name ? group.name : 'Group '+group.id.substring(0,3)} &nbsp;
<span className="grey-text">({group.id})</span> <span className="grey-text">({group.id})</span>
</div> </div>
</div> </div>

2
src/js/services/pusher/middleware.js
View File

@ -791,8 +791,6 @@ const PusherMiddleware = (function(){
clients_ids.splice(clients_ids_index, 1); clients_ids.splice(clients_ids_index, 1);
} }
console.log(clients_ids, action.id, clients_ids_index);
var data = { var data = {
method: 'Group.SetClients', method: 'Group.SetClients',
params: { params: {

4
src/scss/components/_snapcast.scss
View File

@ -1,6 +1,10 @@
.snapcast { .snapcast {
button {
margin-bottom: 0;
}
.volume-control { .volume-control {
.mute-control { .mute-control {