globally change all use of "frame" to refer to audio into "sample".

Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible

1 files changed, 8 insertions, 8 deletions

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 8a447beecf..33fd27f323 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -613,7 +613,7 @@ Editor::register_actions ()
 
 	xjadeo_ontop_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-ontop"), _("Always on Top"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 1)));
 	xjadeo_timecode_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 2)));
-	xjadeo_frame_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-frame"), _("Frame number"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 3)));
+	xjadeo_sample_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-frame"), _("Frame number"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 3)));
 	xjadeo_osdbg_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-osdbg"), _("Timecode Background"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 4)));
 	xjadeo_fullscreen_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-fullscreen"), _("Fullscreen"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 5)));
 	xjadeo_letterbox_action = Glib::RefPtr<ToggleAction>::cast_static (myactions.register_toggle_action (editor_actions, X_("toggle-vmon-letterbox"), _("Letterbox"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 6)));
@@ -654,8 +654,8 @@ Editor::register_actions ()
 	xjadeo_ontop_action->set_sensitive (false);
 	xjadeo_timecode_action->set_active (false);
 	xjadeo_timecode_action->set_sensitive (false);
-	xjadeo_frame_action->set_active (false);
-	xjadeo_frame_action->set_sensitive (false);
+	xjadeo_sample_action->set_active (false);
+	xjadeo_sample_action->set_sensitive (false);
 	xjadeo_osdbg_action->set_active (false);
 	xjadeo_osdbg_action->set_sensitive (false);
 	xjadeo_fullscreen_action->set_active (false);
@@ -873,7 +873,7 @@ Editor::toggle_xjadeo_proc (int state)
 	bool onoff = xjadeo_proc_action->get_active();
 	xjadeo_ontop_action->set_sensitive(onoff);
 	xjadeo_timecode_action->set_sensitive(onoff);
-	xjadeo_frame_action->set_sensitive(onoff);
+	xjadeo_sample_action->set_sensitive(onoff);
 	xjadeo_osdbg_action->set_sensitive(onoff);
 	xjadeo_fullscreen_action->set_sensitive(onoff);
 	xjadeo_letterbox_action->set_sensitive(onoff);
@@ -902,7 +902,7 @@ Editor::toggle_xjadeo_viewoption (int what, int state)
 			action = xjadeo_timecode_action;
 			break;
 		case 3:
-			action = xjadeo_frame_action;
+			action = xjadeo_sample_action;
 			break;
 		case 4:
 			action = xjadeo_osdbg_action;
@@ -944,7 +944,7 @@ Editor::set_xjadeo_viewoption (int what)
 			action = xjadeo_timecode_action;
 			break;
 		case 3:
-			action = xjadeo_frame_action;
+			action = xjadeo_sample_action;
 			break;
 		case 4:
 			action = xjadeo_osdbg_action;
@@ -981,14 +981,14 @@ Editor::toggle_measure_visibility ()
 void
 Editor::edit_current_meter ()
 {
-	ARDOUR::MeterSection* ms = const_cast<ARDOUR::MeterSection*>(&_session->tempo_map().meter_section_at_frame (ARDOUR_UI::instance()->primary_clock->absolute_time()));
+	ARDOUR::MeterSection* ms = const_cast<ARDOUR::MeterSection*>(&_session->tempo_map().meter_section_at_sample (ARDOUR_UI::instance()->primary_clock->absolute_time()));
 	edit_meter_section (ms);
 }
 
 void
 Editor::edit_current_tempo ()
 {
-	ARDOUR::TempoSection* ts = const_cast<ARDOUR::TempoSection*>(&_session->tempo_map().tempo_section_at_frame (ARDOUR_UI::instance()->primary_clock->absolute_time()));
+	ARDOUR::TempoSection* ts = const_cast<ARDOUR::TempoSection*>(&_session->tempo_map().tempo_section_at_sample (ARDOUR_UI::instance()->primary_clock->absolute_time()));
 	edit_tempo_section (ts);
 }