Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-22 09:37:17 +00:00
Code Issues Projects Releases Wiki Activity

Start using values from viscolors.txt

Browse source
This commit is contained in:
Jordan Eldredge 2014-11-26 15:44:41 +01:00
parent b31da510dc
commit e475d1644b
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
skin.js
View file

@ -2,8 +2,8 @@
SkinManager = {
fileManager: FileManager,
font: Font,
visColors: [],
style: document.getElementById('skin'),
visualizer: Visualizer.init(document.getElementById('visualizer')),
_skinImages: {
"#winamp": "MAIN.BMP",
@ -86,7 +86,7 @@ SkinManager = {
for(var i = 0; i < 24; i++) {
var matches = regex.exec(entries[i]);
if(matches) {
this.visColors.push('rgb(' + matches.slice(1,4).join(',') + ')');
this.visualizer.colors.push('rgb(' + matches.slice(1,4).join(',') + ')');
} else {
console.error('Error in VISCOLOR.TXT on line', i);
this.visColors.push('rgb(255,0,0)');

5
visualizer.js
View file

@ -7,6 +7,7 @@ Visualizer = {
this.canvasCtx.translate(1, 1); // http://stackoverflow.com/questions/13593527/canvas-make-the-line-thicker
this.width = this.canvas.width;
this.height = this.canvas.height;
this.colors = [];
this.NONE = 0;
this.OSCILLOSCOPE = 1;
this.BAR = 2;
@ -40,7 +41,9 @@ Visualizer = {
}
this.canvasCtx.lineWidth = 2; // 2 because were shrinking the canvas by 2
this.canvasCtx.strokeStyle = 'rgba(255, 255, 255,1)';
// Just use one of the viscolors for now
this.canvasCtx.strokeStyle = this.colors[18];
this.canvasCtx.beginPath();

20
winamp.js
View file

@ -4,9 +4,7 @@ function Winamp () {
this.fileManager = FileManager;
this.media = Media.init();
this.skin = SkinManager;
this.skinManager = SkinManager;
this.visualizer = Visualizer.init(document.getElementById('visualizer'));
this.visualizerStyle = this.visualizer.OSCILLOSCOPE;
this.skin.visualizerStyle = this.skin.visualizer.OSCILLOSCOPE;
this.nodes = {
'option': document.getElementById('option'),
@ -108,11 +106,11 @@ function Winamp () {
});
this.media.addEventListener('visualizerupdate', function(bufferLength, dataArray) {
self.visualizer.paintFrame(self.visualizerStyle, bufferLength, dataArray);
self.skin.visualizer.paintFrame(self.skin.visualizerStyle, bufferLength, dataArray);
});
this.media.addEventListener('ended', function() {
self.visualizer.clear();
self.skin.visualizer.clear();
self.setStatus('stop');
});
@ -140,14 +138,14 @@ function Winamp () {
}
this.nodes.visualizer.onclick = function() {
if(self.visualizerStyle == self.visualizer.NONE) {
if(self.visualizerStyle == self.skin.visualizer.NONE) {
// self.visualizerStyle = self.visualizer.BAR;
//} else if(self.visualizerStyle == self.visualizer.BAR) {
self.visualizerStyle = self.visualizer.OSCILLOSCOPE;
} else if(self.visualizerStyle == self.visualizer.OSCILLOSCOPE) {
self.visualizerStyle = self.visualizer.NONE;
self.visualizerStyle = self.skin.visualizer.OSCILLOSCOPE;
} else if(self.visualizerStyle == self.skin.visualizer.OSCILLOSCOPE) {
self.visualizerStyle = self.skin.visualizer.NONE;
}
self.visualizer.clear();
self.skin.visualizer.clear();
}
this.nodes.previous.onclick = function() {
@ -529,4 +527,4 @@ fileName = "1. DJ Mike Llama - Llama Whippin' Intro (0:05)";
winamp.loadFromUrl(file, fileName);
winamp.marqueeLoop();
winamp.skinManager.setSkinByUrl('https://cdn.rawgit.com/captbaritone/winamp2-js/master/skins/base-2.91.wsz');
winamp.skin.setSkinByUrl('https://cdn.rawgit.com/captbaritone/winamp2-js/master/skins/base-2.91.wsz');