Use PBD::string_to functions in VideoUtils::video_query_info
authorTim Mayberry <mojofunk@gmail.com>
Sun, 4 Sep 2016 23:28:50 +0000 (09:28 +1000)
committerTim Mayberry <mojofunk@gmail.com>
Tue, 18 Apr 2017 23:36:59 +0000 (09:36 +1000)
LocaleGuard is in use so float <=> string conversions must be expected in C
locale format

gtk2_ardour/utils_videotl.cc

index 3933022adc1fa0959800f6610c2d12caa52307a4..10a21f3b99d13d2d7ea8d41dc7f5c3b42b45bd48 100644 (file)
@@ -23,6 +23,7 @@
 #include <gtkmm.h>
 
 #include "pbd/error.h"
+#include "pbd/string_convert.h"
 
 #include "ardour/ardour.h"
 #include "ardour/session_directory.h"
@@ -286,9 +287,9 @@ VideoUtils::video_query_info (
        }
        if (atoi(lines.at(0).at(0)) != 1) return false; // version
        video_start_offset = 0.0;
-       video_aspect_ratio = atof (lines.at(0).at(3));
-       video_file_fps = atof (lines.at(0).at(4));
-       video_duration = atoll(lines.at(0).at(5));
+       video_aspect_ratio = string_to<double>(lines.at(0).at(3));
+       video_file_fps = string_to<double>(lines.at(0).at(4));
+       video_duration = string_to<int64_t>(lines.at(0).at(5));
 
        if (video_aspect_ratio < 0.01 || video_file_fps < 0.01) {
                /* catch errors early, aspect == 0 or fps == 0 will