X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=c8a2f817775bbd0d613ca13e691dfbbbeec247a5;hb=6f858b51d2578eb6f505fb5f2a05c1fefb47816f;hp=7fabef74c189b4711a904e8239c4b58bd41dc9b8;hpb=bc487bb4b02a9780938d6cf8528c888e59161aa9;p=ardour.git

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 7fabef74c1..c8a2f81777 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -246,7 +246,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	/* selection */
 
 	Selection& get_selection() const { return *selection; }
-	bool get_selection_extents ( framepos_t &start, framepos_t &end );  // the time extents of the current selection, whether Range, Region(s), Control Points, or Notes
+	bool get_selection_extents (framepos_t &start, framepos_t &end) const;  // the time extents of the current selection, whether Range, Region(s), Control Points, or Notes
 	Selection& get_cut_buffer() const { return *cut_buffer; }
 	void track_mixer_selection ();
 
@@ -274,8 +274,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	/* analysis window */
 
-	void analyze_region_selection();
-	void analyze_range_selection();
+	void loudness_analyze_region_selection();
+	void loudness_analyze_range_selection();
+
+	void spectral_analyze_region_selection();
+	void spectral_analyze_range_selection();
 
 	/* export */
 
@@ -349,7 +352,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void set_summary ();
 	void set_group_tabs ();
 	void toggle_measure_visibility ();
-	void toggle_logo_visibility ();
 
 	/* fades */
 
@@ -634,6 +636,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void remove_marker (ArdourCanvas::Item&, GdkEvent*);
 	gint really_remove_marker (ARDOUR::Location* loc);
 	void goto_nth_marker (int nth);
+	void trigger_script (int nth);
 	void toggle_marker_lines ();
 	void set_marker_line_visibility (bool);
 
@@ -807,8 +810,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	Gtk::EventBox             time_bars_event_box;
 	Gtk::VBox                 time_bars_vbox;
 
-	ArdourCanvas::Pixbuf     *logo_item;
-
 	ArdourCanvas::Container      *tempo_group;
 	ArdourCanvas::Container      *meter_group;
 	ArdourCanvas::Container      *marker_group;
@@ -1273,7 +1274,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void naturalize_region ();
 
-	void reset_focus ();
+	void reset_focus (Gtk::Widget*);
 
 	void split_region ();
 
@@ -1617,6 +1618,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void initialize_canvas ();
 
+	void manage_action_scripts ();
+	void set_script_action_name (int i, const std::string&);
+
 	/* display control */
 
 	bool _show_measures;
@@ -2018,7 +2022,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void cms_new (boost::shared_ptr<ARDOUR::Route>);
 	void current_mixer_strip_hidden ();
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 	void ensure_all_elements_drawn ();
 #endif
 	/* nudging tracks */
@@ -2113,7 +2117,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const;
 
 	RegionSelection get_regions_from_selection_and_edit_point ();
-	RegionSelection get_regions_from_selection_and_entered ();
+	RegionSelection get_regions_from_selection_and_entered () const;
 
 	void start_updating_meters ();
 	void stop_updating_meters ();