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

Timeline: Mark ports as Terminal.

This commit is contained in:
Jonathan Moore Liles 2013-06-26 23:03:17 -07:00
parent 1a9741cb7f
commit a958276b06
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nonlib/JACK/Port.C
View File

@ -39,6 +39,7 @@ namespace JACK
Port::Port ( const Port &rhs ) Port::Port ( const Port &rhs )
{ {
_terminal = rhs._terminal;
_freezer = rhs._freezer; _freezer = rhs._freezer;
_client = rhs._client; _client = rhs._client;
_port = rhs._port; _port = rhs._port;
@ -52,6 +53,7 @@ namespace JACK
/* nframes is the number of frames to buffer */ /* nframes is the number of frames to buffer */
Port::Port ( JACK::Client *client, jack_port_t *port ) Port::Port ( JACK::Client *client, jack_port_t *port )
{ {
_terminal = 0;
_freezer = NULL; _freezer = NULL;
_client = client; _client = client;
_port = port; _port = port;
@ -66,6 +68,7 @@ namespace JACK
Port::Port ( JACK::Client *client, const char *name, direction_e dir, type_e type ) Port::Port ( JACK::Client *client, const char *name, direction_e dir, type_e type )
{ {
_terminal = 0;
_name = NULL; _name = NULL;
_freezer = NULL; _freezer = NULL;
_client = client; _client = client;
@ -77,6 +80,7 @@ namespace JACK
Port::Port ( JACK::Client *client, direction_e dir, type_e type, const char *base, int n, const char *subtype ) Port::Port ( JACK::Client *client, direction_e dir, type_e type, const char *base, int n, const char *subtype )
{ {
_terminal = 0;
_name = NULL; _name = NULL;
_freezer = NULL; _freezer = NULL;
_client = client; _client = client;
@ -88,6 +92,7 @@ namespace JACK
Port::Port ( JACK::Client *client, direction_e dir, type_e type, int n, const char *subtype ) Port::Port ( JACK::Client *client, direction_e dir, type_e type, int n, const char *subtype )
{ {
_terminal = 0;
_name = NULL; _name = NULL;
_freezer = NULL; _freezer = NULL;
_client = client; _client = client;
@ -166,7 +171,7 @@ namespace JACK
{ {
_port = jack_port_register( _client->jack_client(), _name, _port = jack_port_register( _client->jack_client(), _name,
_type == Audio ? JACK_DEFAULT_AUDIO_TYPE : JACK_DEFAULT_MIDI_TYPE, _type == Audio ? JACK_DEFAULT_AUDIO_TYPE : JACK_DEFAULT_MIDI_TYPE,
_direction == Output ? JackPortIsOutput : JackPortIsInput, _direction == Output ? JackPortIsOutput : JackPortIsInput | _terminal ? JackPortIsTerminal : 0,
0 ); 0 );
if ( ! _port ) if ( ! _port )

2
nonlib/JACK/Port.H
View File

@ -69,6 +69,7 @@ namespace JACK
nframes_t latency ( void ) const; nframes_t latency ( void ) const;
void latency ( nframes_t frames ); void latency ( nframes_t frames );
void terminal ( bool b ) { _terminal = b; }
bool activate ( void ); bool activate ( void );
void shutdown ( void ); void shutdown ( void );
void write ( sample_t *buf, nframes_t nframes ); void write ( sample_t *buf, nframes_t nframes );
@ -89,6 +90,7 @@ namespace JACK
direction_e _direction; direction_e _direction;
type_e _type; type_e _type;
bool _terminal;
bool activate ( const char *name, direction_e dir ); bool activate ( const char *name, direction_e dir );

1
timeline/src/Control_Sequence.C
View File

@ -172,6 +172,7 @@ Control_Sequence::update_port_name ( void )
if ( ! _output ) if ( ! _output )
{ {
_output = new JACK::Port( engine, JACK::Port::Output, JACK::Port::Audio, track()->name(), track()->ncontrols(), "cv" ); _output = new JACK::Port( engine, JACK::Port::Output, JACK::Port::Audio, track()->name(), track()->ncontrols(), "cv" );
_output->terminal( true );
needs_activation = true; needs_activation = true;
} }

4
timeline/src/Engine/Track.C
View File

@ -88,6 +88,8 @@ Track::configure_outputs ( int n )
{ {
JACK::Port p( engine, JACK::Port::Output, JACK::Port::Audio, name(), i ); JACK::Port p( engine, JACK::Port::Output, JACK::Port::Audio, name(), i );
p.terminal(true);
if ( !p.activate() ) if ( !p.activate() )
{ {
FATAL( "could not created output port!"); FATAL( "could not created output port!");
@ -140,6 +142,8 @@ Track::configure_inputs ( int n )
for ( int i = on; i < n; ++i ) for ( int i = on; i < n; ++i )
{ {
JACK::Port p( engine, JACK::Port::Input, JACK::Port::Audio, name(), i ); JACK::Port p( engine, JACK::Port::Input, JACK::Port::Audio, name(), i );
p.terminal( true );
if ( !p.activate() ) if ( !p.activate() )
{ {