summaryrefslogtreecommitdiff
path: root/src/dcp_time.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-14 20:15:43 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-14 20:15:43 +0000
commited6a471b61d36a3ba7e8696fa3e5606406c5cf62 (patch)
tree3ca098925eb269c4cd41ff22124773ba7d36c14b /src/dcp_time.cc
parent67cf9c95d190b1f2a67d73c0a7f712e213b6e71a (diff)
parent62ee85a258aa9329544d8542dfbcc40ce8177a7a (diff)
Merge master
Diffstat (limited to 'src/dcp_time.cc')
-rw-r--r--src/dcp_time.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index c5a7affd..7c7c5298 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -222,6 +222,7 @@ libdcp::operator/ (Time a, Time const & b)
return float (at) / bt;
}
+/** @return A string of the form h:m:s:t */
string
Time::to_string () const
{
@@ -230,6 +231,7 @@ Time::to_string () const
return str.str ();
}
+/** @return This time in ticks */
int64_t
Time::to_ticks () const
{