diff --git a/Region.C b/Region.C index 62b1260..23c91b0 100644 --- a/Region.C +++ b/Region.C @@ -94,8 +94,6 @@ Region::trim ( enum trim_e t, int X ) _start += td; _offset += td; - -// resize(); break; } case RIGHT: @@ -104,9 +102,6 @@ Region::trim ( enum trim_e t, int X ) long td = timeline.x_to_ts( d ); _end -= td; - -// resize(); - break; } default: @@ -115,8 +110,6 @@ Region::trim ( enum trim_e t, int X ) } _track->redraw(); -// redraw(); -// parent()->redraw(); } @@ -171,12 +164,16 @@ Region::handle ( int m ) // Fl::local_grab( this ); } + + if ( Fl::event_button() == 2 ) + { + normalize(); + _track->redraw(); + } + ret = Track_Widget::handle( m ); return ret | 1; -/* if ( Fl::event_button() == 2 ) */ -/* normalize(); */ - } break; } @@ -270,23 +267,6 @@ Region::handle ( int m ) } -/** must be called whenever zoom is adjusted */ -void -Region::resize ( void ) -{ - int X = timeline.ts_to_x( _offset ); - - assert( _end >= _start ); - - int W = timeline.ts_to_x( _end - _start ); - - printf( "%dx%d\n", X, W ); - -// if ( W ) -// Fl_Widget::resize( X, y(), W, h() ); -} - -int measure = 40; /* Draw (part of) region. OX is pixel offset from start of timeline, X Y W and H are the portion of the widget to draw (arrived at by @@ -366,3 +346,12 @@ Region::draw ( int X, int Y, int W, int H ) } + + +void +Region::normalize ( void ) +{ + printf( "normalize: start=%lu end=%lu\n", _start, _end ); + + _scale = _clip->peaks()->normalization_factor( _start, _end ); +} diff --git a/Region.H b/Region.H index d6d51a8..228c370 100644 --- a/Region.H +++ b/Region.H @@ -224,4 +224,5 @@ public: void draw ( int X, int Y, int W, int H ); void resize ( void ); + void normalize ( void ); }; diff --git a/Waveform.C b/Waveform.C index 7dd4423..537ab4d 100644 --- a/Waveform.C +++ b/Waveform.C @@ -114,13 +114,3 @@ draw_waveform ( int X, int Y, int W, int H, Clip *_clip, nframes_t _start, nfram fl_pop_clip(); } - -/* void */ -/* Waveform::normalize ( void ) */ -/* { */ -/* printf( "normalize: start=%lu end=%lu\n", _start, _end ); */ - -/* _scale = _clip->peaks()->normalization_factor( _start, _end ); */ - -/* redraw(); */ -/* } */