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

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Core 2022-08-16 02:04:38 +01:00
commit b10ce4c5f6
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
3 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -426,8 +426,9 @@ const CiderAudio = {
let dataLength = audioRawData[0]?.length ?? 0; let dataLength = audioRawData[0]?.length ?? 0;
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++) {
try {
let value = audioRawData[channel][idx]; let value = audioRawData[channel][idx];
this._buffers[channel][this._bytesWritten] = value; this._buffers[channel][this._bytesWritten] = value;} catch(e){}
} }
this._bytesWritten += 1; this._bytesWritten += 1;
} }

4
src/renderer/views/components/mediaitem-list-item.ejs
View file

@ -62,16 +62,18 @@
<div class="title text-overflow-elipsis" :title="item.attributes.name"> <div class="title text-overflow-elipsis" :title="item.attributes.name">
{{ item.attributes.name }} {{ item.attributes.name }}
</div> </div>
<div class="subtitle text-overflow-elipsis" :title="item.attributes.artistName" <div class="subtitle text-overflow-elipsis"
style="-webkit-box-orient: horizontal;"> style="-webkit-box-orient: horizontal;">
<template v-if="item.attributes.artistName"> <template v-if="item.attributes.artistName">
<div class="artist item-navigate text-overflow-elipsis" <div class="artist item-navigate text-overflow-elipsis"
:title="item.attributes.artistName"
@click="app.searchAndNavigate(item,'artist')"> @click="app.searchAndNavigate(item,'artist')">
{{ item.attributes.artistName }} {{ item.attributes.artistName }}
</div> </div>
<template v-if="item.attributes.albumName">&nbsp;—&nbsp;</template> <template v-if="item.attributes.albumName">&nbsp;—&nbsp;</template>
<template v-if="item.attributes.albumName"> <template v-if="item.attributes.albumName">
<div class="artist item-navigate text-overflow-elipsis" <div class="artist item-navigate text-overflow-elipsis"
:title="item.attributes.albumName"
@click="app.searchAndNavigate(item,'album')"> @click="app.searchAndNavigate(item,'album')">
{{ item.attributes.albumName }} {{ item.attributes.albumName }}
</div> </div>

18
src/renderer/views/components/sidebar.ejs
View file

@ -189,11 +189,7 @@
</template> </template>
</div> </div>
<div class="app-sidebar-footer display--small app-sidebar-footer--controls"> <div class="app-sidebar-footer display--small app-sidebar-footer--controls">
<div <div class="app-playback-controls" @contextmenu="$root.nowPlayingContextMenu">
class="app-playback-controls"
v-if="$root.mkReady()"
@contextmenu="$root.nowPlayingContextMenu"
>
<div class="control-buttons"> <div class="control-buttons">
<div class="app-chrome-item"> <div class="app-chrome-item">
<button <button
@ -295,15 +291,9 @@
</div> </div>
</div> </div>
</div> </div>
<div <div class="app-sidebar-notification backgroundNotification" v-if="$root.library.backgroundNotification.show" >
class="app-sidebar-notification backgroundNotification"
v-if="$root.library.backgroundNotification.show"
>
<div class="message"> <div class="message">
{{ $root.library.backgroundNotification.message }} ({{ {{ $root.library.backgroundNotification.message }} ({{$root.library.backgroundNotification.progress }} / {{ $root.library.backgroundNotification.total }})
$root.library.backgroundNotification.progress
}}
/ {{ $root.library.backgroundNotification.total }})
</div> </div>
</div> </div>
</div> </div>
@ -311,6 +301,6 @@
<script> <script>
Vue.component("cider-app-sidebar", { Vue.component("cider-app-sidebar", {
template: "#cider-app-sidebar" template: "#cider-app-sidebar",
}) })
</script> </script>