Move to_string() from a free function into a member of Time.

1 files changed, 2 insertions, 28 deletions

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 60fc5342a..f1be46925 100644
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -107,39 +107,13 @@ dcpomatic::max (ContentTime a, ContentTime b)
 
 
 string
-dcpomatic::to_string (ContentTime t)
-{
-	char buffer[64];
-#ifdef DCPOMATIC_WINDOWS
-	__mingw_snprintf (buffer, sizeof(buffer), "[CONT %" PRId64 " %fs]", t.get(), t.seconds());
-#else
-	snprintf (buffer, sizeof(buffer), "[CONT %" PRId64 " %fs]", t.get(), t.seconds());
-#endif
-	return buffer;
-}
-
-
-string
-dcpomatic::to_string (DCPTime t)
-{
-	char buffer[64];
-#ifdef DCPOMATIC_WINDOWS
-	__mingw_snprintf (buffer, sizeof(buffer), "[DCP %" PRId64 " %fs]", t.get(), t.seconds());
-#else
-	snprintf (buffer, sizeof(buffer), "[DCP %" PRId64 " %fs]", t.get(), t.seconds());
-#endif
-	return buffer;
-}
-
-
-string
 dcpomatic::to_string (DCPTimePeriod p)
 {
 	char buffer[64];
 #ifdef DCPOMATIC_WINDOWS
-	__mingw_snprintf (buffer, sizeof(buffer), "[DCP %" PRId64 " %fs -> %" PRId64 " %fs]", p.from.get(), p.from.seconds(), p.to.get(), p.to.seconds());
+	__mingw_snprintf (buffer, sizeof(buffer), "[DCP %s %fs -> %s %fs]", p.from.to_string().c_str(), p.from.seconds(), p.to.get().c_str(), p.to.seconds());
 #else
-	snprintf (buffer, sizeof(buffer), "[DCP %" PRId64 " %fs -> %" PRId64 " %fs]", p.from.get(), p.from.seconds(), p.to.get(), p.to.seconds());
+	snprintf (buffer, sizeof(buffer), "[DCP %s %fs -> %s %fs]", p.from.to_string().c_str(), p.from.seconds(), p.to.to_string().c_str(), p.to.seconds());
 #endif
 	return buffer;
 }