smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

save tearoff state; restore monitor section state reasonably well; fixup access control to parts of editor.h (needs more work); extend CrossThread just a little

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6774 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-03-19 02:49:01 +00:00
parent 295eb9a395
commit f0748535a5
15 changed files with 432 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gtk2_ardour/editor.h
View file

@ -444,6 +444,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void center_screen (nframes64_t);
TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
Gtkmm2ext::TearOff* mouse_mode_tearoff () const { return _mouse_mode_tearoff; }
Gtkmm2ext::TearOff* tools_tearoff () const { return _tools_tearoff; }
void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
void snap_to_with_modifier (nframes64_t& first, GdkEvent const *, int32_t direction = 0, bool for_mark = false);
void snap_to (nframes64_t& first, nframes64_t& last, int32_t direction = 0, bool for_mark = false);
void begin_reversible_command (std::string cmd_name);
void commit_reversible_command ();
protected:
void map_transport_state ();
@ -1347,8 +1356,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
private:
ArdourCanvas::Item *last_item_entered;
int last_item_entered_n;
public:
public:
bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
@ -1377,6 +1386,11 @@ public:
bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*);
bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*);
private:
friend class DragManager;
friend class EditorRouteGroups;
friend class EditorRegions;
/* non-public event handlers */
bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
@ -1488,10 +1502,6 @@ public:
void tempo_map_changed (const PBD::PropertyChange&);
void redisplay_tempo (bool immediate_redraw);
void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
void snap_to_with_modifier (nframes64_t& first, GdkEvent const *, int32_t direction = 0, bool for_mark = false);
void snap_to (nframes64_t& first, nframes64_t& last, int32_t direction = 0, bool for_mark = false);
uint32_t bbt_beat_subdivision;
/* toolbar */
@ -1515,7 +1525,7 @@ public:
Gtk::Table toolbar_selection_clock_table;
Gtk::Label toolbar_selection_cursor_label;
Gtkmm2ext::TearOff* mouse_mode_tearoff;
Gtkmm2ext::TearOff* _mouse_mode_tearoff;
Gtk::ToggleButton mouse_select_button;
Gtk::ToggleButton mouse_move_button;
Gtk::ToggleButton mouse_gain_button;
@ -1578,7 +1588,7 @@ public:
void setup_tooltips ();
Gtkmm2ext::TearOff* tools_tearoff;
Gtkmm2ext::TearOff* _tools_tearoff;
Gtk::HBox toolbar_hbox;
Gtk::EventBox toolbar_base;
Gtk::Frame toolbar_frame;
@ -1766,9 +1776,6 @@ public:
XMLNode *before; /* used in *_reversible_command */
void begin_reversible_command (std::string cmd_name);
void commit_reversible_command ();
void update_title ();
void update_title_s (const std::string & snapshot_name);
@ -1999,8 +2006,8 @@ public:
bool _have_idled;
int resize_idle_id;
static gboolean _idle_resize (gpointer);
bool idle_resize();
friend gboolean _idle_resize (gpointer);
int32_t _pending_resize_amount;
TimeAxisView* _pending_resize_view;