diff --git a/Region.H b/Region.H index f6fa203..f745e50 100644 --- a/Region.H +++ b/Region.H @@ -53,6 +53,16 @@ protected: public: + Track_Widget ( ) + { + _track = NULL; + + _offset = _start = _end = 0; + + _selected = false; + } + + Fl_Group * parent ( void ) const { return _track; } int scroll_x ( void ) const { return timeline.ts_to_x( timeline.xoffset ); } @@ -63,7 +73,7 @@ public: int x ( void ) const { return _offset < timeline.xoffset ? -1 : min( 32767, _track->x() + timeline.ts_to_x( _offset - timeline.xoffset ) ); } // int x ( void ) const { return (short)( _track->x() + timeline.ts_to_x( _offset - timeline.xoffset )); } - int w ( void ) const { return timeline.ts_to_x( _end - _start ); } + virtual int w ( void ) const { return timeline.ts_to_x( _end - _start ); } // int w ( void ) const { return timeline.ts_to_x( (_end - _start) - ( timeline.xoffset - _offset) ); } Fl_Color color ( void ) { return _color; } @@ -80,60 +90,130 @@ public: void start ( nframes_t v ) { _start = v; } nframes_t start ( void ) const { return _start; } - nframes_t length ( void ) const { return _end - _start; } + virtual nframes_t length ( void ) const { return _end - _start; } + /* just draw a simple box */ virtual void draw ( int X, int Y, int W, int H ) { - fl_draw_box( FL_FLAT_BOX, X, Y, W, H, _box_color ); + fl_draw_box( FL_FLAT_BOX, x(), y(), w(), y(), _box_color ); } + /* base hanlde just does basic dragging */ virtual int - handle ( int m ) { return 0; } - - -}; - - -class Tempo : public Track_Widget -{ - float _tempo; - - void - draw ( int X, int Y, int W, int H ) + handle ( int m ) { + static int ox, oy; + int X = Fl::event_x(); + int Y = Fl::event_y(); + switch ( m ) + { + case FL_PUSH: + { + ox = x() - X; + oy = y() - Y; + return 1; + } + case FL_RELEASE: + fl_cursor( FL_CURSOR_DEFAULT ); + return 1; + case FL_DRAG: + { + if ( ox + X >= _track->x() ) + { + int nx = ox + X; + _offset = timeline.x_to_ts( nx ) + timeline.xoffset; + + _track->snap( this ); + } + + _track->redraw(); + fl_cursor( FL_CURSOR_MOVE ); + + return 1; + } + default: + return 0; + } } - }; -class Region : public Track_Widget -{ - Clip *_clip; /* clip this region represents */ + class Tempo_Point : public Track_Widget + { + float _tempo; - float _scale; /* amplitude adjustment */ + static Fl_Boxtype box ( void ) { return FL_UP_BOX; } - static Fl_Boxtype _box; - static Fl_Color _selection_color; - static Fl_Color selection_color ( void ) { return _selection_color; } - static void selection_color ( Fl_Color v ) { _selection_color = v; } - static Fl_Boxtype box ( void ) { return _box; } + public: - enum trim_e { NO, LEFT, RIGHT }; - void trim ( enum trim_e t, int X ); - void init ( void ); + Tempo_Point ( ) + { + _tempo = 120; + _offset = 0; + _start = 0; + _end = 300; + } -public: + Tempo_Point ( nframes_t when, float bpm ) + { + _tempo = bpm; + _offset = when; + _start = 0; + _end = 300; + } - Region ( const Region & rhs ); - Region ( Clip *c ); + int w ( void ) const { return 10; } + nframes_t length ( void ) const { return timeline.x_to_ts( w() ); } - int handle ( int m ); - void draw ( int X, int Y, int W, int H ); - void resize ( void ); + void + draw ( int X, int Y, int W, int H ) + { + if ( x() < 0 ) + return; -}; + fl_draw_box( box(), x(), Y, w(), H, _box_color ); + + char pat[40]; + + snprintf( pat, 40, "%.1f", _tempo ); + + fl_font( FL_HELVETICA, 14 ); + fl_color( FL_YELLOW ); + fl_draw( pat, x() + w(), Y, w(), h(), FL_ALIGN_LEFT ); + + } + + }; + + class Region : public Track_Widget + { + + Clip *_clip; /* clip this region represents */ + + float _scale; /* amplitude adjustment */ + + static Fl_Boxtype _box; + static Fl_Color _selection_color; + static Fl_Color selection_color ( void ) { return _selection_color; } + static void selection_color ( Fl_Color v ) { _selection_color = v; } + static Fl_Boxtype box ( void ) { return _box; } + + enum trim_e { NO, LEFT, RIGHT }; + void trim ( enum trim_e t, int X ); + void init ( void ); + + public: + + Region ( const Region & rhs ); + Region ( Clip *c ); + + int handle ( int m ); + void draw ( int X, int Y, int W, int H ); + void resize ( void ); + + }; diff --git a/main.C b/main.C index 4f8e968..eb6842b 100644 --- a/main.C +++ b/main.C @@ -132,6 +132,17 @@ main ( int argc, char **argv ) // Fl_Group *pack = new Fl_Group( 0, 0, 5000, 600 ); + { + Track *tempo_track = new Track( 0, 0, 800, 24 ); + + tempo_track->label( "tempo map" ); + tempo_track->add( new Tempo_Point ); + + tempo_track->add( new Tempo_Point( 56000, 250 ) ); + + tempo_track->end(); + } + Track *track1 = new Track( 40, 0, 800, 100 ); // pack->type( Fl_Pack::VERTICAL ); @@ -170,6 +181,7 @@ main ( int argc, char **argv ) track2->add( wave2 ); + track2->end(); track1->next( track2 );