Add missing files from last commit, as per.
authorCarl Hetherington <carl@carlh.net>
Thu, 14 May 2009 00:15:38 +0000 (00:15 +0000)
committerCarl Hetherington <carl@carlh.net>
Thu, 14 May 2009 00:15:38 +0000 (00:15 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@5076 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/rc_option_editor.cc [new file with mode: 0644]
gtk2_ardour/rc_option_editor.h [new file with mode: 0644]
libs/ardour/ardour/configuration_vars.h [deleted file]
libs/ardour/ardour/rc_configuration.h [new file with mode: 0644]
libs/ardour/ardour/rc_configuration_vars.h [new file with mode: 0644]
libs/ardour/ardour/session_configuration.h [new file with mode: 0644]
libs/ardour/ardour/session_configuration_vars.h [new file with mode: 0644]
libs/ardour/rc_configuration.cc [new file with mode: 0644]
libs/ardour/session_configuration.cc [new file with mode: 0644]

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
new file mode 100644 (file)
index 0000000..90855a4
--- /dev/null
@@ -0,0 +1,1103 @@
+#include <gtkmm/liststore.h>
+#include <gtkmm/stock.h>
+#include <gtkmm/scale.h>
+#include <gtkmm2ext/utils.h>
+#include "pbd/fpu.h"
+#include "midi++/manager.h"
+#include "midi++/factory.h"
+#include "ardour/rc_configuration.h"
+#include "rc_option_editor.h"
+#include "utils.h"
+#include "midi_port_dialog.h"
+#include "sfdb_ui.h"
+#include "keyboard.h"
+#include "i18n.h"
+
+using namespace std;
+using namespace sigc;
+using namespace Gtk;
+using namespace Gtkmm2ext;
+using namespace PBD;
+using namespace ARDOUR;
+
+class MIDIPorts : public OptionEditorBox
+{
+public:
+       MIDIPorts (RCConfiguration* c)
+               : _rc_config (c),
+                 _add_port_button (Stock::ADD)
+       {
+               _store = ListStore::create (_model);
+               _view.set_model (_store);
+               _view.append_column (_("Name"), _model.name);
+               _view.append_column_editable (_("Online"), _model.online);
+               _view.append_column_editable (_("Trace input"), _model.trace_input);
+               _view.append_column_editable (_("Trace output"), _model.trace_output);
+
+               HBox* h = manage (new HBox);
+               h->set_spacing (4);
+               h->pack_start (_view, true, true);
+
+               VBox* v = manage (new VBox);
+               v->set_spacing (4);
+               v->pack_start (_add_port_button, false, false);
+               h->pack_start (*v, false, false);
+
+               _box->pack_start (*h);
+
+               Table* t = manage (new Table (2, 4));
+               t->set_spacings (12);
+
+               int n = 0;
+               Label* l = manage (new Label (_("MTC:")));
+               l->set_alignment (1, 0.5);
+               t->attach (*l, 0, 1, n, n + 1, EXPAND | FILL, FILL);
+               t->attach (_mtc_combo, 1, 2, n, n + 1, EXPAND | FILL, EXPAND | FILL);
+               ++n;
+               
+               l = manage (new Label (_("MIDI clock:")));
+               l->set_alignment (1, 0.5);
+               t->attach (*l, 0, 1, n, n + 1, FILL, FILL);
+               t->attach (_midi_clock_combo, 1, 2, n, n + 1, FILL, FILL);
+               ++n;
+
+               l = manage (new Label (_("MMC:")));
+               l->set_alignment (1, 0.5);
+               t->attach (*l, 0, 1, n, n + 1, FILL, FILL);
+               t->attach (_mmc_combo, 1, 2, n, n + 1, FILL, FILL);
+               ++n;
+
+               l = manage (new Label (_("MIDI parameter control:")));
+               l->set_alignment (1, 0.5);
+               t->attach (*l, 0, 1, n, n + 1, FILL, FILL);
+               t->attach (_mpc_combo, 1, 2, n, n + 1, FILL, FILL);
+               ++n;
+
+               _box->pack_start (*t, true, true);
+
+               ports_changed ();
+
+               _add_port_button.signal_clicked().connect (mem_fun (*this, &MIDIPorts::add_port_clicked));
+               _mtc_combo.signal_changed().connect (mem_fun (*this, &MIDIPorts::mtc_combo_changed));
+               _mmc_combo.signal_changed().connect (mem_fun (*this, &MIDIPorts::mmc_combo_changed));
+               _mpc_combo.signal_changed().connect (mem_fun (*this, &MIDIPorts::mpc_combo_changed));
+               _midi_clock_combo.signal_changed().connect (mem_fun (*this, &MIDIPorts::midi_clock_combo_changed));
+       }
+
+       void parameter_changed (string const & p)
+       {
+               if (p == "mtc-port-name") {
+                       _mtc_combo.set_active_text (_rc_config->get_mtc_port_name());
+               } else if (p == "mmc-port-name") {
+                       _mmc_combo.set_active_text (_rc_config->get_mmc_port_name());
+               } else if (p == "midi-port-name") {
+                       _mpc_combo.set_active_text (_rc_config->get_midi_port_name());
+               } else if (p == "midi-clock-port-name") {
+                       _midi_clock_combo.set_active_text (_rc_config->get_midi_clock_port_name());
+               } 
+       }
+
+       void set_state_from_config ()
+       {
+               parameter_changed ("mtc-port-name");
+               parameter_changed ("mmc-port-name");
+               parameter_changed ("midi-port-name");
+               parameter_changed ("midi-clock-port-name");
+       }
+
+       void mtc_combo_changed ()
+       {
+               _rc_config->set_mtc_port_name (_mtc_combo.get_active_text());
+       }
+
+       void mmc_combo_changed ()
+       {
+               _rc_config->set_mmc_port_name (_mmc_combo.get_active_text());
+       }
+
+       void mpc_combo_changed ()
+       {
+               _rc_config->set_midi_port_name (_mpc_combo.get_active_text());
+       }
+
+       void midi_clock_combo_changed ()
+       {
+               _rc_config->set_midi_clock_port_name (_midi_clock_combo.get_active_text());
+       }
+       
+private:
+
+       void setup_ports_combo (ComboBoxText& c)
+       {
+               c.clear_items ();
+               MIDI::Manager::PortMap const & ports = MIDI::Manager::instance()->get_midi_ports ();
+               for (MIDI::Manager::PortMap::const_iterator i = ports.begin(); i != ports.end(); ++i) {
+                       c.append_text (i->first);
+               }
+       }
+
+       void ports_changed ()
+       {
+               /* XXX: why is this coming from here? */
+               MIDI::Manager::PortMap const & ports = MIDI::Manager::instance()->get_midi_ports ();
+
+               _store->clear ();
+
+               for (MIDI::Manager::PortMap::const_iterator i = ports.begin(); i != ports.end(); ++i) {
+                       TreeModel::Row r = *_store->append ();
+                       r[_model.name] = i->first;
+                       r[_model.online] = !i->second->input()->offline();
+                       r[_model.trace_input] = i->second->input()->tracing();
+                       r[_model.trace_output] = i->second->output()->tracing();
+               }
+
+               setup_ports_combo (_mtc_combo);
+               setup_ports_combo (_midi_clock_combo);
+               setup_ports_combo (_mmc_combo);
+               setup_ports_combo (_mpc_combo);
+       }
+
+       void add_port_clicked ()
+       {
+               MidiPortDialog dialog;
+
+               dialog.set_position (WIN_POS_MOUSE);
+
+               dialog.show ();
+               
+               int const r = dialog.run ();
+
+               switch (r) {
+               case RESPONSE_ACCEPT:
+                       break;
+               default:
+                       return;
+                       break;
+               }
+
+               Glib::ustring const mode = dialog.port_mode_combo.get_active_text ();
+               string smod;
+
+               if (mode == _("input")) {
+                       smod = X_("input");
+               } else if (mode == (_("output"))) {
+                       smod = X_("output");
+               } else {
+                       smod = "duplex";
+               }
+
+               XMLNode node (X_("MIDI-port"));
+               
+               node.add_property ("tag", dialog.port_name.get_text());
+               node.add_property ("device", X_("ardour")); // XXX this can't be right for all types
+               node.add_property ("type", MIDI::PortFactory::default_port_type());
+               node.add_property ("mode", smod);
+               
+               if (MIDI::Manager::instance()->add_port (node) != 0) {
+                       ports_changed ();
+               }
+       }
+       
+       class MIDIModelColumns : public TreeModelColumnRecord
+       {
+       public:
+               MIDIModelColumns ()
+               {
+                       add (name);
+                       add (online);
+                       add (trace_input);
+                       add (trace_output);
+               }
+
+               TreeModelColumn<string> name;
+               TreeModelColumn<bool> online;
+               TreeModelColumn<bool> trace_input;
+               TreeModelColumn<bool> trace_output;
+       };
+
+       RCConfiguration* _rc_config;
+       Glib::RefPtr<ListStore> _store;
+       MIDIModelColumns _model;
+       TreeView _view;
+       Button _add_port_button;
+       ComboBoxText _mtc_combo;
+       ComboBoxText _midi_clock_combo;
+       ComboBoxText _mmc_combo;
+       ComboBoxText _mpc_combo;
+};
+
+
+class ClickOptions : public OptionEditorBox
+{
+public:
+       ClickOptions (RCConfiguration* c, ArdourDialog* p)
+               : _rc_config (c),
+                 _parent (p)
+       {
+               Table* t = manage (new Table (2, 3));
+               t->set_spacings (4);
+
+               Label* l = manage (new Label (_("Click audio file:")));
+               l->set_alignment (1, 0.5);
+               t->attach (*l, 0, 1, 0, 1, FILL);
+               t->attach (_click_path_entry, 1, 2, 0, 1, FILL);
+               Button* b = manage (new Button (_("Browse...")));
+               b->signal_clicked().connect (mem_fun (*this, &ClickOptions::click_browse_clicked));
+               t->attach (*b, 2, 3, 0, 1, FILL);
+
+               l = manage (new Label (_("Click emphasis audio file:")));
+               l->set_alignment (1, 0.5);
+               t->attach (*l, 0, 1, 1, 2, FILL);
+               t->attach (_click_emphasis_path_entry, 1, 2, 1, 2, FILL);
+               b = manage (new Button (_("Browse...")));
+               b->signal_clicked().connect (mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
+               t->attach (*b, 2, 3, 1, 2, FILL);
+
+               _box->pack_start (*t, false, false);
+       }
+       
+       void parameter_changed (string const & p)
+       {
+               if (p == "click-sound") {
+                       _click_path_entry.set_text (_rc_config->get_click_sound());
+               } else if (p == "click-emphasis-sound") {
+                       _click_emphasis_path_entry.set_text (_rc_config->get_click_emphasis_sound());
+               }
+       }
+
+       void set_state_from_config ()
+       {
+               parameter_changed ("click-sound");
+               parameter_changed ("click-emphasis-sound");
+       }
+
+private:       
+
+       void click_browse_clicked ()
+       {
+               SoundFileChooser sfdb (*_parent, _("Choose Click"));
+
+               sfdb.show_all ();
+               sfdb.present ();
+               
+               if (sfdb.run () == RESPONSE_OK) {
+                       click_chosen (sfdb.get_filename());
+               }
+       }
+
+       void click_chosen (string const & path)
+       {
+               _click_path_entry.set_text (path);
+               _rc_config->set_click_sound (path);
+       }
+
+       void click_emphasis_browse_clicked ()
+       {
+               SoundFileChooser sfdb (*_parent, _("Choose Click Emphasis"));
+
+               sfdb.show_all ();
+               sfdb.present ();
+               
+               if (sfdb.run () == RESPONSE_OK) {
+                       click_emphasis_chosen (sfdb.get_filename());
+               }
+       }
+
+       void click_emphasis_chosen (string const & path)
+       {
+               _click_emphasis_path_entry.set_text (path);
+               _rc_config->set_click_emphasis_sound (path);
+       }
+
+       RCConfiguration* _rc_config;
+       ArdourDialog* _parent;
+       Entry _click_path_entry;
+       Entry _click_emphasis_path_entry;
+};
+
+class UndoOptions : public OptionEditorBox
+{
+public:
+       UndoOptions (RCConfiguration* c) :
+               _rc_config (c),
+               _limit_undo_button (_("Limit undo history to")),
+               _save_undo_button (_("Save undo history of"))
+       {
+               Table* t = new Table (2, 3);
+               t->set_spacings (4);
+
+               t->attach (_limit_undo_button, 0, 1, 0, 1, FILL);
+               _limit_undo_spin.set_range (0, 512);
+               _limit_undo_spin.set_increments (1, 10);
+               t->attach (_limit_undo_spin, 1, 2, 0, 1, FILL | EXPAND);
+               Label* l = manage (new Label (_("commands")));
+               l->set_alignment (0, 0.5);
+               t->attach (*l, 2, 3, 0, 1);
+
+               t->attach (_save_undo_button, 0, 1, 1, 2, FILL);
+               _save_undo_spin.set_range (0, 512);
+               _save_undo_spin.set_increments (1, 10);
+               t->attach (_save_undo_spin, 1, 2, 1, 2, FILL | EXPAND);
+               l = manage (new Label (_("commands")));
+               l->set_alignment (0, 0.5);
+               t->attach (*l, 2, 3, 1, 2);
+
+               _box->pack_start (*t);
+
+               _limit_undo_button.signal_toggled().connect (mem_fun (*this, &UndoOptions::limit_undo_toggled));
+               _limit_undo_spin.signal_value_changed().connect (mem_fun (*this, &UndoOptions::limit_undo_changed));
+               _save_undo_button.signal_toggled().connect (mem_fun (*this, &UndoOptions::save_undo_toggled));
+               _save_undo_spin.signal_value_changed().connect (mem_fun (*this, &UndoOptions::save_undo_changed));
+       }
+
+       void parameter_changed (string const & p)
+       {
+               if (p == "history-depth") {
+                       int32_t const d = _rc_config->get_history_depth();
+                       _limit_undo_button.set_active (d != 0);
+                       _limit_undo_spin.set_sensitive (d != 0);
+                       _limit_undo_spin.set_value (d);
+               } else if (p == "save-history") {
+                       bool const x = _rc_config->get_save_history ();
+                       _save_undo_button.set_active (x);
+                       _save_undo_spin.set_sensitive (x);
+               } else if (p == "save-history-depth") {
+                       int32_t const d = _rc_config->get_saved_history_depth();
+                       _save_undo_spin.set_value (_rc_config->get_saved_history_depth());
+               }
+       }
+
+       void set_state_from_config ()
+       {
+               parameter_changed ("save-history");
+               parameter_changed ("history-depth");
+               parameter_changed ("save-history-depth");
+       }
+
+       void limit_undo_toggled ()
+       {
+               bool const x = _limit_undo_button.get_active ();
+               _limit_undo_spin.set_sensitive (x);
+               int32_t const n = x ? 16 : 0;
+               _limit_undo_spin.set_value (n);
+               _rc_config->set_history_depth (n);
+       }
+
+       void limit_undo_changed ()
+       {
+               _rc_config->set_history_depth (_limit_undo_spin.get_value_as_int ());
+       }
+
+       void save_undo_toggled ()
+       {
+               bool const x = _save_undo_button.get_active ();
+               _rc_config->set_save_history (x);
+       }
+
+       void save_undo_changed ()
+       {
+               _rc_config->set_saved_history_depth (_save_undo_spin.get_value_as_int ());
+       }
+       
+private:
+       RCConfiguration* _rc_config;
+       CheckButton _limit_undo_button;
+       SpinButton _limit_undo_spin;
+       CheckButton _save_undo_button;
+       SpinButton _save_undo_spin;
+};
+
+
+
+static const struct {
+    const char *name;
+    guint modifier;
+} modifiers[] = {
+
+#ifdef GTKOSX
+
+       /* Command = Meta
+          Option/Alt = Mod1
+       */
+
+       { "Shift", GDK_SHIFT_MASK },
+       { "Command", GDK_META_MASK },
+       { "Control", GDK_CONTROL_MASK },
+       { "Option", GDK_MOD1_MASK },
+       { "Command-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
+       { "Command-Option", GDK_MOD1_MASK|GDK_MOD5_MASK },
+       { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD5_MASK },
+       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK },
+
+#else
+       { "Shift", GDK_SHIFT_MASK },
+       { "Control", GDK_CONTROL_MASK },
+       { "Alt (Mod1)", GDK_MOD1_MASK },
+       { "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
+       { "Control-Alt", GDK_CONTROL_MASK|GDK_MOD1_MASK },
+       { "Shift-Alt", GDK_SHIFT_MASK|GDK_MOD1_MASK },
+       { "Control-Shift-Alt", GDK_CONTROL_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK },
+       { "Mod2", GDK_MOD2_MASK },
+       { "Mod3", GDK_MOD3_MASK },
+       { "Mod4", GDK_MOD4_MASK },
+       { "Mod5", GDK_MOD5_MASK },
+#endif
+       { 0, 0 }
+};
+
+
+class KeyboardOptions : public OptionEditorBox
+{
+public:
+       KeyboardOptions () :
+                 _delete_button_adjustment (3, 1, 5),
+                 _delete_button_spin (_delete_button_adjustment),
+                 _edit_button_adjustment (3, 1, 5),
+                 _edit_button_spin (_edit_button_adjustment)
+               
+       {
+               /* internationalize and prepare for use with combos */
+
+               vector<string> dumb;
+               for (int i = 0; modifiers[i].name; ++i) {
+                       dumb.push_back (_(modifiers[i].name));
+               }
+
+               set_popdown_strings (_edit_modifier_combo, dumb);
+               _edit_modifier_combo.signal_changed().connect (mem_fun(*this, &KeyboardOptions::edit_modifier_chosen));
+
+               for (int x = 0; modifiers[x].name; ++x) {
+                       if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
+                               _edit_modifier_combo.set_active_text (_(modifiers[x].name));
+                               break;
+                       }
+               }
+
+               Table* t = manage (new Table (4, 4));
+               t->set_spacings (4);
+
+               Label* l = manage (new Label (_("Edit using:")));
+               l->set_name ("OptionsLabel");
+               l->set_alignment (1.0, 0.5);
+
+               t->attach (*l, 0, 1, 0, 1, FILL | EXPAND, FILL);
+               t->attach (_edit_modifier_combo, 1, 2, 0, 1, FILL | EXPAND, FILL);
+
+               l = manage (new Label (_("+ button")));
+               l->set_name ("OptionsLabel");
+
+               t->attach (*l, 3, 4, 0, 1, FILL | EXPAND, FILL);
+               t->attach (_edit_button_spin, 4, 5, 0, 1, FILL | EXPAND, FILL);
+
+               _edit_button_spin.set_name ("OptionsEntry");
+               _edit_button_adjustment.set_value (Keyboard::edit_button());
+               _edit_button_adjustment.signal_value_changed().connect (mem_fun(*this, &KeyboardOptions::edit_button_changed));
+
+               set_popdown_strings (_delete_modifier_combo, dumb);
+               _delete_modifier_combo.signal_changed().connect (mem_fun(*this, &KeyboardOptions::delete_modifier_chosen));
+
+               for (int x = 0; modifiers[x].name; ++x) {
+                       if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
+                               _delete_modifier_combo.set_active_text (_(modifiers[x].name));
+                               break;
+                       }
+               }
+
+               l = manage (new Label (_("Delete using:")));
+               l->set_name ("OptionsLabel");
+               l->set_alignment (1.0, 0.5);
+
+               t->attach (*l, 0, 1, 1, 2, FILL | EXPAND, FILL);
+               t->attach (_delete_modifier_combo, 1, 2, 1, 2, FILL | EXPAND, FILL);
+
+               l = manage (new Label (_("+ button")));
+               l->set_name ("OptionsLabel");
+
+               t->attach (*l, 3, 4, 1, 2, FILL | EXPAND, FILL);
+               t->attach (_delete_button_spin, 4, 5, 1, 2, FILL | EXPAND, FILL);
+
+               _delete_button_spin.set_name ("OptionsEntry");
+               _delete_button_adjustment.set_value (Keyboard::delete_button());
+               _delete_button_adjustment.signal_value_changed().connect (mem_fun(*this, &KeyboardOptions::delete_button_changed));
+
+               set_popdown_strings (_snap_modifier_combo, dumb);
+               _snap_modifier_combo.signal_changed().connect (mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
+
+               for (int x = 0; modifiers[x].name; ++x) {
+                       if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
+                               _snap_modifier_combo.set_active_text (_(modifiers[x].name));
+                               break;
+                       }
+               }
+
+               l = manage (new Label (_("Ignore snap using:")));
+               l->set_name ("OptionsLabel");
+               l->set_alignment (1.0, 0.5);
+
+               t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL);
+               t->attach (_snap_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL);
+
+               vector<string> strs;
+
+               for (map<string,string>::iterator bf = Keyboard::binding_files.begin(); bf != Keyboard::binding_files.end(); ++bf) {
+                       strs.push_back (bf->first);
+               }
+
+               set_popdown_strings (_keyboard_layout_selector, strs);
+               _keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
+               _keyboard_layout_selector.signal_changed().connect (mem_fun (*this, &KeyboardOptions::bindings_changed));
+
+               l = manage (new Label (_("Keyboard layout:")));
+               l->set_name ("OptionsLabel");
+               l->set_alignment (1.0, 0.5);
+
+               t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
+               t->attach (_keyboard_layout_selector, 1, 2, 3, 4, FILL | EXPAND, FILL);
+
+               _box->pack_start (*t, false, false);
+       }
+
+       void parameter_changed (string const & p)
+       {
+               /* XXX: these aren't really config options... */
+       }
+
+       void set_state_from_config ()
+       {
+               /* XXX: these aren't really config options... */
+       }
+
+private:
+
+       void bindings_changed ()
+       {
+               string const txt = _keyboard_layout_selector.get_active_text();
+
+               /* XXX: config...?  for all this keyboard stuff */
+               
+               for (map<string,string>::iterator i = Keyboard::binding_files.begin(); i != Keyboard::binding_files.end(); ++i) {
+                       if (txt == i->first) {
+                               if (Keyboard::load_keybindings (i->second)) {
+                                       Keyboard::save_keybindings ();
+                               }
+                       }
+               }
+       }
+
+       void edit_modifier_chosen ()
+       {
+               string const txt = _edit_modifier_combo.get_active_text();
+               
+               for (int i = 0; modifiers[i].name; ++i) {
+                       if (txt == _(modifiers[i].name)) {
+                               Keyboard::set_edit_modifier (modifiers[i].modifier);
+                               break;
+                       }
+               }
+       }
+
+       void delete_modifier_chosen ()
+       {
+               string const txt = _delete_modifier_combo.get_active_text();
+               
+               for (int i = 0; modifiers[i].name; ++i) {
+                       if (txt == _(modifiers[i].name)) {
+                               Keyboard::set_delete_modifier (modifiers[i].modifier);
+                               break;
+                       }
+               }
+       }
+       
+       void snap_modifier_chosen ()
+       {
+               string const txt = _snap_modifier_combo.get_active_text();
+               
+               for (int i = 0; modifiers[i].name; ++i) {
+                       if (txt == _(modifiers[i].name)) {
+                               Keyboard::set_snap_modifier (modifiers[i].modifier);
+                               break;
+                       }
+               }
+       }
+
+       void delete_button_changed ()
+       {
+               Keyboard::set_delete_button (_delete_button_spin.get_value_as_int());
+       }
+
+       void edit_button_changed ()
+       {
+               Keyboard::set_edit_button (_edit_button_spin.get_value_as_int());
+       }
+       
+       ComboBoxText _keyboard_layout_selector;
+       ComboBoxText _edit_modifier_combo;
+       ComboBoxText _delete_modifier_combo;
+       ComboBoxText _snap_modifier_combo;
+       Adjustment _delete_button_adjustment;
+       SpinButton _delete_button_spin;
+       Adjustment _edit_button_adjustment;
+       SpinButton _edit_button_spin;
+};
+
+class FontScalingOptions : public OptionEditorBox
+{
+public:
+       FontScalingOptions (RCConfiguration* c) :
+               _rc_config (c),
+               _dpi_adjustment (50, 50, 250, 1, 10),
+               _dpi_slider (_dpi_adjustment)
+       {
+               _dpi_adjustment.set_value (_rc_config->get_font_scale ());
+
+               Label* l = manage (new Label (_("Font scaling:")));
+               l->set_name ("OptionsLabel");
+
+               _dpi_slider.set_update_policy (UPDATE_DISCONTINUOUS);
+               HBox* h = manage (new HBox);
+               h->set_spacing (4);
+               h->pack_start (*l, false, false);
+               h->pack_start (_dpi_slider, true, true);
+
+               _box->pack_start (*h, false, false);
+
+               _dpi_adjustment.signal_value_changed().connect (mem_fun (*this, &FontScalingOptions::dpi_changed));
+       }
+
+       void parameter_changed (string const & p)
+       {
+               if (p == "font-scale") {
+                       _dpi_adjustment.set_value (_rc_config->get_font_scale() / 1024.);
+               }
+       }
+
+       void set_state_from_config ()
+       {
+               parameter_changed ("font-scale");
+       }
+       
+private:
+       
+       void dpi_changed ()
+       {
+               _rc_config->set_font_scale ((long) floor (_dpi_adjustment.get_value() * 1024));
+               /* XXX: should be triggered from the parameter changed signal */
+               reset_dpi ();
+       }
+
+       RCConfiguration* _rc_config;
+       Adjustment _dpi_adjustment;
+       HScale _dpi_slider;
+};
+
+RCOptionEditor::RCOptionEditor ()
+       : OptionEditor (Config, _("Ardour Preferences")),
+         _rc_config (Config)
+{
+       /* MISC */
+
+       add (_("Misc"), new OptionEditorHeading (_("Metering")));
+       
+       ComboOption<float>* mht = new ComboOption<float> (
+               "meter-hold",
+               _("Meter hold time"),
+               mem_fun (*_rc_config, &RCConfiguration::get_meter_hold),
+               mem_fun (*_rc_config, &RCConfiguration::set_meter_hold)
+               );
+
+       mht->add (MeterHoldOff, _("off"));
+       mht->add (MeterHoldShort, _("short"));
+       mht->add (MeterHoldMedium, _("medium"));
+       mht->add (MeterHoldLong, _("long"));
+       
+       add (_("Misc"), mht);
+
+       ComboOption<float>* mfo = new ComboOption<float> (
+               "meter-falloff",
+               _("Meter fall-off"),
+               mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff),
+               mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
+               );
+
+       mfo->add (METER_FALLOFF_OFF, _("off"));
+       mfo->add (METER_FALLOFF_SLOWEST, _("slowest"));
+       mfo->add (METER_FALLOFF_SLOW, _("slow"));
+       mfo->add (METER_FALLOFF_MEDIUM, _("medium"));
+       mfo->add (METER_FALLOFF_FAST, _("fast"));
+       mfo->add (METER_FALLOFF_FASTER, _("faster"));
+       mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
+
+       add (_("Misc"), mfo);
+
+       add (_("Misc"), new OptionEditorHeading (_("Undo")));
+       
+       add (_("Misc"), new UndoOptions (_rc_config));
+
+       add (_("Misc"), new OptionEditorHeading (_("Misc")));
+       
+       ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
+               "remote-model",
+               _("Control surface remote ID"),
+               mem_fun (*_rc_config, &RCConfiguration::get_remote_model),
+               mem_fun (*_rc_config, &RCConfiguration::set_remote_model)
+               );
+
+       rm->add (UserOrdered, _("assigned by user"));
+       rm->add (MixerOrdered, _("follows order of mixer"));
+       rm->add (EditorOrdered, _("follows order of editor"));
+
+       add (_("Misc"), rm);
+
+#ifndef GTKOSX
+       /* font scaling does nothing with GDK/Quartz */
+       add (_("Misc"), new FontScalingOptions (_rc_config));
+#endif 
+
+       add (_("Misc"),
+            new BoolOption (
+                    "verify-remove-last-capture",
+                    _("Verify removal of last capture"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_verify_remove_last_capture),
+                    mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
+                    ));
+       
+       add (_("Misc"),
+            new BoolOption (
+                    "periodic-safety-backups",
+                    _("Make periodic backups of the session file"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_periodic_safety_backups),
+                    mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
+                    ));
+
+       add (_("Misc"),
+            new BoolOption (
+                    "sync-all-route-ordering",
+                    _("Syncronise editor and mixer track order"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_sync_all_route_ordering),
+                    mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering)
+                    ));
+
+       add (_("Misc"),
+            new BoolOption (
+                    "only-copy-imported-files",
+                    _("Always copy imported files"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_only_copy_imported_files),
+                    mem_fun (*_rc_config, &RCConfiguration::set_only_copy_imported_files)
+                    ));
+
+       add (_("Misc"),
+            new BoolOption (
+                    "default-narrow_ms",
+                    _("Use narrow mixer strips"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
+                    mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
+                    ));
+
+       add (_("Misc"),
+            new BoolOption (
+                    "name-new-markers",
+                    _("Name new markers"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers),
+                    mem_fun (*_rc_config, &RCConfiguration::set_name_new_markers)
+                    ));
+
+       /* TRANSPORT */
+
+       add (_("Transport"),
+            new BoolOption (
+                    "latched-record-enable",
+                    _("Keep record-enable engaged on stop"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable),
+                    mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
+                    ));
+
+       add (_("Transport"),
+            new BoolOption (
+                    "stop-recording-on-xrun",
+                    _("Stop recording when an xrun occurs"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
+                    mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
+                    ));
+
+       add (_("Transport"),
+            new BoolOption (
+                    "create-xrun-marker",
+                    _("Create markers where xruns occur"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker),
+                    mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
+                    ));
+
+       add (_("Transport"),
+            new BoolOption (
+                    "quieten-at-speed",
+                    _("Reduce output level by 12dB during fast forward / rewind"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
+                    mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
+                    ));
+
+       add (_("Transport"),
+            new BoolOption (
+                    "stop-at-session-end",
+                    _("Stop at the end of the session"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
+                    mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
+                    ));
+
+       add (_("Transport"),
+            new BoolOption (
+                    "primary-clock-delta-edit-cursor",
+                    _("Primary clock delta to edit cursor"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_primary_clock_delta_edit_cursor),
+                    mem_fun (*_rc_config, &RCConfiguration::set_primary_clock_delta_edit_cursor)
+                    ));
+
+       add (_("Transport"),
+            new BoolOption (
+                    "secondary-clock-delta-edit-cursor",
+                    _("Secondary clock delta to edit cursor"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_secondary_clock_delta_edit_cursor),
+                    mem_fun (*_rc_config, &RCConfiguration::set_secondary_clock_delta_edit_cursor)
+                    ));
+
+       /* EDITOR */
+
+       add (_("Editor"),
+            new BoolOption (
+                    "link-region-and-track-selection",
+                    _("Link selection of regions and tracks"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_link_region_and_track_selection),
+                    mem_fun (*_rc_config, &RCConfiguration::set_link_region_and_track_selection)
+                    ));
+
+       add (_("Editor"),
+            new BoolOption (
+                    "automation-follows-regions",
+                    _("Move relevant automation when regions are moved"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_automation_follows_regions),
+                    mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
+                    ));
+
+       add (_("Editor"),
+            new BoolOption (
+                    "show-track-meters",
+                    _("Show meters on tracks in the editor"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_show_track_meters),
+                    mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters)
+                    ));
+
+       add (_("Editor"),
+            new BoolOption (
+                    "use-overlap-equivalency",
+                    _("Use overlap equivalency for regions"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency),
+                    mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency)
+                    ));
+
+       add (_("Editor"),
+            new BoolOption (
+                    "rubberbanding-snaps-to-grid",
+                    _("Make rubberband selection rectangle snap to the grid"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_rubberbanding_snaps_to_grid),
+                    mem_fun (*_rc_config, &RCConfiguration::set_rubberbanding_snaps_to_grid)
+                    ));
+
+       /* AUDIO */
+
+       add (_("Audio"), new OptionEditorHeading (_("Solo")));
+
+       ComboOption<SoloModel>* sm = new ComboOption<SoloModel> (
+               "solo-model",
+               _("Solo"),
+               mem_fun (*_rc_config, &RCConfiguration::get_solo_model),
+               mem_fun (*_rc_config, &RCConfiguration::set_solo_model)
+               );
+
+       sm->add (InverseMute, _("in place"));
+       sm->add (SoloBus, _("via bus"));
+
+       add (_("Audio"), sm);
+
+       add (_("Audio"),
+            new BoolOption (
+                    "solo-latched",
+                    _("Latched solo"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_solo_latched),
+                    mem_fun (*_rc_config, &RCConfiguration::set_solo_latched)
+                    ));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "show-solo-mutes",
+                    _("Show solo muting"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_show_solo_mutes),
+                    mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
+                    ));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "solo-mute-override",
+                    _("Override muting"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_override),
+                    mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
+                    ));
+
+       add (_("Audio"), new OptionEditorHeading (_("Monitoring")));
+
+       ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
+               "monitoring-model",
+               _("Monitoring handled by"),
+               mem_fun (*_rc_config, &RCConfiguration::get_monitoring_model),
+               mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
+               );
+
+       mm->add (HardwareMonitoring, _("JACK"));
+       mm->add (SoftwareMonitoring, _("ardour"));
+       mm->add (ExternalMonitoring, _("audio hardware"));
+
+       add (_("Audio"), mm);
+
+       add (_("Audio"),
+            new BoolOption (
+                    "tape-machine-mode",
+                    _("Tape machine mode"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_tape_machine_mode),
+                    mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
+                    ));
+
+       add (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses")));
+
+       ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
+               "input-auto-connect",
+               _("Connect track and bus inputs"),
+               mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
+               mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
+               );
+
+       iac->add (AutoConnectPhysical, _("automatically to physical inputs"));
+       iac->add (ManualConnect, _("manually"));
+
+       add (_("Audio"), iac);
+
+       ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> (
+               "output-auto-connect",
+               _("Connect track and bus outputs"),
+               mem_fun (*_rc_config, &RCConfiguration::get_output_auto_connect),
+               mem_fun (*_rc_config, &RCConfiguration::set_output_auto_connect)
+               );
+
+       oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
+       oac->add (AutoConnectMaster, _("automatically to master outputs"));
+       oac->add (ManualConnect, _("manually"));
+
+       add (_("Audio"), oac);
+
+       add (_("Audio"), new OptionEditorHeading (_("Denormals")));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "denormal-protection",
+                    _("Use DC bias to protect against denormals"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_denormal_protection),
+                    mem_fun (*_rc_config, &RCConfiguration::set_denormal_protection)
+                    ));
+
+       ComboOption<DenormalModel>* dm = new ComboOption<DenormalModel> (
+               "denormal-model",
+               _("Processor handling"),
+               mem_fun (*_rc_config, &RCConfiguration::get_denormal_model),
+               mem_fun (*_rc_config, &RCConfiguration::set_denormal_model)
+               );
+       
+       dm->add (DenormalNone, _("no processor handling"));
+       
+       FPU fpu;
+       
+       if (fpu.has_flush_to_zero()) {
+               dm->add (DenormalFTZ, _("use FlushToZero"));
+       }
+       
+       if (fpu.has_denormals_are_zero()) {
+               dm->add (DenormalDAZ, _("use DenormalsAreZero"));
+       }
+       
+       if (fpu.has_flush_to_zero() && fpu.has_denormals_are_zero()) {
+               dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZerO"));
+       }
+       
+       add (_("Audio"), dm);
+
+       add (_("Audio"), new OptionEditorHeading (_("Plugins")));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "plugins-stop-with-transport",
+                    _("Stop plugins when the transport is stopped"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport),
+                    mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
+                    ));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "do-not-record-plugins",
+                    _("Disable plugins during recording"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_do_not_record_plugins),
+                    mem_fun (*_rc_config, &RCConfiguration::set_do_not_record_plugins)
+                    ));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "new-plugins-active",
+                    _("Make new plugins active"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_new_plugins_active),
+                    mem_fun (*_rc_config, &RCConfiguration::set_new_plugins_active)
+                    ));
+
+       add (_("Audio"),
+            new BoolOption (
+                    "auto-analyse-audio",
+                    _("Enable automatic analysis of audio"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_auto_analyse_audio),
+                    mem_fun (*_rc_config, &RCConfiguration::set_auto_analyse_audio)
+                    ));
+
+       /* MIDI CONTROL */
+
+       add (_("MIDI control"), new MIDIPorts (_rc_config));
+
+       add (_("MIDI control"),
+            new SpinOption<uint8_t> (
+                    "mmc-receive-device-id",
+                    _("Inbound MMC device ID"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_mmc_receive_device_id),
+                    mem_fun (*_rc_config, &RCConfiguration::set_mmc_receive_device_id),
+                    0, 128, 1, 10
+                    ));
+
+       add (_("MIDI control"),
+            new SpinOption<uint8_t> (
+                    "mmc-send-device-id",
+                    _("Outbound MMC device ID"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_mmc_send_device_id),
+                    mem_fun (*_rc_config, &RCConfiguration::set_mmc_send_device_id),
+                    0, 128, 1, 10
+                    ));
+
+       add (_("MIDI control"),
+            new SpinOption<int32_t> (
+                    "initial-program-change",
+                    _("Initial program change"),
+                    mem_fun (*_rc_config, &RCConfiguration::get_initial_program_change),
+                    mem_fun (*_rc_config, &RCConfiguration::set_initial_program_change),
+                    -1, 65536, 1, 10
+                    ));
+
+       /* CLICK */
+
+       add (_("Click"), new ClickOptions (_rc_config, this));
+
+       /* KEYBOARD */
+
+       add (_("Keyboard"), new KeyboardOptions);
+}
+
+
diff --git a/gtk2_ardour/rc_option_editor.h b/gtk2_ardour/rc_option_editor.h
new file mode 100644 (file)
index 0000000..6ad1e1b
--- /dev/null
@@ -0,0 +1,19 @@
+#include "option_editor.h"
+
+/** @file rc_option_editor.h
+ *  @brief Editing of  options which are obtained from and written back to one of the .rc files.
+ *
+ *  This is subclassed from OptionEditor.  Simple options (e.g. boolean and simple choices)
+ *  are expressed using subclasses of Option.  More complex UI elements are represented
+ *  using individual classes subclassed rom OptionEditorBox.
+ */
+
+/** Editor for options which are obtained from and written back to one of the .rc files. */
+class RCOptionEditor : public OptionEditor
+{
+public:
+       RCOptionEditor ();
+
+private:
+       ARDOUR::RCConfiguration* _rc_config;
+};
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
deleted file mode 100644 (file)
index f49663b..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-    Copyright (C) 2000-2007 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/* IO connection */
-
-CONFIG_VARIABLE (bool, auto_connect_master, "auto-connect-master", true)
-CONFIG_VARIABLE (AutoConnectOption, output_auto_connect, "output-auto-connect", AutoConnectOption (0))
-CONFIG_VARIABLE (AutoConnectOption, input_auto_connect, "input-auto-connect", AutoConnectOption (0))
-
-CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "default")
-CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "default")
-
-/* MIDI and MIDI related */
-
-CONFIG_VARIABLE (std::string, mtc_port_name, "mtc-port-name", "default")
-CONFIG_VARIABLE (std::string, mmc_port_name, "mmc-port-name", "default")
-CONFIG_VARIABLE (std::string, midi_port_name, "midi-port-name", "default")
-CONFIG_VARIABLE (std::string, midi_clock_port_name, "midi-clock-port-name", "default")
-CONFIG_VARIABLE (bool, trace_midi_input, "trace-midi-input", false)
-CONFIG_VARIABLE (bool, trace_midi_output, "trace-midi-output", false)
-CONFIG_VARIABLE (bool, send_mtc, "send-mtc", false)
-CONFIG_VARIABLE (bool, send_mmc, "send-mmc", true)
-CONFIG_VARIABLE (bool, send_midi_clock, "send-midi-clock", false)
-CONFIG_VARIABLE (bool, mmc_control, "mmc-control", true)
-CONFIG_VARIABLE (bool, midi_feedback, "midi-feedback", false)
-CONFIG_VARIABLE (uint8_t, mmc_receive_device_id, "mmc-receive-device-id", 0)
-CONFIG_VARIABLE (uint8_t, mmc_send_device_id, "mmc-send-device-id", 0)
-CONFIG_VARIABLE (int32_t, initial_program_change, "initial-program-change", -1)
-
-/* control surfaces */
-
-CONFIG_VARIABLE (uint32_t, feedback_interval_ms,  "feedback-interval-ms", 100)
-CONFIG_VARIABLE (bool, use_tranzport,  "use-tranzport", false)
-CONFIG_VARIABLE (std::string, mackie_emulation, "mackie-emulation", "mcu")
-CONFIG_VARIABLE (RemoteModel, remote_model, "remote-model", MixerOrdered)
-
-/* disk operations */
-
-CONFIG_VARIABLE (uint32_t, minimum_disk_io_bytes,  "minimum-disk-io-bytes", 1024 * 256)
-CONFIG_VARIABLE (float, midi_readahead,  "midi-readahead", 1.0)
-CONFIG_VARIABLE (float, audio_track_buffer_seconds, "track-buffer-seconds", 5.0)
-CONFIG_VARIABLE (float, midi_track_buffer_seconds, "midi-track-buffer-seconds", 1.0)
-CONFIG_VARIABLE (uint32_t, disk_choice_space_threshold,  "disk-choice-space-threshold", 57600000)
-CONFIG_VARIABLE (SampleFormat, native_file_data_format,  "native-file-data-format", ARDOUR::FormatFloat)
-CONFIG_VARIABLE (HeaderFormat, native_file_header_format,  "native-file-header-format", ARDOUR::WAVE)
-CONFIG_VARIABLE (bool, auto_analyse_audio, "auto-analyse-audio", false)
-
-/* OSC */
-
-CONFIG_VARIABLE (uint32_t, osc_port, "osc-port", 3819)
-CONFIG_VARIABLE (bool, use_osc, "use-osc", false)
-
-/* fades, crossfades */
-
-CONFIG_VARIABLE (CrossfadeModel, xfade_model, "xfade-model", FullCrossfade)
-CONFIG_VARIABLE (bool, auto_xfade, "auto-xfade", true)
-CONFIG_VARIABLE (float, short_xfade_seconds, "short-xfade-seconds", 0.015)
-CONFIG_VARIABLE (bool, xfades_active, "xfades-active", true)
-CONFIG_VARIABLE (bool, xfades_visible, "xfades-visible", true)
-CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs,  "destructive-xfade-msecs", 2)
-CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
-CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true)
-
-/* editing related */
-
-CONFIG_VARIABLE (EditMode, edit_mode, "edit-mode", Slide)
-CONFIG_VARIABLE (LayerModel, layer_model, "layer-model", MoveAddHigher)
-CONFIG_VARIABLE (bool, link_region_and_track_selection, "link-region-and-track-selection", false)
-CONFIG_VARIABLE (std::string, keyboard_layout_name, "keyboard-layout-name", "ansi")
-CONFIG_VARIABLE (bool, automation_follows_regions, "automation-follows-regions", false)
-CONFIG_VARIABLE (bool, region_boundaries_from_selected_tracks, "region-boundaries-from-selected-tracks", true)
-CONFIG_VARIABLE (bool, region_boundaries_from_onscreen_tracks, "region-boundaries-from-onscreen_tracks", true)
-
-/* monitoring, mute, solo etc */
-
-CONFIG_VARIABLE (bool, mute_affects_pre_fader, "mute-affects-pre-fader", true)
-CONFIG_VARIABLE (bool, mute_affects_post_fader, "mute-affects-post-fader", true)
-CONFIG_VARIABLE (bool, mute_affects_control_outs, "mute-affects-control-outs", true)
-CONFIG_VARIABLE (bool, mute_affects_main_outs, "mute-affects-main-outs", true)
-CONFIG_VARIABLE (MonitorModel, monitoring_model, "monitoring-model", ExternalMonitoring)
-CONFIG_VARIABLE (SoloModel, solo_model, "solo-model", InverseMute)
-CONFIG_VARIABLE (bool, solo_latched, "solo-latched", true)
-CONFIG_VARIABLE (bool, latched_record_enable, "latched-record-enable", false)
-CONFIG_VARIABLE (bool, all_safe, "all-safe", false)
-CONFIG_VARIABLE (bool, show_solo_mutes, "show-solo-mutes", false)
-CONFIG_VARIABLE (bool, solo_mute_override, "solo-mute-override", false)
-CONFIG_VARIABLE (bool, tape_machine_mode, "tape-machine-mode", false)
-
-/* click */
-
-CONFIG_VARIABLE (bool, clicking, "clicking", false)
-CONFIG_VARIABLE (std::string, click_sound, "click-sound", "")
-CONFIG_VARIABLE (std::string, click_emphasis_sound, "click-emphasis-sound", "")
-
-/* transport control and related */
-
-CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
-CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
-CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
-CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
-CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
-CONFIG_VARIABLE (bool, plugins_stop_with_transport, "plugins-stop-with-transport", false)
-CONFIG_VARIABLE (bool, do_not_record_plugins, "do-not-record-plugins", false)
-CONFIG_VARIABLE (bool, stop_recording_on_xrun, "stop-recording-on-xrun", false)
-CONFIG_VARIABLE (bool, create_xrun_marker, "create-xrun-marker", true)
-CONFIG_VARIABLE (bool, stop_at_session_end, "stop-at-session-end", true)
-CONFIG_VARIABLE (bool, seamless_loop, "seamless-loop", false)
-CONFIG_VARIABLE (nframes_t, preroll, "preroll", 0)
-CONFIG_VARIABLE (nframes_t, postroll, "postroll", 0)
-CONFIG_VARIABLE (float, rf_speed, "rf-speed", 2.0f)
-CONFIG_VARIABLE (float, shuttle_speed_factor, "shuttle-speed-factor", 1.0f)
-CONFIG_VARIABLE (float, shuttle_speed_threshold, "shuttle-speed-threshold", 5.0f)
-CONFIG_VARIABLE (SlaveSource, slave_source, "slave-source", None)
-CONFIG_VARIABLE (ShuttleBehaviour, shuttle_behaviour, "shuttle-behaviour", Sprung)
-CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage)
-CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true)
-CONFIG_VARIABLE (bool, primary_clock_delta_edit_cursor, "primary-clock-delta-edit-cursor", false)
-CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta-edit-cursor", false)
-CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true)
-CONFIG_VARIABLE (bool, locate_while_waiting_for_sync, "locate-while-waiting-for-sync", false)
-
-/* timecode and sync */
-
-CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true)
-CONFIG_VARIABLE (SmpteFormat, smpte_format, "smpte-format", smpte_30)
-CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false)
-CONFIG_VARIABLE (bool, timecode_source_is_synced, "timecode-source-is-synced", true)
-CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f)
-
-/* metering */
-
-CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f)
-CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 27.0f)
-CONFIG_VARIABLE (nframes_t, over_length_short, "over-length-short", 2)
-CONFIG_VARIABLE (nframes_t, over_length_long, "over-length-long", 10)
-
-/* miscellany */
-
-CONFIG_VARIABLE (bool, hiding_groups_deactivates_groups, "hiding-groups-deactivates-groups", true)
-CONFIG_VARIABLE (bool, verify_remove_last_capture, "verify-remove-last-capture", true)
-CONFIG_VARIABLE (bool, no_new_session_dialog, "no-new-session-dialog", false)
-CONFIG_VARIABLE (bool, use_vst, "use-vst", true)
-CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100)
-CONFIG_VARIABLE (bool, save_history, "save-history", true)
-CONFIG_VARIABLE (int32_t, saved_history_depth, "save-history-depth", 20)
-CONFIG_VARIABLE (int32_t, history_depth, "history-depth", 20)
-CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false)
-CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true)
-CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120)
-CONFIG_VARIABLE (float, automation_interval, "automation-interval", 50)
-CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true)
-CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", true)
-CONFIG_VARIABLE (bool, new_plugins_active, "new-plugins-active", true)
-CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
-CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")
-CONFIG_VARIABLE (bool, default_narrow_ms, "default-narrow_ms", false)
-CONFIG_VARIABLE (bool, name_new_markers, "name-new-markers", false)
-CONFIG_VARIABLE (bool, rubberbanding_snaps_to_grid, "rubberbanding-snaps-to-grid", false)
-CONFIG_VARIABLE (long, font_scale, "font-scale", 102400)
-CONFIG_VARIABLE (std::string, default_session_parent_dir, "default-session-parent-dir", "~")
-
-/* denormal management */
-
-CONFIG_VARIABLE (bool, denormal_protection, "denormal-protection", false)
-CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalNone)
-
-/* BWAV */
-
-CONFIG_VARIABLE (std::string, bwf_country_code, "bwf-country-code", "US")
-CONFIG_VARIABLE (std::string, bwf_organization_code, "bwf-organization-code", "US")
-
-/* these variables have custom set() methods (e.g. path globbing) */
-
-CONFIG_VARIABLE_SPECIAL(Glib::ustring, raid_path, "raid-path", "", path_expand)
-
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
new file mode 100644 (file)
index 0000000..abf22e4
--- /dev/null
@@ -0,0 +1,92 @@
+/*
+    Copyright (C) 1999 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_rc_configuration_h__
+#define __ardour_rc_configuration_h__
+
+#include <map>
+#include <string>
+
+#include "ardour/types.h"
+#include "ardour/utils.h"
+#include "ardour/configuration.h"
+
+class XMLNode;
+
+namespace ARDOUR {
+
+class RCConfiguration : public Configuration
+{
+  public:
+       RCConfiguration();
+
+       void map_parameters (sigc::slot<void,const char*>);
+       int set_state (XMLNode const &);
+       XMLNode& get_state ();
+       XMLNode& get_variables ();
+       void set_variables (XMLNode const &);
+
+       std::map<std::string, XMLNode> midi_ports;
+
+       int load_state ();
+       int save_state ();
+
+       /// calls Stateful::*instant_xml methods using 
+       /// ARDOUR::user_config_directory for the directory argument
+       void add_instant_xml (XMLNode&);
+       XMLNode * instant_xml (const std::string& str);
+
+       XMLNode* control_protocol_state () { return _control_protocol_state; }
+
+       /* define accessor methods */
+
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+#define CONFIG_VARIABLE(Type,var,name,value) \
+        Type get_##var () const { return var.get(); } \
+        bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret;  }
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
+        Type get_##var () const { return var.get(); } \
+        bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
+#include "ardour/rc_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+
+  private:
+
+       /* declare variables */
+
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var;
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var;
+#include "ardour/rc_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+
+       XMLNode* _control_protocol_state;
+};
+
+/* XXX: rename this */
+extern RCConfiguration *Config;
+extern gain_t speed_quietning; /* see comment in configuration.cc */
+
+} // namespace ARDOUR
+
+#endif /* __ardour_configuration_h__ */
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
new file mode 100644 (file)
index 0000000..f90cde8
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+    Copyright (C) 2000-2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/* IO connection */
+
+CONFIG_VARIABLE (bool, auto_connect_master, "auto-connect-master", true)
+CONFIG_VARIABLE (AutoConnectOption, output_auto_connect, "output-auto-connect", AutoConnectOption (0))
+CONFIG_VARIABLE (AutoConnectOption, input_auto_connect, "input-auto-connect", AutoConnectOption (0))
+
+/* MIDI and MIDI related */
+
+CONFIG_VARIABLE (std::string, mtc_port_name, "mtc-port-name", "default")
+CONFIG_VARIABLE (std::string, mmc_port_name, "mmc-port-name", "default")
+CONFIG_VARIABLE (std::string, midi_port_name, "midi-port-name", "default")
+CONFIG_VARIABLE (std::string, midi_clock_port_name, "midi-clock-port-name", "default")
+CONFIG_VARIABLE (bool, trace_midi_input, "trace-midi-input", false)
+CONFIG_VARIABLE (bool, trace_midi_output, "trace-midi-output", false)
+CONFIG_VARIABLE (bool, send_mtc, "send-mtc", false)
+CONFIG_VARIABLE (bool, send_mmc, "send-mmc", true)
+CONFIG_VARIABLE (bool, send_midi_clock, "send-midi-clock", false)
+CONFIG_VARIABLE (bool, mmc_control, "mmc-control", true)
+CONFIG_VARIABLE (bool, midi_feedback, "midi-feedback", false)
+CONFIG_VARIABLE (uint8_t, mmc_receive_device_id, "mmc-receive-device-id", 0)
+CONFIG_VARIABLE (uint8_t, mmc_send_device_id, "mmc-send-device-id", 0)
+CONFIG_VARIABLE (int32_t, initial_program_change, "initial-program-change", -1)
+
+/* control surfaces */
+
+CONFIG_VARIABLE (uint32_t, feedback_interval_ms,  "feedback-interval-ms", 100)
+CONFIG_VARIABLE (bool, use_tranzport,  "use-tranzport", false)
+CONFIG_VARIABLE (std::string, mackie_emulation, "mackie-emulation", "mcu")
+CONFIG_VARIABLE (RemoteModel, remote_model, "remote-model", MixerOrdered)
+
+/* disk operations */
+
+CONFIG_VARIABLE (uint32_t, minimum_disk_io_bytes,  "minimum-disk-io-bytes", 1024 * 256)
+CONFIG_VARIABLE (float, midi_readahead,  "midi-readahead", 1.0)
+CONFIG_VARIABLE (float, audio_track_buffer_seconds, "track-buffer-seconds", 5.0)
+CONFIG_VARIABLE (float, midi_track_buffer_seconds, "midi-track-buffer-seconds", 1.0)
+CONFIG_VARIABLE (uint32_t, disk_choice_space_threshold,  "disk-choice-space-threshold", 57600000)
+CONFIG_VARIABLE (bool, auto_analyse_audio, "auto-analyse-audio", false)
+
+/* OSC */
+
+CONFIG_VARIABLE (uint32_t, osc_port, "osc-port", 3819)
+CONFIG_VARIABLE (bool, use_osc, "use-osc", false)
+
+/* editing related */
+
+CONFIG_VARIABLE (EditMode, edit_mode, "edit-mode", Slide)
+CONFIG_VARIABLE (bool, link_region_and_track_selection, "link-region-and-track-selection", false)
+CONFIG_VARIABLE (std::string, keyboard_layout_name, "keyboard-layout-name", "ansi")
+CONFIG_VARIABLE (bool, automation_follows_regions, "automation-follows-regions", false)
+CONFIG_VARIABLE (bool, region_boundaries_from_selected_tracks, "region-boundaries-from-selected-tracks", true)
+CONFIG_VARIABLE (bool, region_boundaries_from_onscreen_tracks, "region-boundaries-from-onscreen_tracks", true)
+
+/* monitoring, mute, solo etc */
+
+CONFIG_VARIABLE (bool, mute_affects_pre_fader, "mute-affects-pre-fader", true)
+CONFIG_VARIABLE (bool, mute_affects_post_fader, "mute-affects-post-fader", true)
+CONFIG_VARIABLE (bool, mute_affects_control_outs, "mute-affects-control-outs", true)
+CONFIG_VARIABLE (bool, mute_affects_main_outs, "mute-affects-main-outs", true)
+CONFIG_VARIABLE (MonitorModel, monitoring_model, "monitoring-model", ExternalMonitoring)
+CONFIG_VARIABLE (SoloModel, solo_model, "solo-model", InverseMute)
+CONFIG_VARIABLE (bool, solo_latched, "solo-latched", true)
+CONFIG_VARIABLE (bool, latched_record_enable, "latched-record-enable", false)
+CONFIG_VARIABLE (bool, all_safe, "all-safe", false)
+CONFIG_VARIABLE (bool, show_solo_mutes, "show-solo-mutes", false)
+CONFIG_VARIABLE (bool, solo_mute_override, "solo-mute-override", false)
+CONFIG_VARIABLE (bool, tape_machine_mode, "tape-machine-mode", false)
+
+/* click */
+
+CONFIG_VARIABLE (bool, clicking, "clicking", false)
+CONFIG_VARIABLE (std::string, click_sound, "click-sound", "")
+CONFIG_VARIABLE (std::string, click_emphasis_sound, "click-emphasis-sound", "")
+
+/* transport control and related */
+
+CONFIG_VARIABLE (bool, plugins_stop_with_transport, "plugins-stop-with-transport", false)
+CONFIG_VARIABLE (bool, do_not_record_plugins, "do-not-record-plugins", false)
+CONFIG_VARIABLE (bool, stop_recording_on_xrun, "stop-recording-on-xrun", false)
+CONFIG_VARIABLE (bool, create_xrun_marker, "create-xrun-marker", true)
+CONFIG_VARIABLE (bool, stop_at_session_end, "stop-at-session-end", true)
+CONFIG_VARIABLE (bool, seamless_loop, "seamless-loop", false)
+CONFIG_VARIABLE (nframes_t, preroll, "preroll", 0)
+CONFIG_VARIABLE (nframes_t, postroll, "postroll", 0)
+CONFIG_VARIABLE (float, rf_speed, "rf-speed", 2.0f)
+CONFIG_VARIABLE (float, shuttle_speed_factor, "shuttle-speed-factor", 1.0f)
+CONFIG_VARIABLE (float, shuttle_speed_threshold, "shuttle-speed-threshold", 5.0f)
+CONFIG_VARIABLE (SlaveSource, slave_source, "slave-source", None)
+CONFIG_VARIABLE (ShuttleBehaviour, shuttle_behaviour, "shuttle-behaviour", Sprung)
+CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage)
+CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true)
+CONFIG_VARIABLE (bool, primary_clock_delta_edit_cursor, "primary-clock-delta-edit-cursor", false)
+CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta-edit-cursor", false)
+CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true)
+CONFIG_VARIABLE (bool, locate_while_waiting_for_sync, "locate-while-waiting-for-sync", false)
+
+/* timecode and sync */
+
+CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true)
+CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false)
+CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f)
+
+/* metering */
+
+CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f)
+CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 27.0f)
+
+/* miscellany */
+
+CONFIG_VARIABLE (bool, hiding_groups_deactivates_groups, "hiding-groups-deactivates-groups", true)
+CONFIG_VARIABLE (bool, verify_remove_last_capture, "verify-remove-last-capture", true)
+CONFIG_VARIABLE (bool, no_new_session_dialog, "no-new-session-dialog", false)
+CONFIG_VARIABLE (bool, use_vst, "use-vst", true)
+CONFIG_VARIABLE (bool, save_history, "save-history", true)
+CONFIG_VARIABLE (int32_t, saved_history_depth, "save-history-depth", 20)
+CONFIG_VARIABLE (int32_t, history_depth, "history-depth", 20)
+CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false)
+CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true)
+CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120)
+CONFIG_VARIABLE (float, automation_interval, "automation-interval", 50)
+CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true)
+CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", true)
+CONFIG_VARIABLE (bool, new_plugins_active, "new-plugins-active", true)
+CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
+CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")
+CONFIG_VARIABLE (bool, default_narrow_ms, "default-narrow_ms", false)
+CONFIG_VARIABLE (bool, name_new_markers, "name-new-markers", false)
+CONFIG_VARIABLE (bool, rubberbanding_snaps_to_grid, "rubberbanding-snaps-to-grid", false)
+CONFIG_VARIABLE (long, font_scale, "font-scale", 102400)
+CONFIG_VARIABLE (std::string, default_session_parent_dir, "default-session-parent-dir", "~")
+
+/* denormal management */
+
+CONFIG_VARIABLE (bool, denormal_protection, "denormal-protection", false)
+CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalNone)
+
diff --git a/libs/ardour/ardour/session_configuration.h b/libs/ardour/ardour/session_configuration.h
new file mode 100644 (file)
index 0000000..138702a
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2009 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_session_configuration_h__
+#define __ardour_session_configuration_h__
+
+#include "ardour/configuration.h"
+
+namespace ARDOUR {
+
+class SessionConfiguration : public Configuration
+{
+public:
+       SessionConfiguration ();
+
+       void map_parameters (sigc::slot<void, const char*>);
+       int set_state (XMLNode const &);
+       XMLNode& get_state ();
+       XMLNode& get_variables ();
+       void set_variables (XMLNode const &);
+
+       /* define accessor methods */
+
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+#define CONFIG_VARIABLE(Type,var,name,value) \
+        Type get_##var () const { return var.get(); } \
+        bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret;  }
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
+        Type get_##var () const { return var.get(); } \
+        bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
+#include "ardour/session_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+
+  private:
+
+       /* declare variables */
+
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var;
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var;
+#include "ardour/session_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+
+       int foo;
+};
+
+}
+       
+#endif
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
new file mode 100644 (file)
index 0000000..d99fc03
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+    Copyright (C) 2009 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+CONFIG_VARIABLE (CrossfadeModel, xfade_model, "xfade-model", FullCrossfade)
+CONFIG_VARIABLE (bool, auto_xfade, "auto-xfade", true)
+CONFIG_VARIABLE (float, short_xfade_seconds, "short-xfade-seconds", 0.015)
+CONFIG_VARIABLE (bool, xfades_active, "xfades-active", true)
+CONFIG_VARIABLE (bool, xfades_visible, "xfades-visible", true)
+CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs,  "destructive-xfade-msecs", 2)
+CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
+CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true)
+CONFIG_VARIABLE (SampleFormat, native_file_data_format,  "native-file-data-format", ARDOUR::FormatFloat)
+CONFIG_VARIABLE (HeaderFormat, native_file_header_format,  "native-file-header-format", ARDOUR::WAVE)
+CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
+CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
+CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
+CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
+CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
+CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100)
+CONFIG_VARIABLE (SmpteFormat, smpte_format, "smpte-format", smpte_30)
+CONFIG_VARIABLE_SPECIAL(Glib::ustring, raid_path, "raid-path", "", path_expand)
+CONFIG_VARIABLE (std::string, bwf_country_code, "bwf-country-code", "US")
+CONFIG_VARIABLE (std::string, bwf_organization_code, "bwf-organization-code", "US")
+CONFIG_VARIABLE (bool, end_marker_is_free, "end-marker-is-free", true)
+CONFIG_VARIABLE (LayerModel, layer_model, "layer-model", MoveAddHigher)
+CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "default")
+CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "default")
+CONFIG_VARIABLE (bool, timecode_source_is_synced, "timecode-source-is-synced", true)
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
new file mode 100644 (file)
index 0000000..70c4b78
--- /dev/null
@@ -0,0 +1,319 @@
+/*
+    Copyright (C) 1999-2006 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <unistd.h>
+#include <cstdio> /* for snprintf, grrr */
+
+#include <glib.h>  
+#include <glib/gstdio.h> /* for g_stat() */
+#include <glibmm/miscutils.h>
+
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
+#include "pbd/filesystem.h"
+#include "pbd/file_utils.h"
+
+#include "midi++/manager.h"
+
+#include "ardour/ardour.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/control_protocol_manager.h"
+#include "ardour/filesystem_paths.h"
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace std;
+using namespace PBD;
+
+/* this is global so that we do not have to indirect through an object pointer
+   to reference it.
+*/
+
+namespace ARDOUR {
+    float speed_quietning = 0.251189; // -12dB reduction for ffwd or rewind
+}
+
+RCConfiguration::RCConfiguration ()
+       :
+/* construct variables */
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
+#include "ardour/rc_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+       _control_protocol_state (0)
+{
+}
+
+int
+RCConfiguration::load_state ()
+{
+       bool found = false;
+
+       sys::path system_rc_file;
+       struct stat statbuf;
+
+       /* load system configuration first */
+       
+       if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
+                       "ardour_system.rc", system_rc_file) )
+       {
+               XMLTree tree;
+               found = true;
+
+               string rcfile = system_rc_file.to_string();
+
+               /* stupid XML Parser hates empty files */
+               
+               if (g_stat (rcfile.c_str(), &statbuf)) {
+                       return -1;
+               }
+
+               if (statbuf.st_size != 0) {
+                       cerr << string_compose (_("Loading system configuration file %1"), rcfile) << endl;
+                       
+                       if (!tree.read (rcfile.c_str())) {
+                               error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
+                               return -1;
+                       }
+                       
+                       if (set_state (*tree.root())) {
+                               error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                               return -1;
+                       }
+               } else {
+                       error << _("your system Ardour configuration file is empty. This probably means that there as an error installing Ardour") << endmsg;
+               }
+       }
+
+       /* now load configuration file for user */
+
+       sys::path user_rc_file;
+
+       if (find_file_in_search_path (ardour_search_path() + user_config_directory(),
+                       "ardour.rc", user_rc_file))
+       {
+               XMLTree tree;
+               found = true;
+
+               string rcfile = user_rc_file.to_string();
+
+               /* stupid XML parser hates empty files */
+
+               if (g_stat (rcfile.c_str(), &statbuf)) {
+                       return -1;
+               }
+
+               if (statbuf.st_size != 0) {
+                       cerr << string_compose (_("Loading user configuration file %1"), rcfile) << endl;
+                       
+                       if (!tree.read (rcfile)) {
+                               error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
+                               return -1;
+                       }
+                       
+                       if (set_state (*tree.root())) {
+                               error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                               return -1;
+                       }
+               } else {
+                       warning << _("your Ardour configuration file is empty. This is not normal.") << endmsg;
+               }       
+       }
+
+       if (!found)
+               error << "Ardour: could not find configuration file (ardour.rc), canvas will look broken." << endmsg;
+
+       return 0;
+}
+
+int
+RCConfiguration::save_state()
+{
+       XMLTree tree;
+
+       try
+       {
+               sys::create_directories (user_config_directory ());
+       }
+       catch (const sys::filesystem_error& ex)
+       {
+               error << "Could not create user configuration directory" << endmsg;
+               return -1;
+       }
+       
+       sys::path rcfile_path(user_config_directory());
+
+       rcfile_path /= "ardour.rc";
+       const string rcfile = rcfile_path.to_string();
+
+       // this test seems bogus?
+       if (rcfile.length()) {
+               tree.set_root (&get_state());
+               if (!tree.write (rcfile.c_str())){
+                       error << string_compose (_("Config file %1 not saved"), rcfile) << endmsg;
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
+void
+RCConfiguration::add_instant_xml(XMLNode& node)
+{
+       Stateful::add_instant_xml (node, user_config_directory ());
+}
+
+XMLNode*
+RCConfiguration::instant_xml(const string& node_name)
+{
+       return Stateful::instant_xml (node_name, user_config_directory ());
+}
+
+
+XMLNode&
+RCConfiguration::get_state ()
+{
+       XMLNode* root;
+       LocaleGuard lg (X_("POSIX"));
+
+       root = new XMLNode("Ardour");
+
+       MIDI::Manager::PortMap::const_iterator i;
+       const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports();
+       
+       for (i = ports.begin(); i != ports.end(); ++i) {
+               root->add_child_nocopy(i->second->get_state());
+       }
+       
+       root->add_child_nocopy (get_variables ());
+       
+       if (_extra_xml) {
+               root->add_child_copy (*_extra_xml);
+       }
+       
+       root->add_child_nocopy (ControlProtocolManager::instance().get_state());
+       
+       return *root;
+}
+
+XMLNode&
+RCConfiguration::get_variables ()
+{
+       XMLNode* node;
+       LocaleGuard lg (X_("POSIX"));
+
+       node = new XMLNode ("Config");
+
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(type,var,Name,value) \
+       var.add_to_node (*node);
+#define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
+       var.add_to_node (*node);
+#include "ardour/rc_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+
+       return *node;
+}
+
+int
+RCConfiguration::set_state (const XMLNode& root)
+{
+       if (root.name() != "Ardour") {
+               return -1;
+       }
+
+       XMLNodeList nlist = root.children();
+       XMLNodeConstIterator niter;
+       XMLNode *node;
+
+       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+
+               node = *niter;
+
+               if (node->name() == "MIDI-port") {
+
+                       try {
+
+                               MIDI::Port::Descriptor desc (*node);
+                               map<string,XMLNode>::iterator x;
+                               if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) {
+                                       midi_ports.erase (x);
+                               }
+                               midi_ports.insert (pair<string,XMLNode>(desc.tag,*node));
+                       }
+
+                       catch (failed_constructor& err) {
+                               warning << _("ill-formed MIDI port specification in ardour rcfile (ignored)") << endmsg;
+                       }
+
+               } else if (node->name() == "Config") {
+                       
+                       set_variables (*node);
+                       
+               } else if (node->name() == "Extra") {
+                       _extra_xml = new XMLNode (*node);
+
+               } else if (node->name() == ControlProtocolManager::state_node_name) {
+                       _control_protocol_state = new XMLNode (*node);
+               }
+       }
+
+       Diskstream::set_disk_io_chunk_frames (minimum_disk_io_bytes.get() / sizeof (Sample));
+
+       return 0;
+}
+
+void
+RCConfiguration::set_variables (const XMLNode& node)
+{
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(type,var,name,value) \
+       if (var.set_from_node (node)) { \
+               ParameterChanged (name);                  \
+       }
+#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) \
+       if (var.set_from_node (node)) {    \
+               ParameterChanged (name);                     \
+       }
+
+#include "ardour/rc_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+       
+}
+void
+RCConfiguration::map_parameters (sigc::slot<void,const char*> theSlot)
+{
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(type,var,name,value)                 theSlot (name);
+#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name);
+#include "ardour/rc_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+}
diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
new file mode 100644 (file)
index 0000000..00c95d2
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+    Copyright (C) 2009 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "ardour/types.h"
+#include "ardour/utils.h"
+#include "ardour/session_configuration.h"
+#include "ardour/ardour.h"
+#include "i18n.h"
+
+using namespace ARDOUR;
+
+SessionConfiguration::SessionConfiguration ()
+       :
+/* construct variables */
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
+#include "ardour/session_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+       foo (0)
+{
+       
+}
+
+XMLNode&
+SessionConfiguration::get_state ()
+{
+       XMLNode* root;
+       LocaleGuard lg (X_("POSIX"));
+
+       root = new XMLNode ("Ardour");
+       root->add_child_nocopy (get_variables ());
+
+       return *root;
+}
+
+
+XMLNode&
+SessionConfiguration::get_variables ()
+{
+       XMLNode* node;
+       LocaleGuard lg (X_("POSIX"));
+
+       node = new XMLNode ("Config");
+
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(type,var,Name,value) \
+       var.add_to_node (*node);
+#define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
+       var.add_to_node (*node);
+#include "ardour/session_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+
+       return *node;
+}
+
+
+int
+SessionConfiguration::set_state (XMLNode const& root)
+{
+       if (root.name() != "Ardour") {
+               return -1;
+       }
+
+       for (XMLNodeConstIterator i = root.children().begin(); i != root.children().end(); ++i) {
+               if ((*i)->name() == "Config") {
+                       set_variables (**i);
+               }
+       }
+
+       return 0;
+}
+
+void
+SessionConfiguration::set_variables (const XMLNode& node)
+{
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(type,var,name,value) \
+       if (var.set_from_node (node)) { \
+               ParameterChanged (name);                  \
+       }
+#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) \
+       if (var.set_from_node (node)) {    \
+               ParameterChanged (name);                     \
+       }
+
+#include "ardour/session_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+       
+}
+void
+SessionConfiguration::map_parameters (sigc::slot<void,const char*> theSlot)
+{
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+#define CONFIG_VARIABLE(type,var,name,value)                 theSlot (name);
+#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name);
+#include "ardour/session_configuration_vars.h"
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL        
+}