Add control (automation) tracks.

Control_Point.H

@@ -0,0 +1,165 @@
+
+/*******************************************************************************/
+/* Copyright (C) 2008 Jonathan Moore Liles                                     */
+/*                                                                             */
+/* 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; see the file COPYING.  If not,write to the Free Software */
+/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/*******************************************************************************/
+
+#pragma once
+
+#include "Track_Point.H"
+
+class Control_Point : public Track_Point
+{
+    float _y;
+
+/*     void */
+/*     _make_label ( void ) */
+/*         { */
+/*             if ( ! _label ) */
+/*                 _label = new char[40]; */
+
+/*             snprintf( _label, 40, "%.1f", _y ); */
+/*         } */
+
+protected:
+
+    const char *class_name ( void ) { return "Control_Point"; }
+
+    char ** get ( void )
+        {
+            char **sa = (char**)malloc( sizeof( char* ) * 4 );
+
+            int i = 0;
+
+            asprintf( &sa[i++], ":track 0x%X", _track ? _track->id() : 0 );
+            asprintf( &sa[i++], ":x %lu", _offset );
+            asprintf( &sa[i++], ":y %.2f", _y );
+
+            sa[i] = NULL;
+
+            return sa;
+        }
+
+    void
+    set ( char **sa )
+        {
+            for ( int i = 0; sa[i]; ++i )
+            {
+                char *s = sa[i];
+
+                strtok( s, " " );
+
+                char *v = s + strlen( s ) + 1;
+
+                if ( ! strcmp( s, ":x" ) )
+                    _offset = atol( v );
+                else
+                    if ( ! strcmp( s, ":control" ) )
+                        _y = atof( v );
+                    else
+                        if ( ! strcmp( s, ":track" ) )
+                        {
+                            int i;
+                            sscanf( v, "%X", &i );
+                            Track *t = (Track*)Loggable::find( i );
+
+                            assert( t );
+
+                            t->add( this );
+                        }
+
+
+                free( s );
+            }
+
+            free( sa );
+
+            timeline->redraw();
+
+            //          _make_label();
+        }
+
+    Control_Point ( )
+        {
+
+        }
+
+public:
+
+    /* for loggable */
+    static Loggable *
+    create ( char **sa )
+        {
+            Control_Point *r = new Control_Point;
+
+            r->set( sa );
+
+            return (Loggable *)r;
+        }
+
+
+    Control_Point ( nframes_t when, float y )
+        {
+            _y = y;
+            _offset = when;
+
+//            _make_label();
+
+            log_create();
+        }
+
+    ~Control_Point ( )
+        {
+//            if ( _label ) delete[] _label;
+            log_destroy();
+        }
+
+    float control ( void ) const { return _y; }
+    void control ( float v ) { _y = v; }
+
+    int
+    handle ( int m )
+        {
+            int r = Track_Widget::handle( m );
+
+            if ( m == FL_RELEASE )
+            {
+                _track->sort();
+                timeline->redraw();
+            }
+            return r;
+        }
+
+    int
+    y ( void ) const
+        {
+            return _track->y() + ((float)h() * _y);
+        }
+
+    void
+    draw_box ( int X, int Y, int W, int H )
+        {
+//            Track_Widget::draw_box( x(), y(), w(), h() );
+        }
+
+     void
+    draw ( int X, int Y, int W, int H )
+        {
+            fl_color( FL_RED );
+            fl_draw_box( FL_UP_BOX, x(), y(), 6, 6, FL_RED );
+//            fl_rectf( x(), y() + ry, 6, 6 );
+        }
+};

Control_Track.H

@@ -0,0 +1,97 @@
+
+/*******************************************************************************/
+/* Copyright (C) 2008 Jonathan Moore Liles                                     */
+/*                                                                             */
+/* 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; see the file COPYING.  If not,write to the Free Software */
+/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/*******************************************************************************/
+
+#pragma once
+
+#include "Track.H"
+#include "Control_Point.H"
+
+class Control_Track : public Track
+{
+
+public:
+
+    Control_Track ( int X, int Y, int W, int H ) : Track( X, Y, W, H )
+        {
+        }
+
+    void
+    draw ( void )
+        {
+
+            if ( ! fl_not_clipped( x(), y(), w(), h() ) )
+                return;
+
+            fl_push_clip( x(), y(), w(), h() );
+
+            Fl_Group::draw();
+
+            timeline->draw_measure_lines( x(), y(), w(), h(), color() );
+
+            int X, Y, W, H;
+
+            fl_clip_box( x(), y(), w(), h(), X, Y, W, H );
+
+            fl_line_style( FL_SOLID, 2 );
+
+            fl_color( FL_RED );
+
+            fl_begin_line();
+
+            for ( list <Track_Widget *>::const_iterator r = _widgets.begin();  r != _widgets.end(); r++ )
+                fl_vertex( (*r)->x(), (*r)->y() );
+
+            fl_end_line();
+
+            fl_line_style( FL_SOLID, 0 );
+
+            for ( list <Track_Widget *>::const_iterator r = _widgets.begin();  r != _widgets.end(); r++ )
+                (*r)->draw( X, Y, W, H );
+
+            fl_pop_clip();
+        }
+
+    int
+    handle ( int m )
+        {
+            int r = Track::handle( m );
+
+//            if ( r )
+//                return r;
+
+            switch ( m )
+            {
+                case FL_PUSH:
+                {
+                    if ( Fl::event_button1() )
+                    {
+                        Control_Point *r = new Control_Point( timeline->xoffset + timeline->x_to_ts( Fl::event_x() - x() ), (float)(Fl::event_y() - y()) / h() );
+
+                        add( r );
+                    }
+
+                    return 0;
+                }
+                default:
+                    return 0;
+            }
+
+            return r;
+        }
+};

