change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage

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

6 files changed, 45 insertions, 45 deletions

diff --git a/libs/surfaces/mackie/bcf_surface_generated.cc b/libs/surfaces/mackie/bcf_surface_generated.cc
index f1d8d7ab7b..8d68313b7b 100644
--- a/libs/surfaces/mackie/bcf_surface_generated.cc
+++ b/libs/surfaces/mackie/bcf_surface_generated.cc
@@ -492,10 +492,10 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *button );
 
 	group = groups["display"];
-	button = new Button ( 53, 1, "smpte_beats", *group );
+	button = new Button ( 53, 1, "timecode_beats", *group );
 	buttons[0x35] = button;
 	controls.push_back( button );
-	controls_by_name["smpte_beats"] = button;
+	controls_by_name["timecode_beats"] = button;
 	group->add( *button );
 
 	group = groups["none"];
@@ -903,10 +903,10 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *button );
 
 	group = groups["none"];
-	led = new Led ( 113, 1, "smpte", *group );
+	led = new Led ( 113, 1, "timecode", *group );
 	leds[0x71] = led;
 	controls.push_back( led );
-	controls_by_name["smpte"] = led;
+	controls_by_name["timecode"] = led;
 	group->add( *led );
 
 	group = groups["none"];
@@ -1048,10 +1048,10 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x9035: // smpte_beats
+		case 0x9035: // timecode_beats
 			switch ( bs ) {
-				case press: ls = mbh.smpte_beats_press( button ); break;
-				case release: ls = mbh.smpte_beats_release( button ); break;
+				case press: ls = mbh.timecode_beats_press( button ); break;
+				case release: ls = mbh.timecode_beats_release( button ); break;
 				case neither: break;
 			}
 			break;
diff --git a/libs/surfaces/mackie/mackie_button_handler.cc b/libs/surfaces/mackie/mackie_button_handler.cc
index 2db07beabd..04f2e8e20b 100644
--- a/libs/surfaces/mackie/mackie_button_handler.cc
+++ b/libs/surfaces/mackie/mackie_button_handler.cc
@@ -150,12 +150,12 @@ LedState MackieButtonHandler::name_value_release( Button & button )
 	return default_button_release( button );
 }
 
-LedState MackieButtonHandler::smpte_beats_press( Button & button )
+LedState MackieButtonHandler::timecode_beats_press( Button & button )
 {
 	return default_button_press( button );
 }
 
-LedState MackieButtonHandler::smpte_beats_release( Button & button )
+LedState MackieButtonHandler::timecode_beats_release( Button & button )
 {
 	return default_button_release( button );
 }
diff --git a/libs/surfaces/mackie/mackie_button_handler.h b/libs/surfaces/mackie/mackie_button_handler.h
index 2e8bc649be..a41c7778cc 100644
--- a/libs/surfaces/mackie/mackie_button_handler.h
+++ b/libs/surfaces/mackie/mackie_button_handler.h
@@ -59,8 +59,8 @@ public:
 	virtual LedState name_value_press( Button & );
 	virtual LedState name_value_release( Button & );
 
-	virtual LedState smpte_beats_press( Button & );
-	virtual LedState smpte_beats_release( Button & );
+	virtual LedState timecode_beats_press( Button & );
+	virtual LedState timecode_beats_release( Button & );
 
 	virtual LedState F1_press( Button & );
 	virtual LedState F1_release( Button & );
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index cc33585b62..1a147b84bf 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -316,7 +316,7 @@ void MackieControlProtocol::switch_banks( int initial )
 
 void MackieControlProtocol::zero_all()
 {
-	// TODO turn off SMPTE displays
+	// TODO turn off Timecode displays
 
 	// zero all strips
 	for ( Surface::Strips::iterator it = surface().strips.begin(); it != surface().strips.end(); ++it )
@@ -484,16 +484,16 @@ void MackieControlProtocol::update_led( Mackie::Button & button, Mackie::LedStat
 	}
 }
 
