Move default audio out of Winamp class

This allows ID3 tags to work on config based audio files.
This commit is contained in:
Jordan Eldredge 2018-03-02 13:47:34 -08:00
parent 05db6ff696
commit c42b33dff7
2 changed files with 14 additions and 11 deletions

View file

@ -1,5 +1,4 @@
import skin from "../skins/base-2.91.wsz";
import audio from "../mp3/llama-2.91.mp3";
/* global SENTRY_DSN */
@ -15,7 +14,7 @@ if (hash) {
// Turn on the incomplete playlist window
export const skinUrl = config.skinUrl === undefined ? skin : config.skinUrl;
export const audioUrl = config.audioUrl === undefined ? audio : config.audioUrl;
export const audioUrl = config.audioUrl;
export const hideAbout = config.hideAbout || false;
export const initialState = config.initialState || undefined;
export const sentryDsn = SENTRY_DSN;

View file

@ -7,6 +7,7 @@ import visor from "../skins/Vizor1-01.wsz";
import xmms from "../skins/XMMS-Turquoise.wsz";
import zaxon from "../skins/ZaxonRemake1-0.wsz";
import green from "../skins/Green-Dimension-V2.wsz";
import llamaAudio from "../mp3/llama-2.91.mp3";
import Winamp from "./winamp";
import {
@ -29,19 +30,22 @@ Raven.context(() => {
return;
}
const audio =
audioUrl === undefined
? {
metaData: {
artist: "DJ Mike Llama",
title: "Llama Whippin' Intro"
},
url: llamaAudio
}
: { url: audioUrl };
const winamp = new Winamp({
initialSkin: {
url: skinUrl
},
initialTracks: [
{
metaData: {
artist: "DJ Mike Llama",
title: "Llama Whippin' Intro"
},
url: audioUrl
}
],
initialTracks: [audio],
avaliableSkins: [
{ url: base, name: "<Base Skin>" },
{ url: green, name: "Green Dimension V2" },