From e475d1644bfd84d533c872348dc6d084fe9666ab Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordaneldredge@gmail.com>
Date: Wed, 26 Nov 2014 15:44:41 +0100
Subject: [PATCH] Start using values from viscolors.txt

---
 skin.js       |  4 ++--
 visualizer.js |  5 ++++-
 winamp.js     | 20 +++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/skin.js b/skin.js
index 8951e0a7..9257c6c3 100644
--- a/skin.js
+++ b/skin.js
@@ -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)');
diff --git a/visualizer.js b/visualizer.js
index 6698bb20..7d421f8f 100644
--- a/visualizer.js
+++ b/visualizer.js
@@ -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();
 
diff --git a/winamp.js b/winamp.js
index 17e663ad..953c5da2 100755
--- a/winamp.js
+++ b/winamp.js
@@ -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');