diff options
-rw-r--r-- | gtk2_ardour/ardour.menus.in | 4 | ||||
-rw-r--r-- | gtk2_ardour/ardour3_ui_dark.rc.in | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 18 | ||||
-rw-r--r-- | gtk2_ardour/editor_actions.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor_rulers.cc | 76 |
6 files changed, 61 insertions, 61 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 0d12a6db2e..88a07fcaac 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -392,7 +392,7 @@ <menu action="RulerMenu"> <menuitem action="toggle-minsec-ruler"/> - <menuitem action="toggle-frames-ruler"/> + <menuitem action="toggle-samples-ruler"/> <menuitem action="toggle-bbt-ruler"/> <separator/> <menuitem action="toggle-meter-ruler"/> @@ -492,7 +492,7 @@ <popup action="RulerMenuPopup"> <menuitem action="toggle-minsec-ruler"/> <menuitem action="toggle-timecode-ruler"/> - <menuitem action="toggle-frames-ruler"/> + <menuitem action="toggle-samples-ruler"/> <menuitem action="toggle-bbt-ruler"/> <separator/> <menuitem action="toggle-meter-ruler"/> diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index 604195c82f..6999603873 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -1670,7 +1670,7 @@ widget "*TakeSelector" style:highest "medium_entry" widget "*RegionSelector" style:highest "medium_entry" widget "*SMPTERuler" style:highest "editor_time_ruler" widget "*BBTRuler" style:highest "editor_time_ruler" -widget "*FramesRuler" style:highest "editor_time_ruler" +widget "*SamplesRuler" style:highest "editor_time_ruler" widget "*MinSecRuler" style:highest "editor_time_ruler" widget "*TimecodeRuler" style:highest "editor_time_ruler" widget "*BaseFrame" style:highest "base_frame" diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7c2aff8559..086e68ab3c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -241,7 +241,7 @@ Editor::Editor () , minsec_label (_("Mins:Secs")) , bbt_label (_("Bars:Beats")) , timecode_label (_("Timecode")) - , frame_label (_("Frames")) + , samples_label (_("Samples")) , tempo_label (_("Tempo")) , meter_label (_("Meter")) , mark_label (_("Location Markers")) @@ -407,12 +407,12 @@ Editor::Editor () timecode_label.set_padding (5,0); timecode_label.hide (); timecode_label.set_no_show_all(); - frame_label.set_name ("EditorTimeButton"); - frame_label.set_size_request (-1, (int)timebar_height); - frame_label.set_alignment (1.0, 0.5); - frame_label.set_padding (5,0); - frame_label.hide (); - frame_label.set_no_show_all(); + samples_label.set_name ("EditorTimeButton"); + samples_label.set_size_request (-1, (int)timebar_height); + samples_label.set_alignment (1.0, 0.5); + samples_label.set_padding (5,0); + samples_label.hide (); + samples_label.set_no_show_all(); tempo_label.set_name ("EditorTimeButton"); tempo_label.set_size_request (-1, (int)timebar_height); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index a54340ea7c..55d5eccbb2 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -746,7 +746,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD enum RulerType { ruler_metric_timecode = 0, ruler_metric_bbt = 1, - ruler_metric_frames = 2, + ruler_metric_samples = 2, ruler_metric_minsec = 3, ruler_time_tempo = 4, @@ -760,7 +760,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD static GtkCustomMetric ruler_metrics[4]; Glib::RefPtr<Gtk::ToggleAction> ruler_timecode_action; Glib::RefPtr<Gtk::ToggleAction> ruler_bbt_action; - Glib::RefPtr<Gtk::ToggleAction> ruler_frames_action; + Glib::RefPtr<Gtk::ToggleAction> ruler_samples_action; Glib::RefPtr<Gtk::ToggleAction> ruler_minsec_action; Glib::RefPtr<Gtk::ToggleAction> ruler_tempo_action; Glib::RefPtr<Gtk::ToggleAction> ruler_meter_action; @@ -793,7 +793,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD static gint _metric_get_timecode (GtkCustomRulerMark **, gdouble, gdouble, gint); static gint _metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); - static gint _metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); + static gint _metric_get_samples (GtkCustomRulerMark **, gdouble, gdouble, gint); static gint _metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); enum MinsecRulerScale { @@ -824,8 +824,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD gint timecode_nmarks; void set_timecode_ruler_scale (framepos_t, framepos_t); - framecnt_t _frames_ruler_interval; - void set_frames_ruler_scale (framepos_t, framepos_t); + framecnt_t _samples_ruler_interval; + void set_samples_ruler_scale (framepos_t, framepos_t); enum BBTRulerScale { bbt_over, @@ -849,17 +849,17 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD gint metric_get_timecode (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); - gint metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); + gint metric_get_samples (GtkCustomRulerMark **, gdouble, gdouble, gint); gint metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); Gtk::Widget *_ruler_separator; GtkWidget *_timecode_ruler; GtkWidget *_bbt_ruler; - GtkWidget *_frames_ruler; + GtkWidget *_samples_ruler; GtkWidget *_minsec_ruler; Gtk::Widget *timecode_ruler; Gtk::Widget *bbt_ruler; - Gtk::Widget *frames_ruler; + Gtk::Widget *samples_ruler; Gtk::Widget *minsec_ruler; static Editor *ruler_editor; @@ -879,7 +879,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Label minsec_label; Gtk::Label bbt_label; Gtk::Label timecode_label; - Gtk::Label frame_label; + Gtk::Label samples_label; Gtk::Label tempo_label; Gtk::Label meter_label; Gtk::Label mark_label; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 0a9ab3f964..3d94fd10b3 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -593,7 +593,7 @@ Editor::register_actions () ruler_cd_marker_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-cd-marker-ruler"), _("CD Markers"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_cd_marker))); ruler_loop_punch_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-loop-punch-ruler"), _("Loop/Punch"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_transport_marker))); ruler_bbt_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-bbt-ruler"), _("Bars & Beats"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_bbt))); - ruler_frames_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-frames-ruler"), _("Frames"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_frames))); + ruler_samples_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-samples-ruler"), _("Samples"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_samples))); ruler_timecode_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-timecode-ruler"), _("Timecode"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_timecode))); ruler_minsec_action = Glib::RefPtr<ToggleAction>::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-minsec-ruler"), _("Min:Sec"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_minsec))); @@ -617,7 +617,7 @@ Editor::register_actions () ruler_timecode_action->set_active (true); ruler_minsec_action->set_active (false); } - ruler_frames_action->set_active (false); + ruler_samples_action->set_active (false); no_ruler_shown_update = false; /* REGION LIST */ @@ -720,8 +720,8 @@ Editor::toggle_ruler_visibility (RulerType rt) case ruler_metric_bbt: action = "toggle-bbt-ruler"; break; - case ruler_metric_frames: - action = "toggle-frames-ruler"; + case ruler_metric_samples: + action = "toggle-samples-ruler"; break; case ruler_metric_minsec: action = "toggle-minsec-ruler"; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 488c580cd4..418ec4f10a 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -57,7 +57,7 @@ Editor *Editor::ruler_editor; GtkCustomMetric Editor::ruler_metrics[4] = { {1, Editor::_metric_get_timecode }, {1, Editor::_metric_get_bbt }, - {1, Editor::_metric_get_frames }, + {1, Editor::_metric_get_samples }, {1, Editor::_metric_get_minsec } }; @@ -98,13 +98,13 @@ Editor::initialize_rulers () bbt_ruler->set_no_show_all(); bbt_nmarks = 0; - _frames_ruler = gtk_custom_hruler_new (); - frames_ruler = Glib::wrap (_frames_ruler); - frames_ruler->set_name ("FramesRuler"); - frames_ruler->set_size_request (-1, (int)timebar_height); - gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_frames_ruler), &ruler_metrics[ruler_metric_frames]); - frames_ruler->hide (); - frames_ruler->set_no_show_all(); + _samples_ruler = gtk_custom_hruler_new (); + samples_ruler = Glib::wrap (_samples_ruler); + samples_ruler->set_name ("SamplesRuler"); + samples_ruler->set_size_request (-1, (int) timebar_height); + gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER (_samples_ruler), &ruler_metrics[ruler_metric_samples]); + samples_ruler->hide (); + samples_ruler->set_no_show_all (); _bbt_ruler = gtk_custom_hruler_new (); bbt_ruler = Glib::wrap (_bbt_ruler); @@ -135,34 +135,34 @@ Editor::initialize_rulers () ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START)); ruler_lab_children.push_back (Element(timecode_label, PACK_SHRINK, PACK_START)); ruler_children.insert (canvaspos, Element(*timecode_ruler, PACK_SHRINK, PACK_START)); - ruler_lab_children.push_back (Element(frame_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*frames_ruler, PACK_SHRINK, PACK_START)); + ruler_lab_children.push_back (Element(samples_label, PACK_SHRINK, PACK_START)); + ruler_children.insert (canvaspos, Element (*samples_ruler, PACK_SHRINK, PACK_START)); ruler_lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START)); ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START)); timecode_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); bbt_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); - frames_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); + samples_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); minsec_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); timecode_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); bbt_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); - frames_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); + samples_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); minsec_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); timecode_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); bbt_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); - frames_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); + samples_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); minsec_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); timecode_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); bbt_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); - frames_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); + samples_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); minsec_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); timecode_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); bbt_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); - frames_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); + samples_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); minsec_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); visible_timebars = 0; /*this will be changed below */ @@ -231,8 +231,8 @@ Editor::ruler_button_press (GdkEventButton* ev) grab_widget = timecode_ruler; } else if (bbt_ruler->is_realized() && ev->window == bbt_ruler->get_window()->gobj()) { grab_widget = bbt_ruler; - } else if (frames_ruler->is_realized() && ev->window == frames_ruler->get_window()->gobj()) { - grab_widget = frames_ruler; + } else if (samples_ruler->is_realized() && ev->window == samples_ruler->get_window()->gobj()) { + grab_widget = samples_ruler; } else if (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) { grab_widget = minsec_ruler; } @@ -387,7 +387,7 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t) ruler_items.push_back (MenuElem (*action->create_menu_item())); } } - action = ActionManager::get_action ("Rulers", "toggle-frames-ruler"); + action = ActionManager::get_action ("Rulers", "toggle-samples-ruler"); if (action) { ruler_items.push_back (MenuElem (*action->create_menu_item())); } @@ -434,7 +434,7 @@ Editor::store_ruler_visibility () node->add_property (X_("timecode"), ruler_timecode_action->get_active() ? "yes": "no"); node->add_property (X_("bbt"), ruler_bbt_action->get_active() ? "yes": "no"); - node->add_property (X_("frames"), ruler_frames_action->get_active() ? "yes": "no"); + node->add_property (X_("samples"), ruler_samples_action->get_active() ? "yes": "no"); node->add_property (X_("minsec"), ruler_minsec_action->get_active() ? "yes": "no"); node->add_property (X_("tempo"), ruler_tempo_action->get_active() ? "yes": "no"); node->add_property (X_("meter"), ruler_meter_action->get_active() ? "yes": "no"); @@ -470,11 +470,11 @@ Editor::restore_ruler_visibility () ruler_bbt_action->set_active (false); } } - if ((prop = node->property ("frames")) != 0) { + if ((prop = node->property ("samples")) != 0) { if (string_is_affirmative (prop->value())) { - ruler_frames_action->set_active (true); + ruler_samples_action->set_active (true); } else { - ruler_frames_action->set_active (false); + ruler_samples_action->set_active (false); } } if ((prop = node->property ("minsec")) != 0) { @@ -577,13 +577,13 @@ Editor::update_ruler_visibility () timecode_ruler->hide (); } - if (ruler_frames_action->get_active()) { + if (ruler_samples_action->get_active()) { visible_rulers++; - frame_label.show (); - frames_ruler->show (); + samples_label.show (); + samples_ruler->show (); } else { - frame_label.hide (); - frames_ruler->hide (); + samples_label.hide (); + samples_ruler->hide (); } if (ruler_bbt_action->get_active()) { @@ -807,8 +807,8 @@ Editor::compute_fixed_ruler_scale () set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); } - if (ruler_frames_action->get_active()) { - set_frames_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); + if (ruler_samples_action->get_active()) { + set_samples_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); } } @@ -822,7 +822,7 @@ Editor::update_fixed_rulers () } ruler_metrics[ruler_metric_timecode].units_per_pixel = frames_per_unit; - ruler_metrics[ruler_metric_frames].units_per_pixel = frames_per_unit; + ruler_metrics[ruler_metric_samples].units_per_pixel = frames_per_unit; ruler_metrics[ruler_metric_minsec].units_per_pixel = frames_per_unit; rightmost_frame = leftmost_frame + current_page_frames(); @@ -836,8 +836,8 @@ Editor::update_fixed_rulers () leftmost_frame, _session->current_end_frame()); } - if (ruler_frames_action->get_active()) { - gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_frames_ruler), leftmost_frame, rightmost_frame, + if (ruler_samples_action->get_active()) { + gtk_custom_ruler_set_range (GTK_CUSTOM_RULER (_samples_ruler), leftmost_frame, rightmost_frame, leftmost_frame, _session->current_end_frame()); } @@ -877,9 +877,9 @@ Editor::_metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble uppe } gint -Editor::_metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +Editor::_metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) { - return ruler_editor->metric_get_frames (marks, lower, upper, maxchars); + return ruler_editor->metric_get_samples (marks, lower, upper, maxchars); } gint @@ -1742,13 +1742,13 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp } void -Editor::set_frames_ruler_scale (framepos_t lower, framepos_t upper) +Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper) { - _frames_ruler_interval = (upper - lower) / 5; + _samples_ruler_interval = (upper - lower) / 5; } gint -Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) +Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) { framepos_t pos; framepos_t const ilower = (framepos_t) floor (lower); @@ -1762,7 +1762,7 @@ Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble up nmarks = 5; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - for (n = 0, pos = ilower; n < nmarks; pos += _frames_ruler_interval, ++n) { + for (n = 0, pos = ilower; n < nmarks; pos += _samples_ruler_interval, ++n) { snprintf (buf, sizeof(buf), "%" PRIi64, pos); (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; |