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

Merge Develop into main

Browse source 
Develop -> main
This commit is contained in:
yazninja 2022-05-16 22:47:45 +08:00 • committed by GitHub
commit 7ee1116695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -38,7 +38,7 @@
"dependencies": { "dependencies": {
"@sentry/electron": "^3.0.7", "@sentry/electron": "^3.0.7",
"@sentry/integrations": "^6.19.6", "@sentry/integrations": "^6.19.6",
"adm-zip": "0.4.10", "adm-zip": "0.5.9",
"airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git#hap", "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git#hap",
"castv2-client": "^1.2.0", "castv2-client": "^1.2.0",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
@ -73,7 +73,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/adm-zip": "^0.5.0", "@types/adm-zip": "^0.5.0",
"@types/discord-rpc": "4.0.2", "@types/discord-rpc": "4.0.3",
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"@types/qrcode-terminal": "^0.12.0", "@types/qrcode-terminal": "^0.12.0",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",

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

@ -52,39 +52,39 @@ export class Store {
}, },
"keybindings": { "keybindings": {
"search": [ "search": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"F" "F"
], ],
"listnow": [ "listnow": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"L" "L"
], ],
"browse": [ "browse": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"B" "B"
], ],
"recentAdd": [ "recentAdd": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"G" "G"
], ],
"songs" : [ "songs" : [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"J" "J"
], ],
"albums": [ "albums": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"S" "A"
], ],
"artists": [ "artists": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"D" "D"
], ],
"togglePrivateSession": [ "togglePrivateSession": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"P" "P"
], ],
"webRemote": [ "webRemote": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
"W" "W"
], ],
"audioSettings": [ "audioSettings": [
@ -100,12 +100,12 @@ export class Store {
"C" "C"
], ],
"settings": [ "settings": [
process.platform == "darwin" ? "Option" : "Shift", "CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
"S" "S"
], ],
"openDeveloperTools": [ "openDeveloperTools": [
process.platform == "darwin" ? "Command" : "Control", "CommandOrControl",
process.platform == "darwin" ? "Option" : "Shift", "Shift",
"I" "I"
] ]
}, },

7
src/renderer/audio/audio.js
View file

@ -270,7 +270,7 @@ const CiderAudio = {
constructor() { constructor() {
super(); super();
this._bufferSize = 1024; this._bufferSize = 2048;
this._buffers = null; this._buffers = null;
this._initBuffer(); this._initBuffer();
} }
@ -296,6 +296,7 @@ const CiderAudio = {
if (this._isBufferFull()) { if (this._isBufferFull()) {
this._flush(); this._flush();
} }
try{
let dataLength = audioRawData[0].length; let dataLength = audioRawData[0].length;
for (let idx=0; idx<dataLength; idx++) { for (let idx=0; idx<dataLength; idx++) {
for (let channel=0; channel < numberOfChannels; channel++) { for (let channel=0; channel < numberOfChannels; channel++) {
@ -303,6 +304,8 @@ const CiderAudio = {
this._buffers[channel][this._bytesWritten] = value; this._buffers[channel][this._bytesWritten] = value;
} }
this._bytesWritten += 1; this._bytesWritten += 1;
}} catch (e){
// console.log(e)
} }
} }
@ -377,7 +380,7 @@ const CiderAudio = {
} }
} }
CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(1, CiderAudio.context.currentTime); CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(1, CiderAudio.context.currentTime);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.recorderNode); CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.recorderNode);
}); });
clearInterval(searchInt); clearInterval(searchInt);

19
src/renderer/less/pages.less
View file

@ -114,6 +114,25 @@
margin: 2em; margin: 2em;
} }
} }
// Search Page
&.search-page {
.cd-mediaitem-square.mediaitem-brick {
width: 530px !important;
.artwork-container .artwork{
height:168px !important;
width:507px !important;
z-index: 1;
}
.title{
font-weight: bold;
justify-content: left;
font-size: 18px;
margin-top: -40px;
z-index: 5;
pointer-events: none;
}
}
}
// Podcast Page // Podcast Page
.content-inner.podcasts-page { .content-inner.podcasts-page {

2
src/renderer/views/pages/search.ejs
View file

@ -1,5 +1,5 @@
<script type="text/x-template" id="cider-search"> <script type="text/x-template" id="cider-search">
<div class="content-inner"> <div class="content-inner search-page">
<div v-if="search != null && search != [] && search.term != ''"> <div v-if="search != null && search != [] && search.term != ''">
<h3>{{app.getLz('term.topResult')}}</h3> <h3>{{app.getLz('term.topResult')}}</h3>
<mediaitem-scroller-horizontal <mediaitem-scroller-horizontal

2
src/renderer/views/pages/settings.ejs
View file

@ -1275,7 +1275,7 @@
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<label> <label>
<input type="checkbox" disabled a-v-model="app.cfg.connectUser.sync.settings" <input type="checkbox" a-v-model="app.cfg.connectUser.sync.settings"
@click="app.cfg.connectUser.sync.settings = !app.cfg.connectUser.sync.settings" @click="app.cfg.connectUser.sync.settings = !app.cfg.connectUser.sync.settings"
switch/> switch/>
</label> </label>