Remove all use of stringstream in an attempt to fix

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 1cf71ba32090a40963363d8abc37d065c9160124..5e870f1e2715f349ee3309f5f530e2133da32672 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -36,7 +36,6 @@
 #include "digester.h"
 #include "audio_processor.h"
 #include "compose.hpp"
 #include "digester.h"
 #include "audio_processor.h"
 #include "compose.hpp"

-#include <locked_sstream.h>

 #include <dcp/util.h>
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/util.h>
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>


@@ -115,14 +114,9 @@ seconds_to_hms (int s)
        int h = m / 60;
        m -= (h * 60);
 
        int h = m / 60;
        m -= (h * 60);
 

-       locked_stringstream hms;
-       hms << h << N_(":");
-       hms.width (2);
-       hms << setfill ('0') << m << N_(":");
-       hms.width (2);
-       hms << setfill ('0') << s;
-
-       return hms.str ();
+       char buffer[64];
+       snprintf (buffer, sizeof(buffer), "%d:%02d:%02d", h, m, s);
+       return buffer;

 }
 
 /** @param s Number of seconds.
 }
 
 /** @param s Number of seconds.


@@ -136,7 +130,7 @@ seconds_to_approximate_hms (int s)
        int h = m / 60;
        m -= (h * 60);
 
        int h = m / 60;
        m -= (h * 60);
 

-       locked_stringstream ap;
+       string ap;

 
        bool const hours = h > 0;
        bool const minutes = h < 6 && m > 0;
 
        bool const hours = h > 0;
        bool const minutes = h < 6 && m > 0;


@@ -145,14 +139,14 @@ seconds_to_approximate_hms (int s)
        if (hours) {
                if (m > 30 && !minutes) {
                        /// TRANSLATORS: h here is an abbreviation for hours
        if (hours) {
                if (m > 30 && !minutes) {
                        /// TRANSLATORS: h here is an abbreviation for hours

-                       ap << (h + 1) << _("h");
+                       ap += raw_convert<string>(h + 1) + _("h");

                } else {
                        /// TRANSLATORS: h here is an abbreviation for hours
                } else {
                        /// TRANSLATORS: h here is an abbreviation for hours

-                       ap << h << _("h");
+                       ap += raw_convert<string>(h) + _("h");

                }
 
                if (minutes || seconds) {
                }
 
                if (minutes || seconds) {

-                       ap << N_(" ");
+                       ap += N_(" ");

                }
        }
 
                }
        }
 


@@ -160,24 +154,24 @@ seconds_to_approximate_hms (int s)
                /* Minutes */
                if (s > 30 && !seconds) {
                        /// TRANSLATORS: m here is an abbreviation for minutes
                /* Minutes */
                if (s > 30 && !seconds) {
                        /// TRANSLATORS: m here is an abbreviation for minutes

-                       ap << (m + 1) << _("m");
+                       ap += raw_convert<string>(m + 1) + _("m");

                } else {
                        /// TRANSLATORS: m here is an abbreviation for minutes
                } else {
                        /// TRANSLATORS: m here is an abbreviation for minutes

-                       ap << m << _("m");
+                       ap += raw_convert<string>(m) + _("m");

                }
 
                if (seconds) {
                }
 
                if (seconds) {

-                       ap << N_(" ");
+                       ap += N_(" ");

                }
        }
 
        if (seconds) {
                /* Seconds */
                /// TRANSLATORS: s here is an abbreviation for seconds
                }
        }
 
        if (seconds) {
                /* Seconds */
                /// TRANSLATORS: s here is an abbreviation for seconds

-               ap << s << _("s");
+               ap += raw_convert<string>(s) + _("s");

        }
 
        }
 

-       return ap.str ();
+       return ap;

 }
 
 double
 }
 
 double