setting mute and solo on channel instead..

[moosique.git] / MooViewCounter.java

diff --git a/MooViewCounter.java b/MooViewCounter.java
index dcbd00cc16ff3dc4ca5ede73cf2c8b455823c912..8383b6cb44405a8749a0ba046101689c7d05e8d6 100644 (file)
--- a/MooViewCounter.java
+++ b/MooViewCounter.java
@@ -1,8 +1,9 @@
+import javax.sound.midi.*;
 import javax.swing.*;
 import java.awt.*;
 
 /**
- * 
+ * A graphical representation of the time signature of the current sequence.
  * 
  * @author  Andersson, Andreen, Lanneskog, Pehrson
  * @version 1
@@ -10,18 +11,18 @@ import java.awt.*;
  
 public class MooViewCounter extends JPanel {
 
-       private int timeSig1, timeSig2, measure, halfBeat, beat, halfNote;
+       private int measure, halfBeat, beat, halfNote;
        private static final int CELL_HEIGHT = 10;
        
        /** 
         * Creates an musical ruler depending on the timesignature
         */
 
-       public MooViewCounter (int ts1, int ts2) {
-               timeSig1 = ts1;
-               timeSig2 = ts2;
-               setBackground(Color.black);
+       public MooViewCounter (MetaMessage[] timeSigs) {
+               int timeSig1 = 4, timeSig2 = 4; // ...for now
+               setBackground(Moosique.getGUI().bgColor);
                setPreferredSize(new Dimension(35, 200 * CELL_HEIGHT));
+
                switch (timeSig2) {
                        case  16: measure = timeSig1;           // 1/16
                                break;
@@ -47,11 +48,9 @@ public class MooViewCounter extends JPanel {
        }
        public void paintComponent(Graphics g) {
                super.paintComponent(g);
-               setBackground(Color.black);
-
                if (!(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
-               g2.setColor(Color.white);
+               g2.setColor(Color.black);
                for (int c = 0; c < 200; c++) {
                        g2.drawLine(0, c * CELL_HEIGHT, 5, c * CELL_HEIGHT);                                    // 1/16
                        g2.drawLine(0, c * CELL_HEIGHT * halfBeat, 10, c * CELL_HEIGHT * halfBeat);             // 1/8