fix audio clock field widths, change minsec display to include fractional seconds...

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 68c108c91760af5924700b1cd198acc63bfdf9b8..e0d976c233941f8300195411611c68f061524d66 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -133,7 +133,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        if (is_track()) {
                rec_enable_button->set_active (false);
                rec_enable_button->set_name ("TrackRecordEnableButton");
-               //rec_enable_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
                rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
                controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
                ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
@@ -470,7 +469,7 @@ RouteTimeAxisView::build_display_menu ()
 
 
 void
-RouteTimeAxisView::show_timestretch (jack_nframes_t start, jack_nframes_t end)
+RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 {
        double x1;
        double x2;
@@ -903,7 +902,7 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
 }
 
 void
-RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
        double speed = 1.0;
        
@@ -911,8 +910,8 @@ RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, do
                speed = get_diskstream()->speed();
        }
        
-       jack_nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
-       jack_nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
+       nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
+       nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
        if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) {
                _view->get_selectables (start_adjusted, end_adjusted, results);
@@ -1006,7 +1005,7 @@ RouteTimeAxisView::hide_click ()
 }
 
 boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (jack_nframes_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Diskstream> stream;
        Playlist *playlist;
@@ -1071,7 +1070,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 }
 
 bool
-RouteTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
 {
        if (!is_track()) {
                return false;