ardour/livetrax
13
0
Fork 0
Code

Fix SCons build.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5112 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-05-25 17:56:34 +00:00
parent 889951245d
commit 139d621103
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/SConscript
View File

@ -224,6 +224,7 @@ port_matrix_row_labels.cc
processor_box.cc
prompter.cc
public_editor.cc
rc_option_editor.cc
region_gain_line.cc
region_selection.cc
region_view.cc
@ -237,6 +238,7 @@ selection.cc
send_ui.cc
session_import_dialog.cc
session_metadata_dialog.cc
session_option_editor.cc
sfdb_ui.cc
simpleline.cc
simplerect.cc

2
libs/ardour/SConscript
View File

@ -65,6 +65,7 @@ control_protocol_search_path.cc
crossfade.cc
cycle_timer.cc
default_click.cc
delivery.cc
directory_names.cc
diskstream.cc
element_import_handler.cc
@ -145,6 +146,7 @@ session.cc
session_butler.cc
session_click.cc
session_command.cc
session_configuration.cc
session_directory.cc
session_events.cc
session_export.cc

28
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -571,6 +571,7 @@ void MackieControlProtocol::connect_session_signals()
connections_back = session->TransportStateChange.connect( ( mem_fun (*this, &MackieControlProtocol::notify_transport_state_changed) ) );
// receive punch-in and punch-out
connections_back = Config->ParameterChanged.connect( ( mem_fun (*this, &MackieControlProtocol::notify_parameter_changed) ) );
session->config.ParameterChanged.connect ( ( mem_fun (*this, &MackieControlProtocol::notify_parameter_changed) ) );
// receive rude solo changed
connections_back = session->SoloActive.connect( ( mem_fun (*this, &MackieControlProtocol::notify_solo_active_changed) ) );
@ -1364,26 +1365,26 @@ LedState MackieControlProtocol::loop_release( Button & button )
LedState MackieControlProtocol::punch_in_press( Button & button )
{
bool state = !Config->get_punch_in();
Config->set_punch_in( state );
bool state = !session->config.get_punch_in();
session->config.set_punch_in( state );
return state;
}
LedState MackieControlProtocol::punch_in_release( Button & button )
{
return Config->get_punch_in();
return session->config.get_punch_in();
}
LedState MackieControlProtocol::punch_out_press( Button & button )
{
bool state = !Config->get_punch_out();
Config->set_punch_out( state );
bool state = !session->config.get_punch_out();
session->config.set_punch_out( state );
return state;
}
LedState MackieControlProtocol::punch_out_release( Button & button )
{
return Config->get_punch_out();
return session->config.get_punch_out();
}
LedState MackieControlProtocol::home_press( Button & button )
@ -1436,25 +1437,24 @@ LedState MackieControlProtocol::global_solo_release( Button & button )
// Session signals
///////////////////////////////////////////
void MackieControlProtocol::notify_parameter_changed( const char * name_str )
void MackieControlProtocol::notify_parameter_changed (std::string const & p)
{
string name( name_str );
if ( name == "punch-in" )
if ( p == "punch-in" )
{
update_global_button( "punch_in", Config->get_punch_in() );
update_global_button( "punch_in", session->config.get_punch_in() );
}
else if ( name == "punch-out" )
else if ( p == "punch-out" )
{
update_global_button( "punch_out", Config->get_punch_out() );
update_global_button( "punch_out", session->config.get_punch_out() );
}
else if ( name == "clicking" )
else if ( p == "clicking" )
{
update_global_button( "clicking", Config->get_clicking() );
}
else
{
#ifdef DEBUG
cout << "parameter changed: " << name << endl;
cout << "parameter changed: " << p << endl;
#endif
}
}

2
libs/surfaces/mackie/mackie_control_protocol.h
View File

@ -118,7 +118,7 @@ class MackieControlProtocol
void notify_record_state_changed();
void notify_transport_state_changed();
// mainly to pick up punch-in and punch-out
void notify_parameter_changed( const char * );
void notify_parameter_changed( std::string const & );
void notify_solo_active_changed( bool );
/// Turn smpte on and beats off, or vice versa, depending