Added AVTK Unit, updated master track and Unit track

src/avtk/avtk_unit.h

@@ -0,0 +1,207 @@
+/*
+ * Author: Harry van Haaren 2013
+ *         harryhaaren@gmail.com
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * 
+ */
+
+
+#ifndef AVTK_UNIT_H
+#define AVTK_UNIT_H
+
+#include <FL/Fl_Button.H>
+
+#include <string>
+
+namespace Avtk
+{
+
+class UnitState
+{
+  public:
+    enum State {
+      UNIT_EMPTY = 0,
+      UNIT_LOADED,
+      UNIT_QUEUED,
+      UNIT_PLAYING,
+      UNIT_RECORDING,
+      UNIT_STOPPING,
+    };
+    UnitState()
+    {
+      state = UNIT_EMPTY;
+      name = "Clip";
+    }
+    UnitState(std::string n)
+    {
+      state = UNIT_EMPTY;
+      name = n;
+    }
+  
+    State state;
+    std::string name;
+};
+
+class Unit : public Fl_Button
+{
+  public:
+    Unit(int _x, int _y, int _w, int _h, const char *_label):
+        Fl_Button(_x, _y, _w, _h, _label)
+    {
+      x = _x;
+      y = _y;
+      w = _w;
+      h = _h;
+      
+      label = _label;
+      
+      highlight = false;
+      mouseOver = false;
+      
+      clips[0].state = UnitState::UNIT_EMPTY;
+      clips[1].state = UnitState::UNIT_LOADED;
+      clips[2].state = UnitState::UNIT_QUEUED;
+      clips[3].state = UnitState::UNIT_PLAYING;
+      clips[4].state = UnitState::UNIT_RECORDING;
+      clips[5].state = UnitState::UNIT_STOPPING;
+    }
+    
+    static const int numClips = 10;
+    UnitState clips[numClips];
+    
+    bool mouseOver;
+    bool highlight;
+    int x, y, w, h;
+    const char* label;
+    
+    void draw()
+    {
+      if (damage() & FL_DAMAGE_ALL)
+      {
+        if ( value() )
+        {
+          highlight = true;
+        }
+        else
+        {
+          highlight = false;
+        }
+        
+        cairo_t *cr = Fl::cairo_cc();
+        
+        cairo_save( cr );
+        
+        int drawY = y;
+        
+        cairo_rectangle( cr, x+2, y + 2, w - 2, h - 2 );
+        cairo_set_source_rgba(cr, 66 / 255.f,  66 / 255.f ,  66 / 255.f, 0.4);
+        cairo_fill(cr);
+        
+        //cairo_rectangle( cr, x+1, drawY, clipHeight - 2, clipHeight - 2 );
+        /*
+        cairo_rectangle( cr, x+1, drawY, clipWidth, clipHeight - 2 );
+        
+        float alpha = 0.7;
+        if (mouseOver) { alpha = 1; }
+        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, alpha);
+        cairo_set_line_width( cr, 1.4);
+        cairo_move_to( cr, x+clipHeight-1, drawY );
+        cairo_line_to( cr, x+clipHeight-1, drawY + clipHeight - 2);
+        cairo_stroke(cr);
+        
+        // clip name
+        cairo_move_to( cr, x+clipHeight-1+ 10, drawY + 15 );
+        cairo_set_source_rgba( cr, 255 / 255.f, 255 / 255.f , 255 / 255.f , 1 );
+        cairo_set_font_size( cr, 10 );
+        cairo_show_text( cr, label );
+        */
+        
+        // outline
+        float alpha = 0.7;
+        if (mouseOver) { alpha = 1; }
+        cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, alpha);
+        cairo_rectangle( cr, x+2, y + 2, w - 2, h - 2 );
+        cairo_set_line_width( cr, 1.4);
+        cairo_stroke( cr );
+        
+        cairo_restore( cr );
+        
+        draw_label();
+      }
+    }
+    
+    void resize(int X, int Y, int W, int H)
+    {
+      Fl_Widget::resize(X,Y,W,H);
+      x = X;
+      y = Y;
+      w = W;
+      h = H;
+      redraw();
+    }
+    
+    
+    
+    int handle(int event)
+    {
+      switch(event) {
+        case FL_ACTIVATE:
+          {
+          }
+        case FL_DEACTIVATE:
+          {
+          }
+          return 1;
+        case FL_PUSH:
+          highlight = 1;
+          do_callback();
+          return 1;
+        case FL_DRAG: {
+            int t = Fl::event_inside(this);
+            if (t != highlight) {
+              highlight = t;
+              redraw();
+            }
+          }
+          return 1;
+        case FL_ENTER:
+          mouseOver = true;
+          redraw();
+          return 1;
+        case FL_LEAVE:
+          mouseOver = false;
+          redraw();
+          return 1;
+        case FL_RELEASE:
+          return 1;
+        case FL_SHORTCUT:
+          if ( test_shortcut() )
+          {
+            do_callback();
+            return 1;
+          }
+          return 0;
+        default:
+          return Fl_Widget::handle(event);
+      }
+    }
+};
+
+} // Avtk
+
+#endif // AVTK_UNIT_H
+

src/gmastertrack.hxx

@@ -11,6 +11,7 @@
 #include "avtk/avtk_dial.h"
 #include "avtk/avtk_button.h"
 #include "avtk/avtk_background.h"
