smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Revert ongoing SessionDialog changes for 5.11 release."

Browse source 
This reverts commit bd40b9132c.
This commit is contained in:
Robin Gareus 2017-08-16 05:02:26 +02:00
parent bd40b9132c
commit 24cb141aa6
5 changed files with 269 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

101
gtk2_ardour/session_dialog.h
View file

@ -30,6 +30,7 @@
#include <gtkmm/radiobutton.h>
#include <gtkmm/filechooserbutton.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/textview.h>
#include <gtkmm/treeview.h>
#include <gtkmm/treestore.h>
#include <gtkmm/checkbutton.h>
@ -58,24 +59,10 @@ public:
std::string session_name (bool& should_be_new);
std::string session_folder ();
bool use_session_template();
bool use_session_template() const;
std::string session_template_name();
// advanced session options
bool create_master_bus() const;
int master_channel_count() const;
bool connect_inputs() const;
bool limit_inputs_used_for_connection() const;
int input_limit_count() const;
bool connect_outputs() const;
bool limit_outputs_used_for_connection() const;
int output_limit_count() const;
bool connect_outs_to_master() const;
bool connect_outs_to_physical() const;
uint32_t master_channel_count();
void set_provided_session(const std::string& session_name, const std::string& session_path) {
_provided_session_name = session_name;
@ -165,92 +152,42 @@ private:
SessionTemplateColumns () {
add (name);
add (path);
add (desc);
add (description);
add (created_with);
}
Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> path;
Gtk::TreeModelColumn<std::string> desc;
Gtk::TreeModelColumn<std::string> description;
Gtk::TreeModelColumn<std::string> created_with;
};
SessionTemplateColumns session_template_columns;
Glib::RefPtr<Gtk::ListStore> template_model;
Gtk::ComboBox template_chooser;
Glib::RefPtr<Gtk::TreeStore> template_model;
Gtk::TreeView template_chooser;
Gtk::ScrolledWindow template_scroller;
void template_row_selected ();
Gtk::TextView template_desc;
Gtk::Frame template_desc_frame;
Gtk::VBox session_new_vbox;
Gtk::VBox session_existing_vbox;
Gtk::Expander more_new_session_options_button;
Gtk::CheckButton use_template_button;
std::string load_template_override;
void template_checkbox_toggled ();
void more_new_session_options_button_clicked();
void new_name_changed ();
void new_name_activated ();
void populate_session_templates ();
/* more options for new sessions */
Gtk::VBox more_options_vbox;
Gtk::Label chan_count_label_1;
Gtk::Label chan_count_label_3;
Gtk::Label chan_count_label_4;
Gtk::Table advanced_table;
Gtk::HBox input_port_limit_hbox;
Gtk::VBox input_port_vbox;
Gtk::Table input_table;
Gtk::HBox input_hbox;
Gtk::Label bus_label;
Gtk::Frame bus_frame;
Gtk::Table bus_table;
Gtk::HBox bus_hbox;
Gtk::Label input_label;
Gtk::Frame input_frame;
Gtk::HBox output_port_limit_hbox;
Gtk::VBox output_port_vbox;
Gtk::VBox output_conn_vbox;
Gtk::VBox output_vbox;
Gtk::HBox output_hbox;
Gtk::Label output_label;
Gtk::Frame output_frame;
Gtk::VBox advanced_vbox;
Gtk::Label advanced_label;
Gtk::CheckButton _create_master_bus;
Gtk::SpinButton _master_bus_channel_count;
Gtk::CheckButton _connect_inputs;
Gtk::CheckButton _limit_input_ports;
Gtk::SpinButton _input_limit_count;
Gtk::CheckButton _connect_outputs;
Gtk::CheckButton _limit_output_ports;
Gtk::SpinButton _output_limit_count;
Gtk::RadioButtonGroup connect_outputs_group;
Gtk::RadioButton _connect_outputs_to_master;
Gtk::RadioButton _connect_outputs_to_physical;
Gtk::Adjustment _output_limit_count_adj;
Gtk::Adjustment _input_limit_count_adj;
Gtk::Adjustment _master_bus_channel_count_adj;
void connect_inputs_clicked ();
void connect_outputs_clicked ();
void limit_inputs_clicked ();
void limit_outputs_clicked ();
void master_bus_button_clicked ();
void setup_more_options_box ();
/* --disable plugins UI */
Gtk::CheckButton _disable_plugins;
void disable_plugins_clicked ();
/* meta-template */
uint32_t meta_master_bus_profile (std::string script) const;
/* always there */
Glib::RefPtr<Pango::Layout> layout;