projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
push2:small logic fix for destructor, mostly to ensure that the track_mix layout...
[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 c09d3c65cd4ea2b8aa794b8b612ce34fe7b4e75d..83ddf27110f937275159bd926b57745233279c7b 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,8
+36,9
@@
#include "ardour/ardour.h"
#include "ardour/ardour.h"
-#include "io_selector.h"
-#include "ardour_dialog.h"
+#include <gtkmm2ext/pane.h>
+
+#include "ardour_window.h"
#include "processor_box.h"
#include "route_processor_selection.h"
#include "latency_gui.h"
#include "processor_box.h"
#include "route_processor_selection.h"
#include "latency_gui.h"
@@
-54,8
+54,9
@@
namespace ARDOUR {
}
class PluginSelector;
}
class PluginSelector;
+class IOSelector;
-class RouteParams_UI : public Ardour
Dialog
, public PBD::ScopedConnectionList
+class RouteParams_UI : public Ardour
Window
, public PBD::ScopedConnectionList
{
public:
RouteParams_UI ();
{
public:
RouteParams_UI ();
@@
-63,25
+64,16
@@
class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
void set_session (ARDOUR::Session*);
void session_going_away ();
void set_session (ARDOUR::Session*);
void session_going_away ();
- PluginSelector*
plugin_selector() { return _plugin_selector; }
+ PluginSelector* plugin_selector() { return _plugin_selector; }
private:
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;
-
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::Frame input_frame;
Gtk::Frame output_frame;
Gtk::ScrolledWindow route_select_scroller;
Gtk::Notebook notebook;
Gtk::Frame input_frame;
Gtk::Frame output_frame;
- Gtk
::HPaned
redir_hpane;
+ Gtk
mm2ext::HPane
redir_hpane;
Gtk::Frame route_select_frame;
Gtk::Frame route_select_frame;
@@
-90,11
+82,9
@@
class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
ProcessorBox* insert_box;
ProcessorBox* insert_box;
- Gtk::HPaned list_hpane;
-
- Gtk::HPaned right_hpane;
+ Gtkmm2ext::HPane list_hpane;
- Gtk
::Frame route_choice_fram
e;
+ Gtk
mm2ext::HPane right_hpan
e;
Gtk::Frame route_param_frame;
Gtk::Frame route_param_frame;
@@
-123,10
+113,11
@@
class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
IOSelector * _output_iosel;
PluginSelector *_plugin_selector;
IOSelector * _output_iosel;
PluginSelector *_plugin_selector;
- Route
Redirect
Selection _rr_selection;
+ Route
Processor
Selection _rr_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;
@@
-150,7
+141,7
@@
class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
add(text);
add(route);
}
add(text);
add(route);
}
- Gtk::TreeModelColumn<
Glib::u
string> text;
+ Gtk::TreeModelColumn<
std::
string> text;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
};
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
};
@@
-161,8
+152,9
@@
class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
void add_routes (ARDOUR::RouteList&);
void add_routes (ARDOUR::RouteList&);
- void route_
name_changed (
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 route_removed (boost::weak_ptr<ARDOUR::Route> route);
+ void map_frozen ();
void route_selected();
void route_selected();