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.h | |
| 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.h')
| -rw-r--r-- | gtk2_ardour/export_format_dialog.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h index f22e342589..0371b77544 100644 --- a/gtk2_ardour/export_format_dialog.h +++ b/gtk2_ardour/export_format_dialog.h @@ -37,9 +37,9 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList { private: - typedef ARDOUR::ExportFormatManager::WeakCompatPtr WeakCompatPtr; + typedef ARDOUR::WeakExportFormatCompatibilityPtr WeakCompatPtr; + typedef ARDOUR::WeakExportFormatPtr WeakFormatPtr; typedef ARDOUR::ExportFormatManager::WeakQualityPtr WeakQualityPtr; - typedef ARDOUR::ExportFormatManager::WeakFormatPtr WeakFormatPtr; typedef ARDOUR::ExportFormatManager::WeakSampleRatePtr WeakSampleRatePtr; typedef ARDOUR::ExportFormatManager::WeakSampleFormatPtr WeakSampleFormatPtr; typedef ARDOUR::ExportFormatManager::WeakDitherTypePtr WeakDitherTypePtr; @@ -131,7 +131,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList /*** Encoding options */ - void change_encoding_options (ARDOUR::ExportFormatManager::FormatPtr ptr); + void change_encoding_options (ARDOUR::ExportFormatPtr ptr); void empty_encoding_option_table (); void remove_widget (Gtk::Widget & to_remove, Gtk::Container * remove_from); @@ -177,8 +177,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList struct CompatibilityCols : public Gtk::TreeModelColumnRecord { public: - Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::CompatPtr> ptr; - Gtk::TreeModelColumn<bool> selected; + Gtk::TreeModelColumn<ARDOUR::ExportFormatCompatibilityPtr> ptr; + Gtk::TreeModelColumn<bool> selected; Gtk::TreeModelColumn<std::string> label; CompatibilityCols () { add(ptr); add(selected); add(label); } @@ -205,9 +205,9 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList struct FormatCols : public Gtk::TreeModelColumnRecord { public: - Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::FormatPtr> ptr; - Gtk::TreeModelColumn<std::string> color; - Gtk::TreeModelColumn<std::string> label; + Gtk::TreeModelColumn<ARDOUR::ExportFormatPtr> ptr; + Gtk::TreeModelColumn<std::string> color; + Gtk::TreeModelColumn<std::string> label; FormatCols () { add(ptr); add(color); add(label); } }; |