diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-05 03:18:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-05 03:18:44 +0000 |
| commit | 2fcdf14e2b63753be7b9cd74a442fa5aefbfb401 (patch) | |
| tree | 25c98b803239a87bfbf93a22d506bedef43b3e7c /gtk2_ardour/mixer_ui.h | |
| parent | f020b4e1e66dedba8d150a646347ec2b02b8ac52 (diff) | |
lots of small fixes for various irritations, return of snapshots, region list hiding stuff, etc etc etc
git-svn-id: svn://localhost/trunk/ardour2@241 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.h')
| -rw-r--r-- | gtk2_ardour/mixer_ui.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 71443a6896..bc77108bea 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -92,12 +92,10 @@ class Mixer_UI : public Gtk::Window Gtk::Button group_display_button; Gtk::ScrolledWindow track_display_scroller; Gtk::ScrolledWindow group_display_scroller; - Gtk::ScrolledWindow snapshot_display_scroller; Gtk::VBox group_display_vbox; Gtk::Frame track_display_frame; Gtk::Frame group_display_frame; Gtk::VPaned rhs_pane1; - Gtk::VPaned rhs_pane2; Gtk::HBox strip_packer; Gtk::HBox out_packer; Gtk::HPaned list_hpane; @@ -106,7 +104,7 @@ class Mixer_UI : public Gtk::Window list<MixerStrip *> strips; - gint strip_scroller_button_release (GdkEventButton*); + bool strip_scroller_button_release (GdkEventButton*); void add_strip (ARDOUR::Route*); void remove_strip (MixerStrip *); @@ -190,39 +188,22 @@ class Mixer_UI : public Gtk::Window Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group; }; - struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - SnapshotDisplayModelColumns() { - add (visible_name); - add (real_name); - } - Gtk::TreeModelColumn<Glib::ustring> visible_name; - Gtk::TreeModelColumn<Glib::ustring> real_name; - }; - TrackDisplayModelColumns track_display_columns; GroupDisplayModelColumns group_display_columns; - SnapshotDisplayModelColumns snapshot_display_columns; Gtk::TreeView track_display; Gtk::TreeView group_display; - Gtk::TreeView snapshot_display; Glib::RefPtr<Gtk::ListStore> track_display_model; Glib::RefPtr<Gtk::ListStore> group_display_model; - Glib::RefPtr<Gtk::ListStore> snapshot_display_model; bool track_display_button_press (GdkEventButton*); bool group_display_button_press (GdkEventButton*); - bool snapshot_display_button_press (GdkEventButton*); void track_display_selection_changed (); void group_display_selection_changed (); - void snapshot_display_selection_changed (); - - void redisplay_snapshots(); - void session_state_saved (string); - gint strip_button_release_event (GdkEventButton*, MixerStrip*); + bool strip_button_release_event (GdkEventButton*, MixerStrip*); RouteRedirectSelection _selection; |