diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2011-06-11 14:14:24 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2011-06-11 14:14:24 +0000 |
| commit | 7468fdb9ca9892cec9b298690bf0edf3655d6453 (patch) | |
| tree | abff397fae4e6f8c0f51a7ae71c097b6f0ad2271 /gtk2_ardour/export_format_dialog.cc | |
| parent | 47e2b9db77ff88b0b15f942e751e56322a2887e6 (diff) | |
Typedef all globally used export smart pointer types in one file.
Some of them need to be ordered in STL containers, and thus need
a special comparable wrapper for boost::shared_ptr, defined in
comparable_shared_ptr.h. This also alleviates the typedef hell
present earlier in some export classes :)
Making the timespan pointer comparable should fix bug #4093
git-svn-id: svn://localhost/ardour2/branches/3.0@9702 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/export_format_dialog.cc')
| -rw-r--r-- | gtk2_ardour/export_format_dialog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index d719fcecb3..c8e139acce 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/gtk2_ardour/export_format_dialog.cc @@ -493,7 +493,7 @@ ExportFormatDialog::update_compatibility_selection (std::string const & path) { Gtk::TreeModel::iterator iter = compatibility_view.get_model ()->get_iter (path); - ExportFormatManager::CompatPtr ptr = iter->get_value (compatibility_cols.ptr); + ExportFormatCompatibilityPtr ptr = iter->get_value (compatibility_cols.ptr); bool state = iter->get_value (compatibility_cols.selected); iter->set_value (compatibility_cols.selected, state); @@ -553,7 +553,7 @@ ExportFormatDialog::change_compatibility_selection (bool select, WeakCompatPtr c { ++applying_changes_from_engine; - ExportFormatManager::CompatPtr ptr = compat.lock(); + ExportFormatCompatibilityPtr ptr = compat.lock(); for (Gtk::ListStore::Children::iterator it = compatibility_list->children().begin(); it != compatibility_list->children().end(); ++it) { if (it->get_value (compatibility_cols.ptr) == ptr) { @@ -576,7 +576,7 @@ ExportFormatDialog::change_format_selection (bool select, WeakFormatPtr format) { change_selection<ExportFormat, FormatCols> (select, format, format_list, format_view, format_cols); - ExportFormatManager::FormatPtr ptr = format.lock(); + ExportFormatPtr ptr = format.lock(); if (select && ptr) { change_encoding_options (ptr); @@ -798,7 +798,7 @@ ExportFormatDialog::update_tagging_selection () } void -ExportFormatDialog::change_encoding_options (ExportFormatManager::FormatPtr ptr) +ExportFormatDialog::change_encoding_options (ExportFormatPtr ptr) { empty_encoding_option_table (); |