Timeline.C

@@ -22,7 +22,7 @@
 #include "Tempo_Track.H"
 #include "Time_Track.H"
 #include "Audio_Track.H"
-
+#include "Control_Track.H"
 #include <FL/Fl_Scrollbar.H>
 
 #include "Track_Header.H"
@@ -42,7 +42,9 @@ Timeline::cb_scroll ( Fl_Widget *w )
 
         yposition( vscroll->value() );
 
-        vscroll->value( vscroll->value(), 30, 0, min( tracks->h(),  tracks->h() - h() - rulers->h() ) );
+        int rh = h() - rulers->h();
+
+        vscroll->value( vscroll->value(), 30, 0, max( tracks->h() - rh, rh) );
     }
     else
     {
@@ -150,7 +152,7 @@ Timeline::Timeline ( int X, int Y, int W, int H, const char* L ) : Fl_Overlay_Wi
             o->spacing( 0 );
 
             Track *l = NULL;
-            for ( int i = 16; i--;  )
+            for ( int i = 8; i--;  )
             {
 //                Track_Header *t = new Track_Header( 0, 0, W, 75 );
                 Track_Header *t = new Track_Header( 0, 0, W, 30 );
@@ -165,6 +167,14 @@ Timeline::Timeline ( int X, int Y, int W, int H, const char* L ) : Fl_Overlay_Wi
                 t->color( (Fl_Color)rand() );
             }
 
+            {
+                Track_Header *t = new Track_Header( 0, 0, W, 30 );
+                Track *o = new Control_Track( 0, 0, 1, 100 );
+                o->color( FL_BLUE );
+                t->color( FL_RED );
+                t->track( o );
+            }
+
             tracks = o;
             o->end();
         }

Track.H

@@ -109,7 +109,6 @@ public:
 
     void sort ( void );
 
-    void draw ( void );
     void remove ( Track_Widget *r );
     void add ( Track_Widget *r );
 
@@ -128,5 +127,6 @@ public:
 
     virtual void snap ( Track_Widget *r );
     virtual int handle ( int m );
+    virtual void draw ( void );
 
 };

Track_Point.H

@@ -48,7 +48,7 @@ public:
         {
         }
 
-    void
+    virtual void
     draw ( int X, int Y, int W, int H )
         {
             Track_Widget::draw( x(), Y, w(), H );

Track_Widget.H

@@ -144,7 +144,7 @@ public:
     int scroll_x ( void ) const { return timeline->ts_to_x( timeline->xoffset ); }
     nframes_t scroll_ts ( void ) const { return timeline->xoffset; }
 
-    int y ( void ) const { return _track->y(); }
+    virtual int y ( void ) const { return _track->y(); }
     int h ( void ) const { return _track->h(); }
 
     int x ( void ) const { return _offset < timeline->xoffset ? _track->x() - 1 : min( 32767, _track->x() + timeline->ts_to_x( _offset - timeline->xoffset ) ); }

main.C

@@ -45,6 +45,7 @@
 #include "Timeline.H"
 #include "Tempo_Track.H"
 #include "Time_Track.H"
+#include "Control_Track.H"
 
 #include "Loggable.H"
 #include "Track_Header.H"
@@ -70,6 +71,7 @@ main ( int argc, char **argv )
     Loggable::register_create( "Region",        &Region::create        );
     Loggable::register_create( "Tempo_Point",   &Tempo_Point::create   );
     Loggable::register_create( "Time_Point",    &Time_Point::create    );
+    Loggable::register_create( "Control_Point", &Control_Point::create );
     Loggable::register_create( "Track_Header",  &Track_Header::create  );
 
     timeline = new Timeline( 0, 24, main_window->w(), main_window->h() - 24, "Timeline" );