Use PBD string conversion functions in PBD::Property class

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index fe121a47709550fc5c5a9d02e9f3c4c052008392..9e8014d4722002b5248f688390d16380aebf7cae 100644 (file)
--- 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 e6357746f7d330e0fed37bf7d2fefab7e84eb78c..9039db63d5ba6d1240ef28f6ea1fcde73bc6b025 100644 (file)
--- 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 ce9a3d55eac31ec16b813e8881173f3a68645817..cfcfc1c8da8c8ee107d49d50eef4545e633c18c8 100644 (file)
--- 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 84b1f5c716576a19b30eaa36c910d431385592a2..dc7293f7b5c1c3cca72e1b2a8070f9f105655a44 100644 (file)
--- 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 86e52b8e7cf2b5676b95e6b89fe3bcdd7efc98be..3da26cf6905396fe66fdd1271bf94fb54168d454 100644 (file)
--- 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 c97b4722aee6b6110b3539c7ae8357d312d88313..a424b718e811d9f0af5bc92334ac35dbe7a69292 100644 (file)
--- 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);
        }
 
 };