-void MackieControlProtocol::update_smpte_beats_led()
+void MackieControlProtocol::update_timecode_beats_led()
 {
 	switch ( _timecode_type )
 	{
 		case ARDOUR::AnyTime::BBT:
 			update_global_led( "beats", on );
-			update_global_led( "smpte", off );
+			update_global_led( "timecode", off );
 			break;
-		case ARDOUR::AnyTime::SMPTE:
-			update_global_led( "smpte", on );
+		case ARDOUR::AnyTime::Timecode:
+			update_global_led( "timecode", on );
 			update_global_led( "beats", off );
 			break;
 		default:
@@ -557,7 +557,7 @@ void MackieControlProtocol::update_surface()
 		// update global buttons and displays
 		notify_record_state_changed();
 		notify_transport_state_changed();
-		update_smpte_beats_led();
+		update_timecode_beats_led();
 	}
 }
 
@@ -1146,19 +1146,19 @@ string MackieControlProtocol::format_bbt_timecode( nframes_t now_frame )
 	return os.str();
 }
 
-string MackieControlProtocol::format_smpte_timecode( nframes_t now_frame )
+string MackieControlProtocol::format_timecode_timecode( nframes_t now_frame )
 {
-	SMPTE::Time smpte;
-	session->smpte_time( now_frame, smpte );
+	Timecode::Time timecode;
+	session->timecode_time( now_frame, timecode );
 
 	// According to the Logic docs
 	// digits: 888/88/88/888
-	// SMPTE mode: Hours/Minutes/Seconds/Frames
+	// Timecode mode: Hours/Minutes/Seconds/Frames
 	ostringstream os;
-	os << setw(3) << setfill('0') << smpte.hours;
-	os << setw(2) << setfill('0') << smpte.minutes;
-	os << setw(2) << setfill('0') << smpte.seconds;
-	os << setw(3) << setfill('0') << smpte.frames;
+	os << setw(3) << setfill('0') << timecode.hours;
+	os << setw(2) << setfill('0') << timecode.minutes;
+	os << setw(2) << setfill('0') << timecode.seconds;
+	os << setw(3) << setfill('0') << timecode.frames;
 
 	return os.str();
 }
@@ -1176,8 +1176,8 @@ void MackieControlProtocol::update_timecode_display()
 			case ARDOUR::AnyTime::BBT:
 				timecode = format_bbt_timecode( current_frame );
 				break;
-			case ARDOUR::AnyTime::SMPTE:
-				timecode = format_smpte_timecode( current_frame );
+			case ARDOUR::AnyTime::Timecode:
+				timecode = format_timecode_timecode( current_frame );
 				break;
 			default:
 				ostringstream os;
@@ -1712,14 +1712,14 @@ LedState MackieControlProtocol::save_release (Button &)
 	return off;
 }
 
-LedState MackieControlProtocol::smpte_beats_press (Button &)
+LedState MackieControlProtocol::timecode_beats_press (Button &)
 {
 	switch ( _timecode_type )
 	{
 		case ARDOUR::AnyTime::BBT:
-			_timecode_type = ARDOUR::AnyTime::SMPTE;
+			_timecode_type = ARDOUR::AnyTime::Timecode;
 			break;
-		case ARDOUR::AnyTime::SMPTE:
+		case ARDOUR::AnyTime::Timecode:
 			_timecode_type = ARDOUR::AnyTime::BBT;
 			break;
 		default:
@@ -1727,11 +1727,11 @@ LedState MackieControlProtocol::smpte_beats_press (Button &)
 			os << "Unknown Anytime::Type " << _timecode_type;
 			throw runtime_error( os.str() );
 	}
-	update_smpte_beats_led();
+	update_timecode_beats_led();
 	return on;
 }
 
