diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-03-11 23:19:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-03-11 23:19:00 +0000 |
| commit | ce8cb088aa006e54281efb2662781c5e84b512ec (patch) | |
| tree | 2857367f5dd466585602a377124b484ab28ed0e4 /src | |
| parent | b36bda0c9e9954d79eeb9a2add2c2d4067ebb530 (diff) | |
| parent | a200d926f14ffcc043a1bf9ced60004c9c3deb87 (diff) | |
Merge branch '1.0-does-own-dcp' of git.carlh.net:git/libsub into 1.0-does-own-dcp1.0-does-own-dcp
Diffstat (limited to 'src')
| -rw-r--r-- | src/sub_time.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/sub_time.cc b/src/sub_time.cc index 3f4d1e9..ed61cb4 100644 --- a/src/sub_time.cc +++ b/src/sub_time.cc @@ -156,9 +156,5 @@ Time::from_hms (int h, int m, int s, int ms) double Time::all_as_seconds () const { - if (!_rate) { - throw UnknownFrameRateError (); - } - - return _seconds + double (_frames) / _rate.get().fraction (); + return seconds() + double(milliseconds ()) / 1000; } |
