mirror
/
funkwhale
kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix #59: Use color-thief for setting player colors based on track cover

merge-requests/154/head
Eliot Berriot 2018-02-18 14:31:52 +01:00
rodzic e67e290325
commit a910929132
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DD6965E2476E5C27
2 zmienionych plików z 166 dodań i 134 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
front/src/components/Sidebar.vue
Wyświetl plik

@ -87,9 +87,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui inverted segment player-wrapper"> <player></player>
<player></player>
</div>
</div> </div>
</template> </template>
@ -150,6 +148,7 @@ export default {
$sidebar-color: #1B1C1D; $sidebar-color: #1B1C1D;
.sidebar { .sidebar {
background: $sidebar-color;
@include media(">tablet") { @include media(">tablet") {
display:flex; display:flex;
flex-direction:column; flex-direction:column;
@ -211,11 +210,6 @@ $sidebar-color: #1B1C1D;
flex: 1; flex: 1;
} }
.player-wrapper {
border-top: 1px solid rgba(255, 255, 255, 0.1) !important;
background-color: rgb(46, 46, 46) !important;
}
.logo { .logo {
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;

290
front/src/components/audio/Player.vue
Wyświetl plik

@ -1,145 +1,147 @@
<template> <template>
<div class="player"> <div class="ui inverted segment player-wrapper" :style="style">
<audio-track <div class="player">
ref="currentAudio" <audio-track
v-if="currentTrack" ref="currentAudio"
:key="(currentIndex, currentTrack.id)" v-if="currentTrack"
:is-current="true" :key="(currentIndex, currentTrack.id)"
:start-time="$store.state.player.currentTime" :is-current="true"
:autoplay="$store.state.player.playing" :start-time="$store.state.player.currentTime"
:track="currentTrack"> :autoplay="$store.state.player.playing"
</audio-track> :track="currentTrack">
</audio-track>
<div v-if="currentTrack" class="track-area ui unstackable items"> <div v-if="currentTrack" class="track-area ui unstackable items">
<div class="ui inverted item"> <div class="ui inverted item">
<div class="ui tiny image"> <div class="ui tiny image">
<img v-if="currentTrack.album.cover" :src="Track.getCover(currentTrack)"> <img ref="cover" @load="updateBackground" v-if="currentTrack.album.cover" :src="Track.getCover(currentTrack)">
<img v-else src="../../assets/audio/default-cover.png"> <img v-else src="../../assets/audio/default-cover.png">
</div> </div>
<div class="middle aligned content"> <div class="middle aligned content">
<router-link class="small header discrete link track" :to="{name: 'library.tracks.detail', params: {id: currentTrack.id }}"> <router-link class="small header discrete link track" :to="{name: 'library.tracks.detail', params: {id: currentTrack.id }}">
{{ currentTrack.title }} {{ currentTrack.title }}
</router-link>
<div class="meta">
<router-link class="artist" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">
{{ currentTrack.artist.name }}
</router-link> /
<router-link class="album" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">
{{ currentTrack.album.title }}
</router-link> </router-link>
</div> <div class="meta">
<div class="description"> <router-link class="artist" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">
<track-favorite-icon :track="currentTrack"></track-favorite-icon> {{ currentTrack.artist.name }}
</router-link> /
<router-link class="album" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">
{{ currentTrack.album.title }}
</router-link>
</div>
<div class="description">
<track-favorite-icon :track="currentTrack"></track-favorite-icon>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="progress-area" v-if="currentTrack">
<div class="progress-area" v-if="currentTrack"> <div class="ui grid">
<div class="ui grid"> <div class="left floated four wide column">
<div class="left floated four wide column"> <p class="timer start" @click="updateProgress(0)">{{currentTimeFormatted}}</p>
<p class="timer start" @click="updateProgress(0)">{{currentTimeFormatted}}</p> </div>
</div>
<div class="right floated four wide column"> <div class="right floated four wide column">
<p class="timer total">{{durationFormatted}}</p> <p class="timer total">{{durationFormatted}}</p>
</div>
</div>
<div ref="progress" class="ui small orange inverted progress" @click="touchProgress">
<div class="bar" :data-percent="progress" :style="{ 'width': progress + '%' }"></div>
</div> </div>
</div> </div>
<div ref="progress" class="ui small orange inverted progress" @click="touchProgress">
<div class="bar" :data-percent="progress" :style="{ 'width': progress + '%' }"></div>
</div>
</div>
<div class="two wide column controls ui grid"> <div class="two wide column controls ui grid">
<div <div
@click="previous" @click="previous"
title="Previous track" title="Previous track"
class="two wide column control" class="two wide column control"
:disabled="!hasPrevious"> :disabled="!hasPrevious">
<i :class="['ui', {'disabled': !hasPrevious}, 'step', 'backward', 'big', 'icon']" ></i> <i :class="['ui', {'disabled': !hasPrevious}, 'step', 'backward', 'big', 'icon']" ></i>
</div> </div>
<div <div
v-if="!playing" v-if="!playing"
@click="togglePlay" @click="togglePlay"
title="Play track" title="Play track"
class="two wide column control"> class="two wide column control">
<i :class="['ui', 'play', {'disabled': !currentTrack}, 'big', 'icon']"></i> <i :class="['ui', 'play', {'disabled': !currentTrack}, 'big', 'icon']"></i>
</div> </div>
<div <div
v-else v-else
@click="togglePlay" @click="togglePlay"
title="Pause track" title="Pause track"
class="two wide column control"> class="two wide column control">
<i :class="['ui', 'pause', {'disabled': !currentTrack}, 'big', 'icon']"></i> <i :class="['ui', 'pause', {'disabled': !currentTrack}, 'big', 'icon']"></i>
</div> </div>
<div <div
@click="next" @click="next"
title="Next track" title="Next track"
class="two wide column control" class="two wide column control"
:disabled="!hasNext"> :disabled="!hasNext">
<i :class="['ui', {'disabled': !hasNext}, 'step', 'forward', 'big', 'icon']" ></i> <i :class="['ui', {'disabled': !hasNext}, 'step', 'forward', 'big', 'icon']" ></i>
</div> </div>
<div class="two wide column control volume-control"> <div class="two wide column control volume-control">
<i title="Unmute" @click="$store.commit('player/volume', 1)" v-if="volume === 0" class="volume off secondary icon"></i> <i title="Unmute" @click="$store.commit('player/volume', 1)" v-if="volume === 0" class="volume off secondary icon"></i>
<i title="Mute" @click="$store.commit('player/volume', 0)" v-else-if="volume < 0.5" class="volume down secondary icon"></i> <i title="Mute" @click="$store.commit('player/volume', 0)" v-else-if="volume < 0.5" class="volume down secondary icon"></i>
<i title="Mute" @click="$store.commit('player/volume', 0)" v-else class="volume up secondary icon"></i> <i title="Mute" @click="$store.commit('player/volume', 0)" v-else class="volume up secondary icon"></i>
<input type="range" step="0.05" min="0" max="1" v-model="sliderVolume" /> <input type="range" step="0.05" min="0" max="1" v-model="sliderVolume" />
</div> </div>
<div class="two wide column control looping"> <div class="two wide column control looping">
<i <i
title="Looping disabled. Click to switch to single-track looping." title="Looping disabled. Click to switch to single-track looping."
v-if="looping === 0" v-if="looping === 0"
@click="$store.commit('player/looping', 1)" @click="$store.commit('player/looping', 1)"
:disabled="!currentTrack" :disabled="!currentTrack"
:class="['ui', {'disabled': !currentTrack}, 'step', 'repeat', 'secondary', 'icon']"></i> :class="['ui', {'disabled': !currentTrack}, 'step', 'repeat', 'secondary', 'icon']"></i>
<i <i
title="Looping on a single track. Click to switch to whole queue looping." title="Looping on a single track. Click to switch to whole queue looping."
v-if="looping === 1" v-if="looping === 1"
@click="$store.commit('player/looping', 2)" @click="$store.commit('player/looping', 2)"
:disabled="!currentTrack" :disabled="!currentTrack"
class="repeat secondary icon"> class="repeat secondary icon">
<span class="ui circular tiny orange label">1</span> <span class="ui circular tiny orange label">1</span>
</i> </i>
<i <i
title="Looping on whole queue. Click to disable looping." title="Looping on whole queue. Click to disable looping."
v-if="looping === 2" v-if="looping === 2"
@click="$store.commit('player/looping', 0)" @click="$store.commit('player/looping', 0)"
:disabled="!currentTrack" :disabled="!currentTrack"
class="repeat orange secondary icon"> class="repeat orange secondary icon">
</i> </i>
</div> </div>
<div <div
@click="shuffle()" @click="shuffle()"
:disabled="queue.tracks.length === 0" :disabled="queue.tracks.length === 0"
title="Shuffle your queue" title="Shuffle your queue"
class="two wide column control"> class="two wide column control">
<i :class="['ui', 'random', 'secondary', {'disabled': queue.tracks.length === 0}, 'icon']" ></i> <i :class="['ui', 'random', 'secondary', {'disabled': queue.tracks.length === 0}, 'icon']" ></i>
</div> </div>
<div class="one wide column"></div> <div class="one wide column"></div>
<div <div
@click="clean()" @click="clean()"
:disabled="queue.tracks.length === 0" :disabled="queue.tracks.length === 0"
title="Clear your queue" title="Clear your queue"
class="two wide column control"> class="two wide column control">
<i :class="['ui', 'trash', 'secondary', {'disabled': queue.tracks.length === 0}, 'icon']" ></i> <i :class="['ui', 'trash', 'secondary', {'disabled': queue.tracks.length === 0}, 'icon']" ></i>
</div>
</div> </div>
<GlobalEvents
@keydown.space.prevent.exact="togglePlay"
@keydown.ctrl.left.prevent.exact="previous"
@keydown.ctrl.right.prevent.exact="next"
@keydown.ctrl.down.prevent.exact="$store.commit('player/incrementVolume', -0.1)"
@keydown.ctrl.up.prevent.exact="$store.commit('player/incrementVolume', 0.1)"
@keydown.f.prevent.exact="$store.dispatch('favorites/toggle', currentTrack.id)"
@keydown.l.prevent.exact="$store.commit('player/toggleLooping')"
@keydown.s.prevent.exact="shuffle"
/>
</div> </div>
<GlobalEvents
@keydown.space.prevent.exact="togglePlay"
@keydown.ctrl.left.prevent.exact="previous"
@keydown.ctrl.right.prevent.exact="next"
@keydown.ctrl.down.prevent.exact="$store.commit('player/incrementVolume', -0.1)"
@keydown.ctrl.up.prevent.exact="$store.commit('player/incrementVolume', 0.1)"
@keydown.f.prevent.exact="$store.dispatch('favorites/toggle', currentTrack.id)"
@keydown.l.prevent.exact="$store.commit('player/toggleLooping')"
@keydown.s.prevent.exact="shuffle"
/>
</div> </div>
</template> </template>
<script> <script>
import {mapState, mapGetters, mapActions} from 'vuex' import {mapState, mapGetters, mapActions} from 'vuex'
import GlobalEvents from '@/components/utils/global-events' import GlobalEvents from '@/components/utils/global-events'
import ColorThief from '@/vendor/color-thief'
import Track from '@/audio/track' import Track from '@/audio/track'
import AudioTrack from '@/components/audio/Track' import AudioTrack from '@/components/audio/Track'
@ -153,9 +155,12 @@ export default {
AudioTrack AudioTrack
}, },
data () { data () {
let defaultAmbiantColors = [[46, 46, 46], [46, 46, 46], [46, 46, 46], [46, 46, 46]]
return { return {
sliderVolume: this.volume, sliderVolume: this.volume,
Track: Track Track: Track,
defaultAmbiantColors: defaultAmbiantColors,
ambiantColors: defaultAmbiantColors
} }
}, },
mounted () { mounted () {
@ -177,6 +182,14 @@ export default {
let target = this.$refs.progress let target = this.$refs.progress
time = e.layerX / target.offsetWidth * this.duration time = e.layerX / target.offsetWidth * this.duration
this.$refs.currentAudio.setCurrentTime(time) this.$refs.currentAudio.setCurrentTime(time)
},
updateBackground () {
if (!this.currentTrack.album.cover) {
this.ambiantColors = this.defaultAmbiantColors
return
}
let image = this.$refs.cover
this.ambiantColors = ColorThief.prototype.getPalette(image, 4).slice(0, 4)
} }
}, },
computed: { computed: {
@ -195,9 +208,34 @@ export default {
durationFormatted: 'player/durationFormatted', durationFormatted: 'player/durationFormatted',
currentTimeFormatted: 'player/currentTimeFormatted', currentTimeFormatted: 'player/currentTimeFormatted',
progress: 'player/progress' progress: 'player/progress'
}) }),
style: function () {
let style = {
'background': this.ambiantGradiant
}
return style
},
ambiantGradiant: function () {
let indexConf = [
{orientation: 330, percent: 100, opacity: 0.7},
{orientation: 240, percent: 90, opacity: 0.7},
{orientation: 150, percent: 80, opacity: 0.7},
{orientation: 60, percent: 70, opacity: 0.7}
]
let gradients = this.ambiantColors.map((e, i) => {
let [r, g, b] = e
let conf = indexConf[i]
return `linear-gradient(${conf.orientation}deg, rgba(${r}, ${g}, ${b}, ${conf.opacity}) 10%, rgba(255, 255, 255, 0) ${conf.percent}%)`
}).join(', ')
return gradients
}
}, },
watch: { watch: {
currentTrack (newValue) {
if (!newValue) {
this.ambiantColors = this.defaultAmbiantColors
}
},
volume (newValue) { volume (newValue) {
this.sliderVolume = newValue this.sliderVolume = newValue
}, },