Merge branch 'innolab' into develop
This commit is contained in:
commit
873d234999
8 changed files with 266 additions and 81 deletions
|
@ -664,7 +664,7 @@ export class BrowserWindow {
|
|||
console.log(err)
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
ipcMain.on('check-for-update', async (_event) => {
|
||||
const branch = utils.getStoreValue('general.update_branch')
|
||||
let latestbranch = await fetch(`https://circleci.com/api/v1.1/project/gh/ciderapp/Cider/latest/artifacts?branch=${branch}&filter=successful`)
|
||||
|
@ -680,10 +680,10 @@ export class BrowserWindow {
|
|||
const options: any = {
|
||||
provider: 'generic',
|
||||
url: `${base_url}`
|
||||
}
|
||||
}*/
|
||||
/*
|
||||
* Have to handle the auto updaters seperatly until we can support macOS. electron-builder limitation -q
|
||||
*/
|
||||
*/ /*
|
||||
const win_autoUpdater = new NsisUpdater(options) //Windows
|
||||
const linux_autoUpdater = new AppImageUpdater(options) //Linux
|
||||
await win_autoUpdater.checkForUpdatesAndNotify()
|
||||
|
@ -697,7 +697,7 @@ export class BrowserWindow {
|
|||
event.returnValue = true
|
||||
}
|
||||
})
|
||||
|
||||
*/
|
||||
|
||||
ipcMain.on('share-menu', async (_event, url) => {
|
||||
if (process.platform != 'darwin') return;
|
||||
|
|
|
@ -12,7 +12,7 @@ export class Store {
|
|||
"discord_rpc_clear_on_pause": true,
|
||||
"language": "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
|
||||
"playbackNotifications": true,
|
||||
"update_branch": "main"
|
||||
"update_branch": "innolab"
|
||||
},
|
||||
"home": {
|
||||
"followedArtists": [],
|
||||
|
@ -36,6 +36,8 @@ export class Store {
|
|||
"normalization": false,
|
||||
"ciderPPE": false,
|
||||
"ciderPPE_value": 0.5,
|
||||
"analogWarmth": false,
|
||||
"analogWarmth_value": 1.25,
|
||||
"spatial": false,
|
||||
"spatial_properties": {
|
||||
"presets": [],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue