diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-08-15 14:16:28 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2017-04-19 09:36:47 +1000 |
| commit | 3edb6b2e1f3a1e85b9b37378e7c3e261f308ce95 (patch) | |
| tree | ddc8b7b6ecdefa0801aa30ff7f9d34ce3f6b83f2 | |
| parent | 7c4c58ba34115470f8c3147384d7bd0bfc6b3fdb (diff) | |
Use PBD string conversion functions in PBD::Property class
| -rw-r--r-- | gtk2_ardour/midi_streamview.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/midi_region.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/region.cc | 1 | ||||
| -rw-r--r-- | libs/pbd/pbd/properties.h | 13 |
6 files changed, 9 insertions, 10 deletions
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index fe121a4770..9e8014d472 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -33,6 +33,7 @@ #include "ardour/region_factory.h" #include "ardour/session.h" #include "ardour/smf_source.h" +#include "ardour/evoral_types_convert.h" #include "gui_thread.h" #include "midi_region_view.h" diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index e6357746f7..9039db63d5 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -26,6 +26,8 @@ #include "evoral/Beats.hpp" #include "evoral/Range.hpp" +#include "pbd/string_convert.h" + #include "ardour/ardour.h" #include "ardour/midi_cursor.h" #include "ardour/region.h" diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index ce9a3d55ea..cfcfc1c8da 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -40,6 +40,7 @@ #include "ardour/audioengine.h" #include "ardour/butler.h" #include "ardour/debug.h" +#include "ardour/evoral_types_convert.h" #include "ardour/io.h" #include "ardour/midi_diskstream.h" #include "ardour/midi_model.h" diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 84b1f5c716..dc7293f7b5 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -44,6 +44,7 @@ #include "ardour/source_factory.h" #include "ardour/tempo.h" #include "ardour/types.h" +#include "ardour/evoral_types_convert.h" #include "pbd/i18n.h" #include <locale.h> diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 86e52b8e7c..3da26cf690 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -37,6 +37,7 @@ #include "ardour/source.h" #include "ardour/tempo.h" #include "ardour/transient_detector.h" +#include "ardour/types_convert.h" #include "pbd/i18n.h" diff --git a/libs/pbd/pbd/properties.h b/libs/pbd/pbd/properties.h index c97b4722ae..a424b718e8 100644 --- a/libs/pbd/pbd/properties.h +++ b/libs/pbd/pbd/properties.h @@ -21,10 +21,8 @@ #define __pbd_properties_h__ #include <string> -#include <sstream> #include <list> #include <set> -#include <iostream> #include "pbd/libpbd_visibility.h" #include "pbd/xml++.h" @@ -32,6 +30,7 @@ #include "pbd/property_list.h" #include "pbd/enumwriter.h" #include "pbd/stateful.h" +#include "pbd/string_convert.h" namespace PBD { @@ -265,17 +264,11 @@ private: * other than C or POSIX locales. */ virtual std::string to_string (T const& v) const { - std::stringstream s; - s.precision (12); // in case its floating point - s << v; - return s.str (); + return PBD::to_string (v); } virtual T from_string (std::string const& s) const { - std::stringstream t (s); - T v; - t >> v; - return v; + return PBD::string_to<T>(s); } }; |