Use sys::path and SessionDirectory in Session::find_all_sources for portability

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 66d2aa433586bc69baa287531cbafcf8a54f3557..5bb6ee44264f7ff93b7a9f0ee5f7ec4cac6afccd 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -574,13 +574,6 @@ class Editor : public PublicEditor
        ArdourCanvas::SimpleRect* range_marker_bar;
        ArdourCanvas::SimpleRect* transport_marker_bar;
 
-       
-       ArdourCanvas::SimpleLine* tempo_line;
-       ArdourCanvas::SimpleLine* meter_line;
-       ArdourCanvas::SimpleLine* marker_line;
-       ArdourCanvas::SimpleLine* range_marker_line;
-       ArdourCanvas::SimpleLine* transport_marker_line;
-
        Gtk::Label  minsec_label;
        Gtk::Label  bbt_label;
        Gtk::Label  smpte_label;
@@ -868,10 +861,9 @@ class Editor : public PublicEditor
        void reset_point_selection ();
        void set_region_mute (bool);
        void set_region_lock (bool);
+       void set_region_position_lock (bool);
        void set_region_opaque (bool);
-       void raise_region ();
        void raise_region_to_top ();
-       void lower_region ();
        void lower_region_to_bottom ();
        void split_region ();
        void split_region_at (nframes_t);
@@ -1287,7 +1279,14 @@ class Editor : public PublicEditor
        void tempo_map_changed (ARDOUR::Change);
        void redisplay_tempo (bool immediate_redraw);
        
-       void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false);
+       void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
+       void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false) {
+               /* XXX remove this function when everything moves to 64 bit frame counts */
+               nframes64_t first64 = first;
+               snap_to (first64, direction, for_mark);
+               first = (nframes_t) first64;
+       }
+
        uint32_t bbt_beat_subdivision;
 
        /* toolbar */