projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
destroy splash when hiding it to workaround odd bug on OS X where the window will...
[ardour.git]
/
gtk2_ardour
/
mixer_ui.h
diff --git
a/gtk2_ardour/mixer_ui.h
b/gtk2_ardour/mixer_ui.h
index c7378404efac34c8c923869e85e4bf1d129759e6..febc62b8ddbbaa25558a829e883b5434c287f81d 100644
(file)
--- a/
gtk2_ardour/mixer_ui.h
+++ b/
gtk2_ardour/mixer_ui.h
@@
-31,34
+31,37
@@
#include <gtkmm/paned.h>
#include <gtkmm/menu.h>
#include <gtkmm/treeview.h>
#include <gtkmm/paned.h>
#include <gtkmm/menu.h>
#include <gtkmm/treeview.h>
+#include <gtkmm/liststore.h>
#include "pbd/stateful.h"
#include "pbd/stateful.h"
+#include "pbd/signals.h"
#include "ardour/ardour.h"
#include "ardour/ardour.h"
+#include "ardour/session_handle.h"
-#include "route_processor_selection.h"
#include "enums.h"
#include "enums.h"
+#include "mixer_actor.h"
namespace ARDOUR {
class Route;
class RouteGroup;
namespace ARDOUR {
class Route;
class RouteGroup;
- class Session;
- class AudioDiskstream;
};
class MixerStrip;
class PluginSelector;
class MixerGroupTabs;
};
class MixerStrip;
class PluginSelector;
class MixerGroupTabs;
+class MonitorSection;
-class Mixer_UI : public Gtk::Window
+class Mixer_UI : public Gtk::Window
, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor
{
public:
{
public:
-
Mixer_UI
();
+
static Mixer_UI* instance
();
~Mixer_UI();
~Mixer_UI();
- void connect_to_session (ARDOUR::Session *);
+ void set_session (ARDOUR::Session *);
+ void track_editor_selection ();
- PluginSelector
& plugin_selector() { return *_plugin_selector; }
+ PluginSelector
* plugin_selector();
void set_strip_width (Width);
Width get_strip_width () const { return _strip_width; }
void set_strip_width (Width);
Width get_strip_width () const { return _strip_width; }
@@
-78,10
+81,14
@@
class Mixer_UI : public Gtk::Window
void toggle_auto_rebinding ();
void set_auto_rebinding(bool);
void toggle_auto_rebinding ();
void set_auto_rebinding(bool);
- RouteRedirectSelection& selection() { return _selection; }
+ MonitorSection* monitor_section() const { return _monitor_section; }
+
+ protected:
+ void set_route_targets_for_operation ();
private:
private:
- ARDOUR::Session *session;
+ Mixer_UI ();
+ static Mixer_UI* _instance;
bool _visible;
bool _visible;
@@
-114,16
+121,21
@@
class Mixer_UI : public Gtk::Window
bool on_key_press_event (GdkEventKey*);
bool on_key_release_event (GdkEventKey*);
bool on_key_press_event (GdkEventKey*);
bool on_key_release_event (GdkEventKey*);
+ bool on_scroll_event (GdkEventScroll*);
void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
std::list<MixerStrip *> strips;
bool strip_scroller_button_release (GdkEventButton*);
void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
std::list<MixerStrip *> strips;
bool strip_scroller_button_release (GdkEventButton*);
+ void scroll_left ();
+ void scroll_right ();
void add_strip (ARDOUR::RouteList&);
void remove_strip (MixerStrip *);
void add_strip (ARDOUR::RouteList&);
void remove_strip (MixerStrip *);
+ MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>);
+
void hide_all_strips (bool with_select);
void unselect_all_strips();
void select_all_strips ();
void hide_all_strips (bool with_select);
void unselect_all_strips();
void select_all_strips ();
@@
-138,12
+150,10
@@
class Mixer_UI : public Gtk::Window
void strip_select_op (bool audiotrack, bool select);
void select_strip_op (MixerStrip*, bool select);
void strip_select_op (bool audiotrack, bool select);
void select_strip_op (MixerStrip*, bool select);
- void follow_strip_selection ();
-
gint start_updating ();
gint stop_updating ();
gint start_updating ();
gint stop_updating ();
- void
disconnect_from_session
();
+ void
session_going_away
();
sigc::connection fast_screen_update_connection;
void fast_update_strips ();
sigc::connection fast_screen_update_connection;
void fast_update_strips ();
@@
-172,7
+182,6
@@
class Mixer_UI : public Gtk::Window
void show_all_audiotracks();
void hide_all_audiotracks ();
void show_all_audiotracks();
void hide_all_audiotracks ();
- Gtk::Menu* route_group_context_menu;
bool in_group_row_change;
void group_selected (gint row, gint col, GdkEvent *ev);
bool in_group_row_change;
void group_selected (gint row, gint col, GdkEvent *ev);
@@
-180,23
+189,23
@@
class Mixer_UI : public Gtk::Window
void group_display_active_clicked();
void new_route_group ();
void remove_selected_route_group ();
void group_display_active_clicked();
void new_route_group ();
void remove_selected_route_group ();
- void build_route_group_context_menu ();
void activate_all_route_groups ();
void disable_all_route_groups ();
void add_route_group (ARDOUR::RouteGroup *);
void route_groups_changed ();
void activate_all_route_groups ();
void disable_all_route_groups ();
void add_route_group (ARDOUR::RouteGroup *);
void route_groups_changed ();
- void route_group_name_edit (const
Glib::ustring&, const Glib::u
string&);
+ void route_group_name_edit (const
std::string&, const std::
string&);
void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
+ void route_group_row_deleted (Gtk::TreeModel::Path const &);
Gtk::Menu *track_menu;
void track_column_click (gint);
void build_track_menu ();
Gtk::Menu *track_menu;
void track_column_click (gint);
void build_track_menu ();
+ MonitorSection* _monitor_section;
PluginSelector *_plugin_selector;
PluginSelector *_plugin_selector;
- void strip_name_changed (MixerStrip *);
-
- void group_flags_changed (void *src, ARDOUR::RouteGroup *);
+ void strip_property_changed (const PBD::PropertyChange&, MixerStrip *);
+ void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &);
/* various treeviews */
/* various treeviews */
@@
-208,7
+217,7
@@
class Mixer_UI : public Gtk::Window
add (strip);
}
Gtk::TreeModelColumn<bool> visible;
add (strip);
}
Gtk::TreeModelColumn<bool> visible;
- Gtk::TreeModelColumn<
Glib::u
string> text;
+ Gtk::TreeModelColumn<
std::
string> text;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
Gtk::TreeModelColumn<MixerStrip*> strip;
};
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
Gtk::TreeModelColumn<MixerStrip*> strip;
};
@@
-220,7
+229,7
@@
class Mixer_UI : public Gtk::Window
add (group);
}
Gtk::TreeModelColumn<bool> visible;
add (group);
}
Gtk::TreeModelColumn<bool> visible;
- Gtk::TreeModelColumn<
Glib::ustring>
text;
+ Gtk::TreeModelColumn<
std::string>
text;
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
};
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
};
@@
-238,8
+247,6
@@
class Mixer_UI : public Gtk::Window
bool strip_button_release_event (GdkEventButton*, MixerStrip*);
bool strip_button_release_event (GdkEventButton*, MixerStrip*);
- RouteRedirectSelection _selection;
-
Width _strip_width;
void sync_order_keys (std::string const &);
Width _strip_width;
void sync_order_keys (std::string const &);
@@
-250,10
+257,26
@@
class Mixer_UI : public Gtk::Window
void parameter_changed (std::string const &);
void set_route_group_activation (ARDOUR::RouteGroup *, bool);
void parameter_changed (std::string const &);
void set_route_group_activation (ARDOUR::RouteGroup *, bool);
+ void setup_track_display ();
+ void new_track_or_bus ();
+
static const int32_t default_width = 478;
static const int32_t default_height = 765;
static const int32_t default_width = 478;
static const int32_t default_height = 765;
+ /** true if we are rebuilding the route group list, or clearing
+ it during a session teardown.
+ */
+ bool _in_group_rebuild_or_clear;
+
+ void update_title ();
+ MixerStrip* strip_by_x (int x);
+
friend class MixerGroupTabs;
friend class MixerGroupTabs;
+
+ void follow_editor_selection ();
+ bool _following_editor_selection;
+
+ void monitor_section_going_away ();
};
#endif /* __ardour_mixer_ui_h__ */
};
#endif /* __ardour_mixer_ui_h__ */