removed sleep of 3 seconds for media play/pause

This commit is contained in:
Jens Hartlep
2022-10-30 15:48:44 +01:00
parent cdecfa67fe
commit 75effc896a
2 changed files with 213 additions and 187 deletions

View File

@@ -63,6 +63,7 @@ ReleaseNotes:
- 26.10.2022 - v3.5.0.1 Fix Thermostat for tado Support (by Sternmiere) - 26.10.2022 - v3.5.0.1 Fix Thermostat for tado Support (by Sternmiere)
- 27.10.2022 - v3.5.0.1 Add VirtualDevice Gate - 27.10.2022 - v3.5.0.1 Add VirtualDevice Gate
- 27.10.2022 - v3.5.0.2 Applied Boy Scout Rule (Fixed some typos, changed var to let, fixed min/max colorTemp Bug) - 27.10.2022 - v3.5.0.2 Applied Boy Scout Rule (Fixed some typos, changed var to let, fixed min/max colorTemp Bug)
- 27.10.2022 - v3.5.0.3 Fixed Media Play/Pause icon for alexa (and others) devices
Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Relais) genutzt werden Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Relais) genutzt werden
Tasmota Konsole: Tasmota Konsole:
@@ -2560,11 +2561,13 @@ function GenerateMediaPage(page: PageMedia): Payload[] {
} }
//Ausnahme für squeezebox, da State = Power //Ausnahme für squeezebox, da State = Power
if (getState(id + '.PAUSE').val === false && v2Adapter == 'squeezeboxrpc') { if (v2Adapter == 'squeezeboxrpc') {
onoffbutton = 65535; if (getState(id + '.PAUSE').val === false) {
iconplaypause = Icons.GetIcon('pause'); //pause onoffbutton = 65535;
} else { iconplaypause = Icons.GetIcon('pause'); //pause
iconplaypause = Icons.GetIcon('play'); //play } else {
iconplaypause = Icons.GetIcon('play'); //play
}
} }
if (Debug) { if (Debug) {
@@ -2620,8 +2623,8 @@ function GenerateMediaPage(page: PageMedia): Payload[] {
iconplaypause + '~' + //playpauseicon iconplaypause + '~' + //playpauseicon
currentSpeaker + '~' + //currentSpeaker currentSpeaker + '~' + //currentSpeaker
speakerList + '~' + //speakerList-seperated-by-? speakerList + '~' + //speakerList-seperated-by-?
onoffbutton onoffbutton //On/Off Button Color
}); //On/Off Button Color });
} }
if (Debug) { if (Debug) {
console.log(out_msgs); console.log(out_msgs);
@@ -3168,9 +3171,11 @@ function HandleButtonEvent(words): void {
break; break;
case 'media-back': case 'media-back':
setIfExists(id + '.PREV', true); setIfExists(id + '.PREV', true);
setTimeout(function(){ on({id: id + '.TITLE', change: "ne"}, async function () {
GeneratePage(activePage); setTimeout(function(){
},3000) GeneratePage(activePage);
},25)
});
break; break;
case 'media-pause': case 'media-pause':
let pageItemTemp = findPageItem(id); let pageItemTemp = findPageItem(id);
@@ -3191,15 +3196,24 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.PLAY', true); setIfExists(id + '.PLAY', true);
} }
} }
setTimeout(function(){ on({id: id + '.STATE', val: true}, async function () {
on({id: [].concat([id + '.ARTIST']).concat([id + '.ALBUM']).concat([id + '.TITLE']), change: "ne"}, async function () {
setTimeout(function(){
GeneratePage(activePage);
},25)
});
});
on({id: id + '.STATE', val: false}, async function () {
GeneratePage(activePage); GeneratePage(activePage);
},3000) });
break; break;
case 'media-next': case 'media-next':
setIfExists(id + '.NEXT', true); setIfExists(id + '.NEXT', true);
setTimeout(function(){ on({id: id + '.TITLE', change: "ne"}, async function () {
GeneratePage(activePage); setTimeout(function(){
},3000) GeneratePage(activePage);
},25)
});
break; break;
case 'volumeSlider': case 'volumeSlider':
setIfExists(id + '.VOLUME', parseInt(words[4])) setIfExists(id + '.VOLUME', parseInt(words[4]))
@@ -4797,7 +4811,7 @@ type Config = {
pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[], pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[],
subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[], subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[],
button1Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | null), button1Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | null),
button2Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower| null), button2Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | null),
} }
type ScreenSaverElement = { type ScreenSaverElement = {

View File

@@ -63,6 +63,7 @@ ReleaseNotes:
- 26.10.2022 - v3.5.0.1 Fix Thermostat for tado Support (by Sternmiere) - 26.10.2022 - v3.5.0.1 Fix Thermostat for tado Support (by Sternmiere)
- 27.10.2022 - v3.5.0.1 Add VirtualDevice Gate - 27.10.2022 - v3.5.0.1 Add VirtualDevice Gate
- 27.10.2022 - v3.5.0.2 Applied Boy Scout Rule (Fixed some typos, changed var to let, fixed min/max colorTemp Bug) - 27.10.2022 - v3.5.0.2 Applied Boy Scout Rule (Fixed some typos, changed var to let, fixed min/max colorTemp Bug)
- 27.10.2022 - v3.5.0.3 Fixed Media Play/Pause icon for alexa (and others) devices
Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Relais) genutzt werden Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Relais) genutzt werden
Tasmota Konsole: Tasmota Konsole:
@@ -2751,9 +2752,11 @@ function HandleButtonEvent(words): void {
break; break;
case 'media-back': case 'media-back':
setIfExists(id + '.PREV', true); setIfExists(id + '.PREV', true);
setTimeout(function(){ on({id: id + '.TITLE', change: "ne"}, async function () {
GeneratePage(activePage); setTimeout(function(){
},3000) GeneratePage(activePage);
},25)
});
break; break;
case 'media-pause': case 'media-pause':
let pageItemTemp = findPageItem(id); let pageItemTemp = findPageItem(id);
@@ -2774,15 +2777,24 @@ function HandleButtonEvent(words): void {
setIfExists(id + '.PLAY', true); setIfExists(id + '.PLAY', true);
} }
} }
setTimeout(function(){ on({id: id + '.STATE', val: true}, async function () {
on({id: [].concat([id + '.ARTIST']).concat([id + '.ALBUM']).concat([id + '.TITLE']), change: "ne"}, async function () {
setTimeout(function(){
GeneratePage(activePage);
},25)
});
});
on({id: id + '.STATE', val: false}, async function () {
GeneratePage(activePage); GeneratePage(activePage);
},3000) });
break; break;
case 'media-next': case 'media-next':
setIfExists(id + '.NEXT', true); setIfExists(id + '.NEXT', true);
setTimeout(function(){ on({id: id + '.TITLE', change: "ne"}, async function () {
GeneratePage(activePage); setTimeout(function(){
},3000) GeneratePage(activePage);
},25)
});
break; break;
case 'volumeSlider': case 'volumeSlider':
setIfExists(id + '.VOLUME', parseInt(words[4])) setIfExists(id + '.VOLUME', parseInt(words[4]))
@@ -4380,7 +4392,7 @@ type Config = {
pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[], pages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[],
subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[], subPages: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower)[],
button1Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | null), button1Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | null),
button2Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower| null), button2Page: (PageThermo | PageMedia | PageAlarm | PageQR | PageEntities | PageGrid | PagePower | null),
} }
type ScreenSaverElement = { type ScreenSaverElement = {