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

Better UI for snapcast

Browse Source
This commit is contained in:
James Barnsley
2018-04-18 17:01:57 +12:00
parent e1b8836c53
commit 4e049d403e
10 changed files with 26297 additions and 23735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/js/services/pusher/actions.js
View File

@ -197,57 +197,42 @@ export function getSnapcast(){
}
}
export function setSnapcastClientVolume(id, muted, percent){
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_VOLUME',
data: {
method: 'Client.SetVolume',
params: {
id: id,
volume: {
muted: muted,
percent: percent
}
}
}
}
}
export function setSnapcastClientName(id, name){
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_NAME',
data: {
method: 'Client.SetName',
params: {
id: id,
name: name
}
}
id: id,
name: name
}
}
export function setSnapcastClientMute(id, mute){
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_MUTE',
id: id,
mute: mute
}
}
export function setSnapcastClientVolume(id, percent){
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_VOLUME',
id: id,
percent: percent
}
}
export function setSnapcastClientLatency(id, latency){
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_LATENCY',
data: {
method: 'Client.SetLatency',
params: {
id: id,
latency: latency
}
}
id: id,
latency: latency
}
}
export function deleteSnapcastClient(id){
return {
type: 'PUSHER_DELETE_SNAPCAST_CLIENT',
data: {
method: 'Server.DeleteClient',
params: {
id: id
}
}
id: id
}
}

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

@ -603,37 +603,22 @@ const PusherMiddleware = (function(){
);
break
case 'PUSHER_SET_SNAPCAST_CLIENT_VOLUME':
request(store, 'snapcast_instruct', action.data)
.then(
response => {
store.dispatch({
type: 'PUSHER_SNAPCAST_CLIENT_UPDATED',
key: action.data.params.id,
client: {
config: {
volume: response.volume
}
}
})
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'PUSHER_SET_SNAPCAST_CLIENT_NAME':
request(store, 'snapcast_instruct', action.data)
var client = store.getState().pusher.snapcast_clients[action.id];
var data = {
method: 'Client.SetName',
params: {
id: action.id,
name: action.name
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch({
type: 'PUSHER_SNAPCAST_CLIENT_UPDATED',
key: action.data.params.id,
key: action.id,
client: {
config: {
name: response.name
@ -651,13 +636,94 @@ const PusherMiddleware = (function(){
);
break
case 'PUSHER_SET_SNAPCAST_CLIENT_LATENCY':
request(store, 'snapcast_instruct', action.data)
case 'PUSHER_SET_SNAPCAST_CLIENT_MUTE':
var client = store.getState().pusher.snapcast_clients[action.id];
var data = {
method: 'Client.SetVolume',
params: {
id: action.id,
volume: {
muted: action.mute,
percent: client.config.volume.percent,
}
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch({
type: 'PUSHER_SNAPCAST_CLIENT_UPDATED',
key: action.data.params.id,
key: action.id,
client: {
config: {
volume: response.volume
}
}
})
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'PUSHER_SET_SNAPCAST_CLIENT_VOLUME':
var client = store.getState().pusher.snapcast_clients[action.id];
var data = {
method: 'Client.SetVolume',
params: {
id: action.id,
volume: {
muted: client.config.volume.muted,
percent: action.percent
}
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch({
type: 'PUSHER_SNAPCAST_CLIENT_UPDATED',
key: action.id,
client: {
config: {
volume: response.volume
}
}
})
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'PUSHER_SET_SNAPCAST_CLIENT_LATENCY':
var client = store.getState().pusher.snapcast_clients[action.id];
var data = {
method: 'Client.SetLatency',
params: {
id: action.id,
latency: action.latency
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch({
type: 'PUSHER_SNAPCAST_CLIENT_UPDATED',
key: action.id,
client: {
config: {
latency: response.latency
@ -676,7 +742,14 @@ const PusherMiddleware = (function(){
break
case 'PUSHER_DELETE_SNAPCAST_CLIENT':
request(store, 'snapcast_instruct', action.data)
var data = {
method: 'Server.DeleteClient',
params: {
id: action.id
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch({