okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into enhancement/radio

Browse source
This commit is contained in:
Core 2022-05-16 15:57:16 +01:00 • committed by GitHub
commit eaae9ba457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
103 changed files with 18529 additions and 23706 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main/base/browserwindow.ts
View file

@ -78,6 +78,7 @@ export class BrowserWindow {
"pages/audiolabs",
"pages/zoo",
"pages/plugin-renderer",
"pages/keybinds",
"components/mediaitem-artwork",
"components/artwork-material",
"components/menu-panel",
@ -342,6 +343,8 @@ export class BrowserWindow {
});
this.options.width = windowState.width;
this.options.height = windowState.height;
this.options.x = windowState.x;
this.options.y = windowState.y;
switch (process.platform) {
default:
@ -462,6 +465,16 @@ export class BrowserWindow {
}
})
app.get("/cideraudio/impulses/:file", (req, res) => {
const impulseExternals = join(utils.getPath("externals"), "/impulses/")
const impulseFile = join(impulseExternals, req.params.file)
if(existsSync(impulseFile)) {
res.sendFile(impulseFile)
}else{
res.sendFile(join(utils.getPath('srcPath'), "./renderer/audio/impulses/" + req.params.file))
}
})
app.get("/api/playback/:action", (req, res) => {
const action = req.params.action;
switch (action) {
@ -942,13 +955,23 @@ export class BrowserWindow {
switch (path) {
default:
case "plugins":
shell.openPath(utils.getPath("plugins"));
if (existsSync(utils.getPath("plugins"))) {
shell.openPath(utils.getPath("plugins"));
} else {
mkdirSync(utils.getPath("plugins"));
shell.openPath(utils.getPath("plugins"));
}
break;
case "userdata":
shell.openPath(app.getPath("userData"));
break;
case "themes":
shell.openPath(utils.getPath("themes"));
if (existsSync(utils.getPath("themes"))) {
shell.openPath(utils.getPath("themes"));
} else {
mkdirSync(utils.getPath("themes"));
shell.openPath(utils.getPath("themes"));
}
break;
}
});
@ -1060,6 +1083,11 @@ export class BrowserWindow {
BrowserWindow.win.setFullScreen(flag)
})
//Fullscreen
ipcMain.on('getFullScreen', (event, flag) => {
event.returnValue = BrowserWindow.win.isFullScreen()
})
//Fullscreen
ipcMain.on('detachDT', (_event, _) => {
BrowserWindow.win.webContents.openDevTools({mode: 'detach'});

52
src/main/base/store.ts
View file

@ -17,6 +17,7 @@ export class Store {
"client": "Cider",
"clear_on_pause": true,
"hide_buttons": false,
"hide_timestamp": false,
"state_format": "by {artist}",
"details_format": "{title}",
},
@ -51,27 +52,39 @@ export class Store {
},
"keybindings": {
"search": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"F"
],
"albums": [
process.platform == "darwin" ? "Command" : "Control",
"S"
],
"artists": [
process.platform == "darwin" ? "Command" : "Control",
"D"
"listnow": [
"CommandOrControl",
"L"
],
"browse": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"B"
],
"recentAdd": [
"CommandOrControl",
"G"
],
"songs" : [
"CommandOrControl",
"J"
],
"albums": [
"CommandOrControl",
"A"
],
"artists": [
"CommandOrControl",
"D"
],
"togglePrivateSession": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"P"
],
"webRemote": [
process.platform == "darwin" ? "Command" : "Control",
"CommandOrControl",
"W"
],
"audioSettings": [
@ -87,15 +100,16 @@ export class Store {
"C"
],
"settings": [
process.platform == "darwin" ? "Option" : "Shift",
"CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
"S"
],
"openDeveloperTools": [
process.platform == "darwin" ? "Command" : "Control",
process.platform == "darwin" ? "Option" : "Shift",
"CommandOrControl",
"Shift",
"I"
]
}
},
"showLovedTracksInline": true
},
"home": {
"followedArtists": [],
@ -128,10 +142,10 @@ export class Store {
"maikiwiAudio": {
"ciderPPE": false,
"ciderPPE_value": "MAIKIWI",
"analogWarmth": false,
"analogWarmth_value": "SMOOTH",
"atmosphereRealizer": false,
"atmosphereRealizer_value": "NATURAL_STANDARD",
"atmosphereRealizer1": false,
"atmosphereRealizer1_value": "NATURAL_STANDARD",
"atmosphereRealizer2": false,
"atmosphereRealizer2_value": "NATURAL_STANDARD",
"spatial": false,
"spatialProfile": "71_420maikiwi",
"vibrantBass": { // Hard coded into the app. Don't include any of this config into exporting presets in store.ts