Browse Source

Oops. Can't pass a pointer to an element of std::vector!

tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
311daf498c
3 changed files with 5 additions and 4 deletions
  1. +1
    -0
      Timeline/Control_Sequence.C
  2. +3
    -3
      Timeline/Track.C
  3. +1
    -1
      Timeline/Track.H

+ 1
- 0
Timeline/Control_Sequence.C View File

@@ -54,6 +54,7 @@ Control_Sequence::init ( void )
{
_track = NULL;
_highlighted = false;
_output = NULL;

color( fl_darker( FL_YELLOW ) );
}


+ 3
- 3
Timeline/Track.C View File

@@ -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 *\/ */


+ 1
- 1
Timeline/Track.H View File

@@ -109,7 +109,7 @@ public:

vector<Port> input; /* input ports... */
vector<Port> output; /* output ports... */
vector<Port> control_out; /* control ports... */
vector<Port*> control_out; /* control ports... */


Playback_DS *playback_ds;


Loading…
Cancel
Save