projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate PinDialog Session/recording checks
[ardour.git]
/
gtk2_ardour
/
route_params_ui.h
diff --git
a/gtk2_ardour/route_params_ui.h
b/gtk2_ardour/route_params_ui.h
index 4c8adfd9c66878e099ae09072435502d3c70a7c9..850c56af7c358447262edaf19eb4d8f44a8edae9 100644
(file)
--- a/
gtk2_ardour/route_params_ui.h
+++ b/
gtk2_ardour/route_params_ui.h
@@
-27,7
+27,6
@@
#include <gtkmm/eventbox.h>
#include <gtkmm/frame.h>
#include <gtkmm/label.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/frame.h>
#include <gtkmm/label.h>
-#include <gtkmm/paned.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/togglebutton.h>
#include <gtkmm/treeview.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/togglebutton.h>
#include <gtkmm/treeview.h>
@@
-37,9
+36,11
@@
#include "ardour/ardour.h"
#include "ardour/ardour.h"
+#include <widgets/pane.h>
+
#include "ardour_window.h"
#include "processor_box.h"
#include "ardour_window.h"
#include "processor_box.h"
-#include "
route_
processor_selection.h"
+#include "processor_selection.h"
#include "latency_gui.h"
namespace ARDOUR {
#include "latency_gui.h"
namespace ARDOUR {
@@
-57,7
+58,7
@@
class IOSelector;
class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
{
class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
{
-
public:
+public:
RouteParams_UI ();
~RouteParams_UI();
RouteParams_UI ();
~RouteParams_UI();
@@
-65,38
+66,27
@@
class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
void session_going_away ();
PluginSelector* plugin_selector() { return _plugin_selector; }
void session_going_away ();
PluginSelector* plugin_selector() { return _plugin_selector; }
- private:
- Gtk::HBox global_hpacker;
- Gtk::VBox global_vpacker;
- Gtk::ScrolledWindow scroller;
- Gtk::EventBox scroller_base;
- Gtk::HBox scroller_hpacker;
- Gtk::VBox mixer_scroller_vpacker;
-
+private:
Gtk::VBox list_vpacker;
Gtk::VBox list_vpacker;
- Gtk::Label route_list_button_label;
- Gtk::Button route_list_button;
Gtk::ScrolledWindow route_select_scroller;
Gtk::Notebook notebook;
Gtk::ScrolledWindow route_select_scroller;
Gtk::Notebook notebook;
- Gtk::Frame input_frame;
- Gtk::Frame output_frame;
-
Gtk::HPaned
redir_hpane;
+ Gtk::Frame input_frame;
+ Gtk::Frame output_frame;
+
ArdourWidgets::HPane
redir_hpane;
- Gtk::Frame route_select_frame;
+ Gtk::Frame route_select_frame;
Gtk::HBox route_hpacker;
Gtk::VBox route_vpacker;
ProcessorBox* insert_box;
Gtk::HBox route_hpacker;
Gtk::VBox route_vpacker;
ProcessorBox* insert_box;
- Gtk::HPaned list_hpane;
-
- Gtk::HPaned right_hpane;
+ ArdourWidgets::HPane list_hpane;
-
Gtk::Frame route_choice_fram
e;
+
ArdourWidgets::HPane right_hpan
e;
- Gtk::Frame route_param_frame;
+ Gtk::Frame route_param_frame;
Gtk::VBox choice_vpacker;
Gtk::VBox choice_vpacker;
@@
-123,10
+113,11
@@
class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
IOSelector * _output_iosel;
PluginSelector *_plugin_selector;
IOSelector * _output_iosel;
PluginSelector *_plugin_selector;
-
RouteProcessorSelection _rr
_selection;
+
ProcessorSelection _p
_selection;
boost::shared_ptr<ARDOUR::Route> _route;
PBD::ScopedConnection _route_processors_connection;
boost::shared_ptr<ARDOUR::Route> _route;
PBD::ScopedConnection _route_processors_connection;
+ PBD::ScopedConnectionList route_connections;
boost::shared_ptr<ARDOUR::Processor> _processor;
PBD::ScopedConnection _processor_going_away_connection;
boost::shared_ptr<ARDOUR::Processor> _processor;
PBD::ScopedConnection _processor_going_away_connection;
@@
-163,13
+154,14
@@
class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route> route);
void route_removed (boost::weak_ptr<ARDOUR::Route> route);
void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route> route);
void route_removed (boost::weak_ptr<ARDOUR::Route> route);
+ void map_frozen ();
void route_selected();
//void route_unselected (gint row, gint col, GdkEvent *ev);
void route_selected();
//void route_unselected (gint row, gint col, GdkEvent *ev);
- void setup_io_
fram
es();
- void cleanup_io_
fram
es();
+ void setup_io_
sampl
es();
+ void cleanup_io_
sampl
es();
void cleanup_view(bool stopupdate = true);
void cleanup_latency_frame ();
void setup_latency_frame ();
void cleanup_view(bool stopupdate = true);
void cleanup_latency_frame ();
void setup_latency_frame ();