X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=eb51fb5beb999a70bd9c37ee7ef8216353257c46;hb=e11b3f90c2d02735a071d526d67cfd0de90cbac3;hp=7d902fbfb841ee21abdc6cb98ed06e0c2a17ce4a;hpb=22dc575e4cbc35a5d486d6f448332fb721865d57;p=ardour.git

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 7d902fbfb8..eb51fb5beb 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -237,7 +237,7 @@ class Editor : public PublicEditor
 	}
 
 	gulong frame_to_pixel (nframes64_t frame) const {
-		return (gulong) rint ((frame / (frames_per_unit *  GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
+		return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
 	}
 
 	void flush_canvas ();
@@ -858,6 +858,7 @@ class Editor : public PublicEditor
 	Gtk::Layout         controls_layout;
 	bool control_layout_scroll (GdkEventScroll* ev);
 	void controls_layout_size_request (Gtk::Requisition*);
+	sigc::connection controls_layout_size_request_connection;
 
 	Gtk::HScrollbar     edit_hscrollbar;
 	bool                _dragging_hscrollbar;
@@ -932,16 +933,30 @@ class Editor : public PublicEditor
 		    add (start);
 		    add (end);
 		    add (length);
+			add (sync);
+			add (fadein);
+			add (fadeout);
+			add (locked);
+			add (glued);
+			add (muted);
+			add (opaque);
 			add (used);
 		    add (path);
 	    }
-		Gtk::TreeModelColumn<Glib::ustring> name;
+	    Gtk::TreeModelColumn<Glib::ustring> name;
 	    Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
 	    Gtk::TreeModelColumn<Gdk::Color> color_;
 	    Gtk::TreeModelColumn<Glib::ustring> start;
 	    Gtk::TreeModelColumn<Glib::ustring> end;
 	    Gtk::TreeModelColumn<Glib::ustring> length;
-		Gtk::TreeModelColumn<Glib::ustring> used;
+	    Gtk::TreeModelColumn<Glib::ustring> sync;
+	    Gtk::TreeModelColumn<Glib::ustring> fadein;
+	    Gtk::TreeModelColumn<Glib::ustring> fadeout;
+	    Gtk::TreeModelColumn<bool> locked;
+	    Gtk::TreeModelColumn<bool> glued;
+	    Gtk::TreeModelColumn<bool> muted;
+	    Gtk::TreeModelColumn<bool> opaque;
+	    Gtk::TreeModelColumn<Glib::ustring> used;
 	    Gtk::TreeModelColumn<Glib::ustring> path;
 	};
 	    
@@ -1090,7 +1105,9 @@ class Editor : public PublicEditor
 	void add_regions_to_region_display (std::vector<boost::weak_ptr<ARDOUR::Region> > & );
 	void region_hidden (boost::shared_ptr<ARDOUR::Region>);
 	void redisplay_regions ();
+	void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &);
 	void update_region_row (boost::shared_ptr<ARDOUR::Region>);
+	bool update_region_subrows (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
 	bool no_region_list_redisplay;
 	void insert_into_tmp_regionlist(boost::shared_ptr<ARDOUR::Region>);
 
@@ -1212,6 +1229,7 @@ class Editor : public PublicEditor
 	
 	void add_external_audio_action (Editing::ImportMode);
 	void external_audio_dialog ();
+	void session_import_dialog ();
 
 	int  check_whether_and_how_to_import(string, bool all_or_nothing = true);
 	bool check_multichannel_status (const std::vector<Glib::ustring>& paths);
@@ -1532,7 +1550,6 @@ public:
 	TempoLines* tempo_lines;
 
 	ArdourCanvas::Group* time_line_group;
-	ArdourCanvas::SimpleLine* get_time_line ();
 
 	void hide_measures ();
 	void draw_measures ();
@@ -1598,7 +1615,6 @@ public:
 	void draw_metric_marks (const ARDOUR::Metrics& metrics);
 
 	void compute_current_bbt_points (nframes_t left, nframes_t right);
-	int tempo_map_change_idle_handler_id;
 	void tempo_map_changed (ARDOUR::Change);
 	void redisplay_tempo (bool immediate_redraw);