X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=bf9c9cbd18c6b63bedaa42776ea6d05ef4030503;hb=98cfa3a504ba063e82692b6c85293cabf5c9d866;hp=71443a6896dfff69fce3298501a3eb7da59c3919;hpb=ad8028554827f9e72dd978e218a3d9538e30d8de;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 71443a6896..bf9c9cbd18 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_mixer_ui_h__ @@ -33,11 +32,11 @@ #include #include +#include + #include -#include #include -#include "keyboard_target.h" #include "route_redirect_selection.h" #include "enums.h" @@ -45,8 +44,7 @@ namespace ARDOUR { class Route; class RouteGroup; class Session; - class DiskStream; - class AudioEngine; + class AudioDiskstream; }; class MixerStrip; @@ -55,7 +53,7 @@ class PluginSelector; class Mixer_UI : public Gtk::Window { public: - Mixer_UI (ARDOUR::AudioEngine&); + Mixer_UI (); ~Mixer_UI(); void connect_to_session (ARDOUR::Session *); @@ -72,14 +70,18 @@ class Mixer_UI : public Gtk::Window int set_state (const XMLNode& ); void show_window (); + bool hide_window (GdkEventAny *ev); + void show_strip (MixerStrip *); + void hide_strip (MixerStrip *); void ensure_float (Gtk::Window&); RouteRedirectSelection& selection() { return _selection; } private: - ARDOUR::AudioEngine& engine; ARDOUR::Session *session; + + bool _visible; Gtk::HBox global_hpacker; Gtk::VBox global_vpacker; @@ -92,28 +94,25 @@ 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; + bool on_key_press_event (GdkEventKey*); + void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*); list strips; - gint strip_scroller_button_release (GdkEventButton*); + bool strip_scroller_button_release (GdkEventButton*); - void add_strip (ARDOUR::Route*); + void add_strip (ARDOUR::Session::RouteList&); void remove_strip (MixerStrip *); - void show_strip (MixerStrip *); - void hide_strip (MixerStrip *); - void hide_all_strips (bool with_select); void unselect_all_strips(); void select_all_strips (); @@ -132,24 +131,46 @@ class Mixer_UI : public Gtk::Window void disconnect_from_session (); - sigc::connection screen_update_connection; - void update_strips (); sigc::connection fast_screen_update_connection; void fast_update_strips (); - void track_display_selected (gint row, gint col, GdkEvent *ev); - void track_display_unselected (gint row, gint col, GdkEvent *ev); void track_name_changed (MixerStrip *); - void track_display_reordered_proxy (const Gtk::TreePath& path, const Gtk::TreeIter& i, int* n); - void track_display_reordered (); - sigc::connection reorder_connection; + void redisplay_track_list (); + bool no_track_list_redisplay; + bool track_display_button_press (GdkEventButton*); + + void track_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&); + void track_list_delete (const Gtk::TreeModel::Path&); + + void initial_track_display (); + void show_track_list_menu (); + + void set_all_strips_visibility (bool yn); + void set_all_audio_visibility (int tracks, bool yn); + + void hide_all_routes (); + void show_all_routes (); + void show_all_audiobus (); + void hide_all_audiobus (); + void show_all_audiotracks(); + void hide_all_audiotracks (); + + Gtk::Menu* mix_group_context_menu; + bool in_group_row_change; void group_selected (gint row, gint col, GdkEvent *ev); void group_unselected (gint row, gint col, GdkEvent *ev); void group_display_active_clicked(); void new_mix_group (); + void remove_selected_mix_group (); + void build_mix_group_context_menu (); + void activate_all_mix_groups (); + void disable_all_mix_groups (); void add_mix_group (ARDOUR::RouteGroup *); + void mix_groups_changed (); + void mix_group_name_edit (const Glib::ustring&, const Glib::ustring&); + void mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter); Gtk::Menu *track_menu; void track_column_click (gint); @@ -159,76 +180,55 @@ class Mixer_UI : public Gtk::Window void strip_name_changed (void *src, MixerStrip *); - static GdkPixmap *check_pixmap; - static GdkBitmap *check_mask; - static GdkPixmap *empty_pixmap; - static GdkBitmap *empty_mask; - void group_flags_changed (void *src, ARDOUR::RouteGroup *); /* various treeviews */ struct TrackDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - TrackDisplayModelColumns() { + TrackDisplayModelColumns () { add (text); + add (visible); add (route); add (strip); } + Gtk::TreeModelColumn visible; Gtk::TreeModelColumn text; - Gtk::TreeModelColumn route; + Gtk::TreeModelColumn > route; Gtk::TreeModelColumn strip; }; struct GroupDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { GroupDisplayModelColumns() { add (active); + add (visible); add (text); add (group); } Gtk::TreeModelColumn active; + Gtk::TreeModelColumn visible; Gtk::TreeModelColumn text; Gtk::TreeModelColumn group; }; - struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - SnapshotDisplayModelColumns() { - add (visible_name); - add (real_name); - } - Gtk::TreeModelColumn visible_name; - Gtk::TreeModelColumn real_name; - }; - - TrackDisplayModelColumns track_display_columns; - GroupDisplayModelColumns group_display_columns; - SnapshotDisplayModelColumns snapshot_display_columns; + TrackDisplayModelColumns track_columns; + GroupDisplayModelColumns group_columns; Gtk::TreeView track_display; Gtk::TreeView group_display; - Gtk::TreeView snapshot_display; - Glib::RefPtr track_display_model; - Glib::RefPtr group_display_model; - Glib::RefPtr snapshot_display_model; + Glib::RefPtr track_model; + Glib::RefPtr group_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; Width _strip_width; - static const int32_t default_width = -1; + static const int32_t default_width = 478; static const int32_t default_height = 765; };