mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timeline: Fix insertion of control points and copying of all sequence widgets.

This commit is contained in:
Jonathan Moore Liles 2013-03-17 07:05:11 -07:00
parent f0757a09c8
commit 7a5425beca
7 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
timeline/src/Annotation_Point.H
View File

@ -69,12 +69,14 @@ public:
Annotation_Point ( Sequence *sequence, nframes_t when, const char *label ) Annotation_Point ( Sequence *sequence, nframes_t when, const char *label )
{ {
_sequence = sequence; _sequence = NULL;
_r->start = when; _r->start = when;
_label = strdup( label ); _label = strdup( label );
sequence->add( this );
log_create(); log_create();
} }

4
timeline/src/Annotation_Region.C
View File

@ -53,7 +53,7 @@ Annotation_Region::set ( Log_Entry &e )
Annotation_Region::Annotation_Region ( Sequence *sequence, nframes_t when, const char *label ) Annotation_Region::Annotation_Region ( Sequence *sequence, nframes_t when, const char *label )
{ {
_sequence = sequence; _sequence = NULL;
_r->start = when; _r->start = when;
@ -62,6 +62,8 @@ Annotation_Region::Annotation_Region ( Sequence *sequence, nframes_t when, const
_label = strdup( label ); _label = strdup( label );
sequence->add( this );
log_create(); log_create();
} }

4
timeline/src/Annotation_Sequence.H
View File

@ -107,15 +107,13 @@ public:
if ( Fl::event_button1() ) if ( Fl::event_button1() )
{ {
add( new Annotation_Point( this, x_to_offset( Fl::event_x() - drawable_x() ), "mark" ) ); new Annotation_Point( this, x_to_offset( Fl::event_x() - drawable_x() ), "mark" );
redraw(); redraw();
} }
if ( Fl::event_button3() && Fl::event_shift() ) if ( Fl::event_button3() && Fl::event_shift() )
{ {
Annotation_Region *r = new Annotation_Region( this, x_to_offset( Fl::event_x() - drawable_x() ), "mark" ); Annotation_Region *r = new Annotation_Region( this, x_to_offset( Fl::event_x() - drawable_x() ), "mark" );
add( r );
Sequence_Widget::pushed( r ); Sequence_Widget::pushed( r );
r->handle( m ); r->handle( m );

4
timeline/src/Control_Point.C
View File

@ -25,11 +25,13 @@
Control_Point::Control_Point ( Sequence *t, nframes_t when, float y ) Control_Point::Control_Point ( Sequence *t, nframes_t when, float y )
{ {
_sequence = t; _sequence = NULL;
_y = y; _y = y;
_r->start = when; _r->start = when;
_box_color = FL_WHITE; _box_color = FL_WHITE;
t->add( this );
log_create(); log_create();
} }

6
timeline/src/Control_Sequence.C
View File

@ -756,11 +756,9 @@ Control_Sequence::handle ( int m )
/* insert new control point */ /* insert new control point */
timeline->wrlock(); timeline->wrlock();
Control_Point *r = new Control_Point( this, timeline->xoffset + timeline->x_to_ts( Fl::event_x() - drawable_x() ), (float)(Fl::event_y() - y()) / h() ); new Control_Point( this, timeline->xoffset + timeline->x_to_ts( Fl::event_x() - drawable_x() ), (float)(Fl::event_y() - y()) / h() );
add( r ); timeline->unlock();
timeline->unlock();
return 1; return 1;
} }

4
timeline/src/Cursor_Region.C
View File

@ -89,8 +89,8 @@ Cursor_Region::Cursor_Region ( nframes_t when, nframes_t length, const char *typ
Cursor_Region::Cursor_Region ( const Cursor_Region &rhs ) : Sequence_Region( rhs ) Cursor_Region::Cursor_Region ( const Cursor_Region &rhs ) : Sequence_Region( rhs )
{ {
_label = strdup( rhs._label ); _label = rhs._label ? strdup( rhs._label ) : NULL;
_type = strdup( rhs._type ); _type = rhs._type ? strdup( rhs._type ) : NULL;
log_create(); log_create();
} }

6
timeline/src/Sequence_Widget.C
View File

@ -62,7 +62,6 @@ Sequence_Widget::Sequence_Widget ( const Sequence_Widget &rhs ) : Loggable( rhs
else else
_label = 0; _label = 0;
_sequence = rhs._sequence;
_range = rhs._range; _range = rhs._range;
_dragging_range = rhs._dragging_range; _dragging_range = rhs._dragging_range;
@ -70,6 +69,11 @@ Sequence_Widget::Sequence_Widget ( const Sequence_Widget &rhs ) : Loggable( rhs
_color = rhs._color; _color = rhs._color;
_box_color = rhs._box_color; _box_color = rhs._box_color;
_sequence = NULL;
if ( rhs._sequence )
rhs._sequence->add( this );
}; };
const Sequence_Widget & const Sequence_Widget &