projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak/fix splash screen event-loop
[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 e9fca333abe78f26a4ad68b15b954c113367109e..2f04590c2b2e231e1a650c2c8287147ccd2f6774 100644
(file)
--- a/
gtk2_ardour/route_params_ui.h
+++ b/
gtk2_ardour/route_params_ui.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-27,21
+27,20
@@
#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>
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
+#include "pbd/signals.h"
-#include <ardour/ardour.h>
-#include <ardour/io.h>
-#include <ardour/io_processor.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 "processor_box.h"
-#include "
route_
processor_selection.h"
+#include "processor_selection.h"
#include "latency_gui.h"
namespace ARDOUR {
#include "latency_gui.h"
namespace ARDOUR {
@@
-55,110
+54,94
@@
namespace ARDOUR {
}
class PluginSelector;
}
class PluginSelector;
+class IOSelector;
-class RouteParams_UI : public Ardour
Dialog
+class RouteParams_UI : public Ardour
Window, public PBD::ScopedConnectionList
{
public:
RouteParams_UI ();
~RouteParams_UI();
{
public:
RouteParams_UI ();
~RouteParams_UI();
- void set_session (ARDOUR::Session
*);
- void session_go
ne
();
- PluginSelector
& plugin_selector() { return *
_plugin_selector; }
+ void set_session (ARDOUR::Session*);
+ void session_go
ing_away
();
+ 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::ScrolledWindow route_select_scroller;
Gtk::Notebook notebook;
- Gtk::Frame input_frame;
- Gtk::Frame output_frame;
- Gtk::HPaned pre_redir_hpane;
- Gtk::HPaned post_redir_hpane;
+ Gtk::Frame input_frame;
+ Gtk::Frame output_frame;
+ Gtkmm2ext::HPane redir_hpane;
- Gtk::Frame route_select_frame;
+ Gtk::Frame route_select_frame;
Gtk::HBox route_hpacker;
Gtk::VBox route_vpacker;
Gtk::HBox route_hpacker;
Gtk::VBox route_vpacker;
- ProcessorBox * pre_insert_box;
- ProcessorBox * post_insert_box;
-
- Gtk::HPaned list_hpane;
+ ProcessorBox* insert_box;
+
+ Gtkmm2ext::HPane list_hpane;
- Gtk::HPaned right_hpane;
-
- Gtk::Frame route_choice_frame;
+ Gtkmm2ext::HPane right_hpane;
- Gtk::Frame route_param_frame;
+ Gtk::Frame route_param_frame;
Gtk::VBox choice_vpacker;
Gtk::VBox choice_vpacker;
-
+
Gtk::Frame latency_frame;
Gtk::VBox latency_packer;
Gtk::HButtonBox latency_button_box;
Gtk::Button latency_apply_button;
LatencyGUI* latency_widget;
Gtk::Label delay_label;
Gtk::Frame latency_frame;
Gtk::VBox latency_packer;
Gtk::HButtonBox latency_button_box;
Gtk::Button latency_apply_button;
LatencyGUI* latency_widget;
Gtk::Label delay_label;
- sigc::connection latency_conn;
-
sigc::connection delay_conn
;
- sigc::connection
latency_apply_con
n;
+
+
PBD::ScopedConnectionList latency_connections
;
+ sigc::connection
latency_click_connectio
n;
void refresh_latency ();
void refresh_latency ();
-
+
Gtk::ToggleButton input_button;
Gtk::ToggleButton output_button;
Gtk::Label track_input_label;
Gtk::ToggleButton input_button;
Gtk::ToggleButton output_button;
Gtk::Label track_input_label;
-
+
Gtk::Label title_label;
Gtk::Label title_label;
-
- Gtk::Container * _active_pre_view;
- Gtk::Container * _active_post_view;
+
+ Gtk::Container * _active_view;
IOSelector * _input_iosel;
IOSelector * _output_iosel;
IOSelector * _input_iosel;
IOSelector * _output_iosel;
-
+
PluginSelector *_plugin_selector;
PluginSelector *_plugin_selector;
-
RouteRedirectSelection _rr
_selection;
+
ProcessorSelection _p
_selection;
boost::shared_ptr<ARDOUR::Route> _route;
boost::shared_ptr<ARDOUR::Route> _route;
- sigc::connection _route_conn;
- sigc::connection _route_ds_conn;
+ 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> _pre_processor;
- sigc::connection _pre_plugin_conn;
- boost::shared_ptr<ARDOUR::Processor> _post_processor;
- sigc::connection _post_plugin_conn;
-
-
enum ConfigView {
NO_CONFIG_VIEW = 0,
INPUT_CONFIG_VIEW,
OUTPUT_CONFIG_VIEW,
enum ConfigView {
NO_CONFIG_VIEW = 0,
INPUT_CONFIG_VIEW,
OUTPUT_CONFIG_VIEW,
- PLUGIN_CONFIG_VIEW,
+ PLUGIN_CONFIG_VIEW,
PORTINSERT_CONFIG_VIEW,
SEND_CONFIG_VIEW
};
PORTINSERT_CONFIG_VIEW,
SEND_CONFIG_VIEW
};
-
+
ConfigView _current_view;
/* treeview */
ConfigView _current_view;
/* treeview */
- struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
+ struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
RouteDisplayModelColumns() {
add(text);
add(route);
}
RouteDisplayModelColumns() {
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;
};
@@
-166,11
+149,12
@@
class RouteParams_UI : public ArdourDialog
Gtk::TreeView route_display;
Glib::RefPtr<Gtk::ListStore> route_display_model;
Gtk::TreeView route_display;
Glib::RefPtr<Gtk::ListStore> route_display_model;
-
- void add_routes (ARDOUR::Session::RouteList&);
- void route_name_changed (boost::shared_ptr<ARDOUR::Route> route);
- void route_removed (boost::shared_ptr<ARDOUR::Route> route);
+ void add_routes (ARDOUR::RouteList&);
+
+ 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_selected();
@@
-178,29
+162,28
@@
class RouteParams_UI : public ArdourDialog
void setup_io_frames();
void cleanup_io_frames();
void setup_io_frames();
void cleanup_io_frames();
- void cleanup_pre_view(bool stopupdate = true);
- void cleanup_post_view(bool stopupdate = true);
+ void cleanup_view(bool stopupdate = true);
void cleanup_latency_frame ();
void setup_latency_frame ();
void cleanup_latency_frame ();
void setup_latency_frame ();
-
- void processors_changed ();
-
+
+ void processors_changed (
ARDOUR::RouteProcessorChange
);
+
void setup_processor_boxes();
void cleanup_processor_boxes();
void setup_processor_boxes();
void cleanup_processor_boxes();
- void redirect_selected (boost::shared_ptr<ARDOUR::Processor>
, ARDOUR::Placement
);
-
+ void redirect_selected (boost::shared_ptr<ARDOUR::Processor>);
+
void plugin_going_away (ARDOUR::Placement);
void plugin_going_away (ARDOUR::Placement);
- void
redirect_going_away (boost::shared
_ptr<ARDOUR::Processor>);
+ void
processor_going_away (boost::weak
_ptr<ARDOUR::Processor>);
gint edit_input_configuration (GdkEventButton *ev);
gint edit_output_configuration (GdkEventButton *ev);
gint edit_input_configuration (GdkEventButton *ev);
gint edit_output_configuration (GdkEventButton *ev);
-
+
void update_routeinfo (ARDOUR::Route * route);
void update_routeinfo (ARDOUR::Route * route);
-
+
Gtk::Menu *track_menu;
void show_track_menu();
Gtk::Menu *track_menu;
void show_track_menu();
-
+
void update_title ();
//void unselect_all_redirects ();
void update_title ();
//void unselect_all_redirects ();