+#include "avtk/avtk_clip_selector.h"
 
 
 #include "eventhandler.hxx"
@@ -58,7 +59,10 @@ class GMasterTrack : public Fl_Group
       title( strdup(l) ),
       bg( x, y , w, h, title ),
       
-      tapTempo(x + 25 + 22, y + 75, 44, 44,"Tap"),
+      clipSel(x + 5, y + 26, 140, 279,""),
+      
+      
+      tapTempo(x + 25 + 22, y + 475, 44, 44,"Tap"),
       /*
       button2(x + 5, y + 44, 100, 18,"Play"),
       button3(x + 5, y + 64, 100, 18,"Stop"),
@@ -66,18 +70,21 @@ class GMasterTrack : public Fl_Group
       button5(x +57, y + 84,  48, 18,"+"),
       button6(x + 5, y +104, 18, 18,"6"),
       */
-      metronomeButton(x + 5,y + 24,140,30,"Metro"),
+      metronomeButton(x + 5,y + 424,140,30,"Metro"),
       
-      dial1(x+25-22, y +75, 44, 44, "BPM")
+      dial1(x+25-22, y +475, 44, 44, "BPM"),
       /*
       dial2(x+45, y +155, 24, 24, "B"),
       dial3(x+75, y +155, 24, 24, "C")
       */
+      volume(x+108, y +495, 36, 150, "Vol")
     {
       ID = privateID++;
       
       tapTempo.callback( gmastertrack_button_callback, &ID );
       
+      volume.amplitude( 0.75, 0.8 );
+      
       /*
       button2.callback( gmastertrack_button_callback, &ID );
       button3.callback( gmastertrack_button_callback, &ID );
@@ -104,6 +111,8 @@ class GMasterTrack : public Fl_Group
     
     Avtk::Background bg;
     
+    Avtk::ClipSelector clipSel;
+    
     Avtk::Button tapTempo;
     /*
     Avtk::Button button2;
@@ -120,6 +129,8 @@ class GMasterTrack : public Fl_Group
     Avtk::Dial dial3;
     */
     
+    Avtk::Volume volume;
+    
     static int privateID;
 };
 

src/gunittrack.hxx

@@ -8,6 +8,7 @@
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Slider.H>
 
+#include "avtk/avtk_unit.h"
 #include "avtk/avtk_dial.h"
 #include "avtk/avtk_button.h"
 #include "avtk/avtk_background.h"
@@ -56,35 +57,14 @@ class GUnitTrack : public Fl_Group
     GUnitTrack(int x, int y, int w, int h, const char* l = 0 ) :
       Fl_Group(x, y, w, h),
       title( strdup(l) ),
-      bg( x, y , w, h, title ),
-      
-      tapTempo(x + 25 + 22, y + 75, 44, 44,"Tap"),
-      /*
-      button2(x + 5, y + 44, 100, 18,"Play"),
-      button3(x + 5, y + 64, 100, 18,"Stop"),
-      button4(x + 5, y + 84,  48, 18,"-"),
-      button5(x +57, y + 84,  48, 18,"+"),
-      button6(x + 5, y +104, 18, 18,"6"),
-      */
-      metronomeButton(x + 5,y + 124,140,30,"Metro"),
-      
-      dial1(x+25-22, y +75, 44, 44, "BPM")
-      /*
-      dial2(x+45, y +155, 24, 24, "B"),
-      dial3(x+75, y +155, 24, 24, "C")
-      */
+      bg( x, y , w, h, title )
     {
-      //tapTempo.callback( gmastertrack_button_callback, &ID );
-      
-      /*
-      button2.callback( gmastertrack_button_callback, &ID );
-      button3.callback( gmastertrack_button_callback, &ID );
-      button4.callback( gmastertrack_button_callback, &ID );
-      button5.callback( gmastertrack_button_callback, &ID );
-      button6.callback( gmastertrack_button_callback, &ID );
-      */
-      metronomeButton.callback( gunittrack_button_callback, 0 );
-      dial1.callback( gunittrack_button_callback, 0 );
+      int uh = h / 5;
+      unit[0] = new Avtk::Unit(x + 2, y + uh * 4 - 2, w - 6, h / 5 - 2,"1");
+      unit[1] = new Avtk::Unit(x + 2, y + uh * 3 - 2, w - 6, h / 5 - 2,"2");
+      unit[2] = new Avtk::Unit(x + 2, y + uh * 2 - 2, w - 6, h / 5 - 2,"3");
+      unit[3] = new Avtk::Unit(x + 2, y + uh * 1 - 2, w - 6, h / 5 - 2,"4");
+      unit[4] = new Avtk::Unit(x + 2, y             , w - 6, h / 5 - 2,"5");
       
       end(); // close the group
     }
@@ -100,21 +80,7 @@ class GUnitTrack : public Fl_Group
     
     Avtk::Background bg;
     
-    Avtk::Button tapTempo;
-    /*
-    Avtk::Button button2;
-    Avtk::Button button3;
-    Avtk::Button button4;
-    Avtk::Button button5;
-    Avtk::Button button6;
-    */
-    Avtk::LightButton metronomeButton;
-    
-    Avtk::Dial dial1;
-    /*
-    Avtk::Dial dial2;
-    Avtk::Dial dial3;
-    */
+    Avtk::Unit*      unit[5];
     
 };