Fix SCons build.

git-svn-id: svn://localhost/ardour2/branches/3.0@5112 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 19 insertions, 15 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index ff940c49ca..ba175b782b 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -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
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index f79b20c32f..edba74d117 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -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
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 9df7b5260e..6902b3406d 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -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
 	}
 }
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 456fb49485..7d8a6f2fd0 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -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