diff options
author | Taybin Rutkin <taybin@taybin.com> | 2006-07-19 03:49:52 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2006-07-19 03:49:52 +0000 |
commit | 50a4504e488227182374b39c7ea50a1147f3557d (patch) | |
tree | 48068cedd3068773fb9fb651df9eaf843dffefa7 /gtk2_ardour | |
parent | edde9b59833183904ec7bd7fd49bb2bc8515f7e9 (diff) |
Updated config.guess file
Added mac specific ardour2_mac_ui.rc file
Fixed some memory leaks in add_instant_xml() usage.
Added EXTRA_WARN scons option for pedants.
Reformatted xml++.cc into something that wouldn't drive me insane.
git-svn-id: svn://localhost/ardour2/trunk@686 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/actions.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/option_editor.cc | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index ee688c3660..2197d4dc00 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -19,7 +19,7 @@ */ #include <vector> -#include <string.h> +#include <string> #include <gtk/gtkaccelmap.h> #include <gtk/gtkuimanager.h> diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 833dc8512f..1887f046b8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -339,15 +339,15 @@ ARDOUR_UI::save_ardour_state () Config->add_extra_xml (*node); Config->save_state(); - XMLNode& enode (static_cast<Stateful*>(editor)->get_state()); - XMLNode& mnode (mixer->get_state()); + XMLNode* enode = new XMLNode (static_cast<Stateful*>(editor)->get_state()); + XMLNode* mnode = new XMLNode (mixer->get_state()); if (session) { - session->add_instant_xml(enode, session->path()); - session->add_instant_xml(mnode, session->path()); + session->add_instant_xml(*enode, session->path()); + session->add_instant_xml(*mnode, session->path()); } else { - Config->add_instant_xml(enode, get_user_ardour_path()); - Config->add_instant_xml(mnode, get_user_ardour_path()); + Config->add_instant_xml(*enode, get_user_ardour_path()); + Config->add_instant_xml(*mnode, get_user_ardour_path()); } /* keybindings */ diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index d4c2715742..09aacdab15 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -253,6 +253,7 @@ OptionEditor::setup_path_options() sfdb_path_view.append_column(_("Paths"), sfdb_path_columns.paths); sfdb_path_view.set_size_request(-1, 100); + sfdb_path_view.set_headers_visible (false); path_table.show_all(); } |