summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-19 22:04:12 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-19 22:04:12 +0000
commit487f62d9e7e2b73cd44fdefe4a03735c7ed00fec (patch)
tree970df79fbead414c17ce0f54267e645c2917bad6 /src
parent688c501cedd637bf3eec962a671aa1588f215093 (diff)
Swap meaning of STL23.01 and STL24.01 in binary STL files,
as requested by TJ and apparently as now used by Annotation Edit.
Diffstat (limited to 'src')
-rw-r--r--src/stl_util.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/stl_util.cc b/src/stl_util.cc
index c145a34..16d8a63 100644
--- a/src/stl_util.cc
+++ b/src/stl_util.cc
@@ -35,11 +35,11 @@ about_equal (float a, float b)
string
sub::stl_frame_rate_to_dfc (float r)
{
- /* This is the FAB Subtitler mapping, as used by Annotation Edit */
+ /* As requested by TJ in January 2018, and as apparently used by Annotation Edit in recent versions */
if (about_equal (r, 23.976)) {
- return "STL24.01";
- } else if (about_equal (r, 24)) {
return "STL23.01";
+ } else if (about_equal (r, 24)) {
+ return "STL24.01";
} else if (about_equal (r, 25)) {
return "STL25.01";
} else if (about_equal (r, 30)) {
@@ -52,9 +52,9 @@ sub::stl_frame_rate_to_dfc (float r)
float
sub::stl_dfc_to_frame_rate (string s)
{
- if (s == "STL24.01") {
+ if (s == "STL23.01") {
return 23.976;
- } else if (s == "STL23.01") {
+ } else if (s == "STL24.01") {
return 24;
} else if (s == "STL25.01") {
return 25;