-LedState MackieControlProtocol::smpte_beats_release( Button & )
+LedState MackieControlProtocol::timecode_beats_release( Button & )
 {
 	return off;
 }
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 12aea1c0ae..b77be7d230 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -121,9 +121,9 @@ class MackieControlProtocol
 	void notify_parameter_changed( std::string const & );
    void notify_solo_active_changed( bool );
 
-	/// Turn smpte on and beats off, or vice versa, depending
+	/// Turn timecode on and beats off, or vice versa, depending
 	/// on state of _timecode_type
-	void update_smpte_beats_led();
+	void update_timecode_beats_led();
   
 	/// this is called to generate the midi to send in response to a button press.
 	void update_led( Mackie::Button & button, Mackie::LedState );
@@ -197,8 +197,8 @@ class MackieControlProtocol
 	virtual Mackie::LedState save_press( Mackie::Button & );
 	virtual Mackie::LedState save_release( Mackie::Button & );
 
-	virtual Mackie::LedState smpte_beats_press( Mackie::Button & );
-	virtual Mackie::LedState smpte_beats_release( Mackie::Button & );
+	virtual Mackie::LedState timecode_beats_press( Mackie::Button & );
+	virtual Mackie::LedState timecode_beats_release( Mackie::Button & );
 
 	// jog wheel states
 	virtual Mackie::LedState zoom_press( Mackie::Button & );
@@ -295,7 +295,7 @@ class MackieControlProtocol
 	void update_timecode_display();
 
 	std::string format_bbt_timecode( nframes_t now_frame );
-	std::string format_smpte_timecode( nframes_t now_frame );
+	std::string format_timecode_timecode( nframes_t now_frame );
 	
 	/**
 		notification that the port is about to start it's init sequence.
@@ -365,7 +365,7 @@ class MackieControlProtocol
 	// last written timecode string
 	std::string _timecode_last;
 	
-	// Which timecode are we displaying? BBT or SMPTE
+	// Which timecode are we displaying? BBT or Timecode
 	ARDOUR::AnyTime::Type _timecode_type;
 };
 
diff --git a/libs/surfaces/mackie/mackie_surface_generated.cc b/libs/surfaces/mackie/mackie_surface_generated.cc
index f284a05142..f991d2a972 100644
--- a/libs/surfaces/mackie/mackie_surface_generated.cc
+++ b/libs/surfaces/mackie/mackie_surface_generated.cc
@@ -538,10 +538,10 @@ void Mackie::MackieSurface::init_controls()
 	group->add( *button );
 
 	group = groups["display"];
-	button = new Button ( 53, 1, "smpte_beats", *group );
+	button = new Button ( 53, 1, "timecode_beats", *group );
 	buttons[0x35] = button;
 	controls.push_back( button );
-	controls_by_name["smpte_beats"] = button;
+	controls_by_name["timecode_beats"] = button;
 	group->add( *button );
 
 	group = groups["none"];
@@ -949,10 +949,10 @@ void Mackie::MackieSurface::init_controls()
 	group->add( *button );
 
 	group = groups["none"];
-	led = new Led ( 113, 1, "smpte", *group );
+	led = new Led ( 113, 1, "timecode", *group );
 	leds[0x71] = led;
 	controls.push_back( led );
-	controls_by_name["smpte"] = led;
+	controls_by_name["timecode"] = led;
 	group->add( *led );
 
 	group = groups["none"];
@@ -1094,10 +1094,10 @@ void Mackie::MackieSurface::handle_button( MackieButtonHandler & mbh, ButtonStat
 			}
 			break;
 
-		case 0x9035: // smpte_beats
+		case 0x9035: // timecode_beats
 			switch ( bs ) {
-				case press: ls = mbh.smpte_beats_press( button ); break;
-				case release: ls = mbh.smpte_beats_release( button ); break;
+				case press: ls = mbh.timecode_beats_press( button ); break;
+				case release: ls = mbh.timecode_beats_release( button ); break;
 				case neither: break;
 			}
 			break;