From 311daf498c97da44af05db04777bceed393921f4 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Mon, 28 Apr 2008 14:04:16 -0500 Subject: [PATCH] Oops. Can't pass a pointer to an element of std::vector! --- Timeline/Control_Sequence.C | 1 + Timeline/Track.C | 6 +++--- Timeline/Track.H | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Timeline/Control_Sequence.C b/Timeline/Control_Sequence.C index 05ebdaf..906f989 100644 --- a/Timeline/Control_Sequence.C +++ b/Timeline/Control_Sequence.C @@ -54,6 +54,7 @@ Control_Sequence::init ( void ) { _track = NULL; _highlighted = false; + _output = NULL; color( fl_darker( FL_YELLOW ) ); } diff --git a/Timeline/Track.C b/Timeline/Track.C index b585cdf..122427c 100644 --- a/Timeline/Track.C +++ b/Timeline/Track.C @@ -357,9 +357,9 @@ Track::add ( Control_Sequence *t ) control->add( t ); - control_out.push_back( Port( Port::Output, name(), control_out.size(), "cv" ) ); + control_out.push_back( new Port( Port::Output, name(), control_out.size(), "cv" ) ); - t->output( &control_out.back() ); + t->output( control_out.back() ); resize(); } @@ -517,7 +517,7 @@ Track::update_port_names ( void ) input[ i ].name( name(), i ); for ( int i = 0; i < control_out.size(); ++i ) - control_out[ i ].name( name(), i, "cv" ); + control_out[ i ]->name( name(), i, "cv" ); /* /\* tell any attached control sequences to do the same *\/ */ diff --git a/Timeline/Track.H b/Timeline/Track.H index 3ba5f02..da76c25 100644 --- a/Timeline/Track.H +++ b/Timeline/Track.H @@ -109,7 +109,7 @@ public: vector input; /* input ports... */ vector output; /* output ports... */ - vector control_out; /* control ports... */ + vector control_out; /* control ports... */ Playback_DS *playback_ds;