gbmusic: simplify code some more
Remove Ticker classes, shorten some variable namesmaster
Richard de Boer
Richard de Boer
parent
5283f95320
commit
2de7a2dea0
|
|
@ -2,164 +2,134 @@
|
|||
/**
|
||||
* Control the music on your Gadgetbridge-connected phone
|
||||
**/
|
||||
{
|
||||
let autoClose = false; // only if opened automatically
|
||||
let state = "";
|
||||
let info = {
|
||||
let auto = false; // auto close if opened automatically
|
||||
let stat = "";
|
||||
let info = {
|
||||
artist: "",
|
||||
album: "",
|
||||
track: "",
|
||||
n: 0,
|
||||
c: 0,
|
||||
};
|
||||
const TIMEOUT = 5*1000*60; // auto close timeout: 5 minutes
|
||||
};
|
||||
const TOUT = 300000; // auto close timeout: 5 minutes (in ms)
|
||||
|
||||
/**
|
||||
* Base ticker class, needs children to implement `redraw`
|
||||
*/
|
||||
class Ticker {
|
||||
constructor(ms) {
|
||||
this.i = null;
|
||||
this.ms = ms;
|
||||
this.active = false;
|
||||
this.onLCD = (on) => {
|
||||
if (this.i) {
|
||||
clearInterval(this.i);
|
||||
this.i = null;
|
||||
}
|
||||
if (on) {
|
||||
this.i = setInterval(() => {this.tick();}, this.ms);
|
||||
this.redraw();
|
||||
}
|
||||
};
|
||||
}
|
||||
start() {
|
||||
if (this.i) {
|
||||
clearInterval(this.i);
|
||||
}
|
||||
this.i = setInterval(() => {this.tick();}, this.ms);
|
||||
this.active = true;
|
||||
Bangle.on("lcdPower", this.onLCD);
|
||||
}
|
||||
stop() {
|
||||
if (this.i) {
|
||||
clearInterval(this.i);
|
||||
this.i = null;
|
||||
}
|
||||
this.active = false;
|
||||
Bangle.removeListener("lcdPower", this.onLCD);
|
||||
}
|
||||
tick() {
|
||||
// default: just redraw
|
||||
if (Bangle.isLCDOn()) {
|
||||
this.redraw();
|
||||
}
|
||||
}
|
||||
}
|
||||
///////////////////////
|
||||
// Self-repeating timeouts
|
||||
///////////////////////
|
||||
|
||||
/**
|
||||
* Draw time and date
|
||||
*/
|
||||
class Clock extends Ticker {
|
||||
constructor() {
|
||||
super(1000);
|
||||
this.lastTime = -1;
|
||||
// Clock
|
||||
let tock = -1;
|
||||
function tick() {
|
||||
if (!Bangle.isLCDOn()) {
|
||||
return;
|
||||
}
|
||||
tick() {
|
||||
// only redraw if time has changed
|
||||
const now = new Date;
|
||||
if (Bangle.isLCDOn() && now.getHours()*60+now.getMinutes()!==this.lastTime) {
|
||||
this.redraw();
|
||||
this.lastTime = now.getHours()*60+now.getMinutes();
|
||||
}
|
||||
}
|
||||
redraw() {
|
||||
if (now.getHours()*60+now.getMinutes()!==tock) {
|
||||
drawDateTime();
|
||||
tock = now.getHours()*60+now.getMinutes();
|
||||
}
|
||||
}
|
||||
setTimeout(tick, 1000); // we only show minute precision anyway
|
||||
}
|
||||
|
||||
/**
|
||||
* Keep redrawing music while fading out
|
||||
*/
|
||||
class Fader extends Ticker {
|
||||
constructor() {
|
||||
super(500);
|
||||
// Fade out while paused and auto closing
|
||||
let fade = null;
|
||||
function fadeOut() {
|
||||
if (!Bangle.isLCDOn() || !fade) {
|
||||
return;
|
||||
}
|
||||
redraw() {
|
||||
drawMusic();
|
||||
}
|
||||
start() {
|
||||
this.since = Date.now();
|
||||
super.start();
|
||||
}
|
||||
stop() {
|
||||
super.stop();
|
||||
this.since = Date.now(); // force redraw at 100% brightness
|
||||
this.redraw();
|
||||
this.since = null;
|
||||
}
|
||||
brightness() {
|
||||
if (!fadeOut.since) {
|
||||
setTimeout(fadeOut, 500);
|
||||
}
|
||||
function brightness() {
|
||||
if (!fade) {
|
||||
return 1;
|
||||
}
|
||||
return Math.max(0, 1-((Date.now()-fadeOut.since)/TIMEOUT));
|
||||
}
|
||||
}
|
||||
return Math.max(0, 1-((Date.now()-fade)/TOUT));
|
||||
}
|
||||
|
||||
/**
|
||||
* Scroll long track names
|
||||
*/
|
||||
class Scroller extends Ticker {
|
||||
constructor() {
|
||||
super(200);
|
||||
// Scroll long track names
|
||||
// use an interval to get smooth movement
|
||||
let offset = null, // scroll Offset: null = no scrolling
|
||||
scrollI;
|
||||
function scroll() {
|
||||
offset += 10;
|
||||
drawScroller();
|
||||
}
|
||||
function scrollStart() {
|
||||
if (offset!==null) {
|
||||
return; // already started
|
||||
}
|
||||
tick() {
|
||||
this.offset += 10;
|
||||
offset = 0;
|
||||
if (Bangle.isLCDOn()) {
|
||||
this.redraw();
|
||||
if (!scrollI) {
|
||||
scrollI = setInterval(scroll, 200);
|
||||
}
|
||||
}
|
||||
redraw() {
|
||||
drawScroller();
|
||||
}
|
||||
start() {
|
||||
this.offset = 0;
|
||||
super.start();
|
||||
}
|
||||
}
|
||||
function scrollStop() {
|
||||
if (scrollI) {
|
||||
clearInterval(scrollI);
|
||||
scrollI = null;
|
||||
}
|
||||
offset = null;
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* @param {string} text
|
||||
* @return {number} Maximum font size to make text fit on screen
|
||||
*/
|
||||
function fitText(text) {
|
||||
function fitText(text) {
|
||||
if (!text.length) {
|
||||
return Infinity;
|
||||
}
|
||||
// make a guess, then shrink/grow until it fits
|
||||
const getWidth = (size) => g.setFont("Vector", size).stringWidth(text);
|
||||
let guess = Math.floor(24000/getWidth(100));
|
||||
if (getWidth(guess)===240) { // good guess!
|
||||
return guess;
|
||||
const test = (s) => g.setFont("Vector", s).stringWidth(text);
|
||||
let best = Math.floor(24000/test(100));
|
||||
if (test(best)===240) { // good guess!
|
||||
return best;
|
||||
}
|
||||
if (getWidth(guess)<240) {
|
||||
if (test(best)<240) {
|
||||
do {
|
||||
guess++;
|
||||
} while(getWidth(guess)<=240);
|
||||
return guess-1;
|
||||
best++;
|
||||
} while(test(best)<=240);
|
||||
return best-1;
|
||||
}
|
||||
// width > 240
|
||||
do {
|
||||
guess--;
|
||||
} while(getWidth(guess)>240);
|
||||
return guess;
|
||||
}
|
||||
best--;
|
||||
} while(test(best)>240);
|
||||
return best;
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* @param {string} text
|
||||
* @return {number} Randomish but deterministic number from 0-360 for text
|
||||
*/
|
||||
function textCode(text) {
|
||||
"ram";
|
||||
let code = 0;
|
||||
for(let i = 0; i<text.length; i++) {
|
||||
code += text.charCodeAt(i);
|
||||
}
|
||||
return code%360;
|
||||
}
|
||||
// dark magic
|
||||
function hsv2rgb(h, s, v) {
|
||||
const f = (n) => {
|
||||
const k = (n+h/60)%6;
|
||||
return v-v*s*Math.max(Math.min(k, 4-k, 1), 0);
|
||||
};
|
||||
return {r: f(5), g: f(3), b: f(1)};
|
||||
}
|
||||
function f2hex(f) {
|
||||
return ("00"+(Math.round(f*255)).toString(16)).substr(-2);
|
||||
}
|
||||
/**
|
||||
* @param name
|
||||
* @return {string} Semi-random color to use for given info
|
||||
*/
|
||||
function infoColor(name) {
|
||||
function infoColor(name) {
|
||||
let h, s, v;
|
||||
if (name==="num") {
|
||||
// always white
|
||||
|
|
@ -168,13 +138,6 @@
|
|||
} else {
|
||||
// make color depend deterministically on info
|
||||
let code = 0;
|
||||
const textCode = t => {
|
||||
let c = 0;
|
||||
for(let i = 0; i<t.length; i++) {
|
||||
c += t.charCodeAt(i);
|
||||
}
|
||||
return c%360;
|
||||
};
|
||||
switch(name) {
|
||||
case "track":
|
||||
code += textCode(info.track);
|
||||
|
|
@ -188,52 +151,43 @@
|
|||
h = code%360;
|
||||
s = 0.7;
|
||||
}
|
||||
v = fadeOut.brightness();
|
||||
// dark magic
|
||||
const hsv2rgb = (h, s, v) => {
|
||||
const f = (n) => {
|
||||
const k = (n+h/60)%6;
|
||||
return v-v*s*Math.max(Math.min(k, 4-k, 1), 0);
|
||||
};
|
||||
return {r: f(5), g: f(3), b: f(1)};
|
||||
};
|
||||
v = brightness();
|
||||
const rgb = hsv2rgb(h, s, v);
|
||||
const f2hex = (f) => ("00"+(Math.round(f*255)).toString(16)).substr(-2);
|
||||
return "#"+f2hex(rgb.r)+f2hex(rgb.g)+f2hex(rgb.b);
|
||||
}
|
||||
/**
|
||||
}
|
||||
/**
|
||||
* Remember track color until info changes
|
||||
* Because we need this every time we move the scroller
|
||||
* @return {string}
|
||||
*/
|
||||
function trackColor() {
|
||||
if (!("track_color" in info) || fadeOut.active) {
|
||||
function trackColor() {
|
||||
if (!("track_color" in info) || fade) {
|
||||
info.track_color = infoColor("track");
|
||||
}
|
||||
return info.track_color;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////
|
||||
// Drawing functions
|
||||
////////////////////
|
||||
/**
|
||||
////////////////////
|
||||
// Drawing functions
|
||||
////////////////////
|
||||
/**
|
||||
* Draw date and time
|
||||
* @return {*}
|
||||
*/
|
||||
function drawDateTime() {
|
||||
function drawDateTime() {
|
||||
const now = new Date;
|
||||
const l = require("locale");
|
||||
const is12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
|
||||
const is12 = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
|
||||
let time;
|
||||
if (is12hour) {
|
||||
const date12 = new Date(now.getTime());
|
||||
const hours = date12.getHours();
|
||||
if (hours===0) {
|
||||
date12.setHours(12);
|
||||
} else if (hours>12) {
|
||||
date12.setHours(hours-12);
|
||||
if (is12) {
|
||||
const d12 = new Date(now.getTime());
|
||||
const hour = d12.getHours();
|
||||
if (hour===0) {
|
||||
d12.setHours(12);
|
||||
} else if (hour>12) {
|
||||
d12.setHours(hour-12);
|
||||
}
|
||||
time = l.time(date12, true)+l.meridian(now);
|
||||
time = l.time(d12, true)+l.meridian(now);
|
||||
} else {
|
||||
time = l.time(now, true);
|
||||
}
|
||||
|
|
@ -249,12 +203,12 @@
|
|||
.setClipRect(35, 198, 199, 214)
|
||||
.clearRect(31, 198, 199, 214)
|
||||
.drawString(date, 119, 240-26);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Draw track number and total count
|
||||
*/
|
||||
function drawNum() {
|
||||
function drawNum() {
|
||||
let num = "";
|
||||
if ("n" in info && info.n>0) {
|
||||
num = "#"+info.n;
|
||||
|
|
@ -265,91 +219,96 @@
|
|||
g.reset();
|
||||
g.setFont("Vector", 30)
|
||||
.setFontAlign(1, -1) // top right
|
||||
.setClipRect(225, 30, 120, 60)
|
||||
.clearRect(225, 30, 120, 60)
|
||||
.drawString(num, 225, 30);
|
||||
}
|
||||
/**
|
||||
}
|
||||
/**
|
||||
* Clear rectangle used by track title
|
||||
*/
|
||||
function clearTrack() {
|
||||
function clearTrack() {
|
||||
g.clearRect(0, 60, 239, 119);
|
||||
}
|
||||
/**
|
||||
}
|
||||
/**
|
||||
* Draw track title
|
||||
*/
|
||||
function drawTrack() {
|
||||
function drawTrack() {
|
||||
let size = fitText(info.track);
|
||||
if (size<25) {
|
||||
// the title is too long: start the scroller
|
||||
scrollStart();
|
||||
return;
|
||||
} else {
|
||||
scrollStop();
|
||||
}
|
||||
// stationary track
|
||||
if (size>40) {
|
||||
size = 40;
|
||||
}
|
||||
if (size<25) {
|
||||
// the title is too long: start up the scroller
|
||||
if (!scroller.active) {
|
||||
scroller.start();
|
||||
}
|
||||
return;
|
||||
} else if (scroller.active) {
|
||||
scroller.stop();
|
||||
}
|
||||
// stationary track
|
||||
g.reset();
|
||||
g.setFont("Vector", size)
|
||||
.setFontAlign(0, 1) // center bottom
|
||||
.setColor(trackColor());
|
||||
clearTrack();
|
||||
g.drawString(info.track, 119, 109);
|
||||
}
|
||||
/**
|
||||
}
|
||||
/**
|
||||
* Draw scrolling track title
|
||||
*/
|
||||
function drawScroller() {
|
||||
function drawScroller() {
|
||||
g.reset();
|
||||
g.setFont("Vector", 40);
|
||||
const w = g.stringWidth(info.track)+40;
|
||||
scroller.offset = scroller.offset%w;
|
||||
offset = offset%w;
|
||||
g.setFontAlign(-1, 1) // left bottom
|
||||
.setColor(trackColor());
|
||||
clearTrack();
|
||||
g.drawString(info.track, -scroller.offset+40, 109)
|
||||
.drawString(info.track, -scroller.offset+40+w, 109);
|
||||
}
|
||||
g.drawString(info.track, -offset+40, 109)
|
||||
.drawString(info.track, -offset+40+w, 109);
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Draw track artist and album
|
||||
*/
|
||||
function drawArtistAlbum() {
|
||||
function drawArtistAlbum() {
|
||||
// we just use small enough fonts to make these always fit
|
||||
// calculate stuff before clear+redraw
|
||||
const artistColor = infoColor("artist");
|
||||
const albumColor = infoColor("album");
|
||||
let artistSize = fitText(info.artist);
|
||||
if (artistSize>30) {
|
||||
artistSize = 30;
|
||||
const aCol = infoColor("artist");
|
||||
const bCol = infoColor("album");
|
||||
let aSiz = fitText(info.artist);
|
||||
if (aSiz>30) {
|
||||
aSiz = 30;
|
||||
}
|
||||
let albumSize = fitText(info.album);
|
||||
if (albumSize>20) {
|
||||
albumSize = 20;
|
||||
let bSiz = fitText(info.album);
|
||||
if (bSiz>20) {
|
||||
bSiz = 20;
|
||||
}
|
||||
g.reset();
|
||||
g.clearRect(0, 120, 240, 189);
|
||||
let top = 124;
|
||||
if (info.artist) {
|
||||
g.setFont("Vector", artistSize)
|
||||
g.setFont("Vector", aSiz)
|
||||
.setFontAlign(0, -1) // center top
|
||||
.setColor(artistColor)
|
||||
.setColor(aCol)
|
||||
.drawString(info.artist, 119, top);
|
||||
top += artistSize+4; // fit album neatly under artist
|
||||
top += aSiz+4; // fit album neatly under artist
|
||||
}
|
||||
if (info.album) {
|
||||
g.setFont("Vector", albumSize)
|
||||
g.setFont("Vector", bSiz)
|
||||
.setFontAlign(0, -1) // center top
|
||||
.setColor(albumColor)
|
||||
.setColor(bCol)
|
||||
.drawString(info.album, 119, top);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const icons = {
|
||||
/**
|
||||
*
|
||||
* @param {string} icon Icon name
|
||||
* @param {number} x
|
||||
* @param {number} y
|
||||
* @param {number} s Icon size
|
||||
*/
|
||||
function drawIcon(icon, x, y, s) {
|
||||
({
|
||||
pause: function(x, y, s) {
|
||||
const w1 = s/3;
|
||||
g.drawRect(x, y, x+w1, y+s);
|
||||
|
|
@ -380,26 +339,27 @@
|
|||
], true);
|
||||
g.drawRect(x+w2, y, x+s, y+s);
|
||||
},
|
||||
};
|
||||
function controlColor(control) {
|
||||
if (volCmd && control===volCmd) {
|
||||
})[icon](x, y, s);
|
||||
}
|
||||
function controlColor(ctrl) {
|
||||
if (vCmd && ctrl===vCmd) {
|
||||
// volume button kept pressed down
|
||||
return "#ff0000";
|
||||
}
|
||||
return (control in tCommand) ? "#ff0000" : "#008800";
|
||||
}
|
||||
function drawControl(control, x, y) {
|
||||
g.setColor(controlColor(control));
|
||||
return (ctrl in tCommand) ? "#ff0000" : "#008800";
|
||||
}
|
||||
function drawControl(ctrl, x, y) {
|
||||
g.setColor(controlColor(ctrl));
|
||||
const s = 20;
|
||||
if (state!==controlState) {
|
||||
if (stat!==controlState) {
|
||||
g.clearRect(x, y, x+s, y+s);
|
||||
}
|
||||
icons[control](x, y, s);
|
||||
}
|
||||
let controlState;
|
||||
function drawControls() {
|
||||
drawIcon(ctrl, x, y, s);
|
||||
}
|
||||
let controlState;
|
||||
function drawControls() {
|
||||
g.reset();
|
||||
if (state==="play") {
|
||||
if (stat==="play") {
|
||||
// left touch
|
||||
drawControl("pause", 10, 190);
|
||||
// right touch
|
||||
|
|
@ -417,65 +377,64 @@
|
|||
g.setFontAlign(1, 1);
|
||||
g.setColor(controlColor("volumedown"));
|
||||
g.drawString("-", 240, 210);
|
||||
controlState = state;
|
||||
}
|
||||
controlState = stat;
|
||||
}
|
||||
|
||||
function drawMusic() {
|
||||
function drawMusic() {
|
||||
drawNum();
|
||||
drawTrack();
|
||||
drawArtistAlbum();
|
||||
}
|
||||
}
|
||||
|
||||
/////////////////////////
|
||||
|
||||
/**
|
||||
////////////////////////
|
||||
// GB event handlers
|
||||
///////////////////////
|
||||
/**
|
||||
* Update music info
|
||||
* @param event
|
||||
* @param e
|
||||
*/
|
||||
function setInfo(event) {
|
||||
info = event;
|
||||
function musicInfo(e) {
|
||||
info = e;
|
||||
delete (info.t);
|
||||
scroller.offset = 0;
|
||||
offset = null;
|
||||
if (Bangle.isLCDOn()) {
|
||||
drawMusic();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let tQuit;
|
||||
function updateState() {
|
||||
let tXit;
|
||||
function musicState(e) {
|
||||
stat = e.state;
|
||||
// if paused for five minutes, load the clock
|
||||
// (but timeout resets if we get new info, even while paused)
|
||||
if (tQuit) {
|
||||
clearTimeout(tQuit);
|
||||
if (tXit) {
|
||||
clearTimeout(tXit);
|
||||
}
|
||||
tQuit = null;
|
||||
fadeOut.stop();
|
||||
if (state!=="play" && autoClose) {
|
||||
if (state==="stop") { // never actually happens with my phone :-(
|
||||
tXit = null;
|
||||
fade = null;
|
||||
delete info.track_color;
|
||||
if (stat!=="play" && auto) {
|
||||
if (stat==="stop") { // never actually happens with my phone :-(
|
||||
load();
|
||||
} else { // also quit when paused for a long time
|
||||
tQuit = setTimeout(load, TIMEOUT);
|
||||
fadeOut.start();
|
||||
tXit = setTimeout(load, TOUT);
|
||||
fade = Date.now();
|
||||
fadeOut();
|
||||
}
|
||||
}
|
||||
if (Bangle.isLCDOn()) {
|
||||
drawControls();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// create tickers
|
||||
const clock = new Clock();
|
||||
const fadeOut = new Fader();
|
||||
const scroller = new Scroller();
|
||||
////////////////////
|
||||
// Events
|
||||
////////////////////
|
||||
|
||||
////////////////////
|
||||
// Events
|
||||
////////////////////
|
||||
|
||||
let tLauncher;
|
||||
// we put starting of watches inside a function, so we can defer it until we
|
||||
// asked the user about autoStart
|
||||
function startLauncherWatch() {
|
||||
let tLauncher;
|
||||
// we put starting of watches inside a function, so we can defer it until we
|
||||
// asked the user about autoStart
|
||||
function startLauncherWatch() {
|
||||
// long-press: launcher
|
||||
// short-press: toggle play/pause
|
||||
setWatch(function() {
|
||||
|
|
@ -491,14 +450,14 @@
|
|||
}
|
||||
togglePlay();
|
||||
}, BTN2, {repeat: true, edge: "falling"});
|
||||
}
|
||||
}
|
||||
|
||||
let tCommand = {};
|
||||
/**
|
||||
let tCommand = {};
|
||||
/**
|
||||
* Send command and highlight corresponding control
|
||||
* @param command "play/pause/next/previous/volumeup/volumedown"
|
||||
*/
|
||||
function sendCommand(command) {
|
||||
function sendCommand(command) {
|
||||
Bluetooth.println(JSON.stringify({t: "music", n: command}));
|
||||
// for controlColor
|
||||
if (command in tCommand) {
|
||||
|
|
@ -509,54 +468,54 @@
|
|||
drawControls();
|
||||
}, 200);
|
||||
drawControls();
|
||||
}
|
||||
}
|
||||
|
||||
// BTN1/3: volume control (with repeat after long-press)
|
||||
let tVol, volCmd;
|
||||
function volUp() {
|
||||
// BTN1/3: volume control (with repeat after long-press)
|
||||
let tVol, vCmd;
|
||||
function volUp() {
|
||||
volStart("up");
|
||||
}
|
||||
function volDown() {
|
||||
}
|
||||
function volDown() {
|
||||
volStart("down");
|
||||
}
|
||||
function volStart(dir) {
|
||||
}
|
||||
function volStart(dir) {
|
||||
const command = "volume"+dir;
|
||||
stopVol();
|
||||
sendCommand(command);
|
||||
volCmd = command;
|
||||
vCmd = command;
|
||||
tVol = setTimeout(repeatVol, 500);
|
||||
}
|
||||
function repeatVol() {
|
||||
sendCommand(volCmd);
|
||||
}
|
||||
function repeatVol() {
|
||||
sendCommand(vCmd);
|
||||
tVol = setTimeout(repeatVol, 100);
|
||||
}
|
||||
function stopVol() {
|
||||
}
|
||||
function stopVol() {
|
||||
if (tVol) {
|
||||
clearTimeout(tVol);
|
||||
tVol = null;
|
||||
}
|
||||
volCmd = null;
|
||||
vCmd = null;
|
||||
drawControls();
|
||||
}
|
||||
function startVolWatches() {
|
||||
}
|
||||
function startVolWatches() {
|
||||
setWatch(volUp, BTN1, {repeat: true, edge: "rising"});
|
||||
setWatch(stopVol, BTN1, {repeat: true, edge: "falling"});
|
||||
setWatch(volDown, BTN3, {repeat: true, edge: "rising"});
|
||||
setWatch(stopVol, BTN3, {repeat: true, edge: "falling"});
|
||||
}
|
||||
}
|
||||
|
||||
// touch/swipe: navigation
|
||||
function togglePlay() {
|
||||
sendCommand(state==="play" ? "pause" : "play");
|
||||
}
|
||||
function startTouchWatches() {
|
||||
// touch/swipe: navigation
|
||||
function togglePlay() {
|
||||
sendCommand(stat==="play" ? "pause" : "play");
|
||||
}
|
||||
function startTouchWatches() {
|
||||
Bangle.on("touch", function(side) {
|
||||
switch(side) {
|
||||
case 1:
|
||||
sendCommand(state==="play" ? "pause" : "previous");
|
||||
sendCommand(stat==="play" ? "pause" : "previous");
|
||||
break;
|
||||
case 2:
|
||||
sendCommand(state==="play" ? "next" : "play");
|
||||
sendCommand(stat==="play" ? "next" : "play");
|
||||
break;
|
||||
case 3:
|
||||
togglePlay();
|
||||
|
|
@ -565,18 +524,18 @@
|
|||
Bangle.on("swipe", function(dir) {
|
||||
sendCommand(dir===1 ? "previous" : "next");
|
||||
});
|
||||
}
|
||||
/////////////////////
|
||||
// Startup
|
||||
/////////////////////
|
||||
// check for saved music state (by widget) to load
|
||||
g.clear();
|
||||
global.gbmusic_active = true; // we don't need our widget
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
delete (global.gbmusic_active);
|
||||
}
|
||||
/////////////////////
|
||||
// Startup
|
||||
/////////////////////
|
||||
// check for saved music stat (by widget) to load
|
||||
g.clear();
|
||||
global.gbmusic_active = true; // we don't need our widget
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
delete (global.gbmusic_active);
|
||||
|
||||
function startEmulator() {
|
||||
function startEmulator() {
|
||||
if (typeof Bluetooth==="undefined") { // emulator!
|
||||
Bluetooth = {
|
||||
println: (line) => {console.log("Bluetooth:", line);},
|
||||
|
|
@ -585,25 +544,24 @@
|
|||
GB({"t": "musicinfo", "artist": "Some Artist Name", "album": "The Album Name", "track": "The Track Title Goes Here", "dur": 241, "c": 2, "n": 2});
|
||||
GB({"t": "musicstate", "state": "play", "position": 0, "shuffle": 1, "repeat": 1});
|
||||
}
|
||||
}
|
||||
function startWatches() {
|
||||
}
|
||||
function startWatches() {
|
||||
startVolWatches();
|
||||
startLauncherWatch();
|
||||
startTouchWatches();
|
||||
}
|
||||
}
|
||||
|
||||
function start() {
|
||||
function start() {
|
||||
// start listening for music updates
|
||||
const _GB = global.GB;
|
||||
global.GB = (event) => {
|
||||
// we eat music events!
|
||||
switch(event.t) {
|
||||
case "musicinfo":
|
||||
setInfo(event);
|
||||
musicInfo(event);
|
||||
break;
|
||||
case "musicstate":
|
||||
state = event.state;
|
||||
updateState();
|
||||
musicState(event);
|
||||
break;
|
||||
default:
|
||||
// pass on other events
|
||||
|
|
@ -614,26 +572,38 @@
|
|||
}
|
||||
};
|
||||
drawMusic();
|
||||
updateState();
|
||||
drawControls();
|
||||
startWatches();
|
||||
clock.start();
|
||||
tick();
|
||||
startEmulator();
|
||||
Bangle.on("lcdPower", function(on) {
|
||||
Bangle.on("lcdPower", (on) => {
|
||||
if (on) {
|
||||
tick();
|
||||
drawMusic();
|
||||
drawControls();
|
||||
fadeOut();
|
||||
if (offset!==null) {
|
||||
drawScroller();
|
||||
scrollI = setInterval(scroll, 200);
|
||||
}
|
||||
} else {
|
||||
if (scrollI) {
|
||||
clearInterval(scrollI);
|
||||
scrollI = null;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function init() {
|
||||
let saved = require("Storage").readJSON("gbmusic.load.json", true);
|
||||
require("Storage").erase("gbmusic.load.json");
|
||||
if (saved) {
|
||||
// autoloaded: load state was saved by widget
|
||||
info = saved.info;
|
||||
state = saved.state;
|
||||
stat = saved.state;
|
||||
delete (saved);
|
||||
autoClose = true;
|
||||
auto = true;
|
||||
start();
|
||||
} else {
|
||||
const s = require("Storage").readJSON("gbmusic.json", 1) || {};
|
||||
|
|
@ -653,3 +623,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
init();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue