diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2016-09-05 09:28:50 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2017-04-19 09:36:59 +1000 |
| commit | df2b0e33b913f842ed9964cce4c870c45cd02b38 (patch) | |
| tree | 6a808c68839517cf2110ef802b783426cd63d61f /gtk2_ardour | |
| parent | e7a23eaaa81564568d17fd0af1bdeb20996a434f (diff) | |
Use PBD::string_to functions in VideoUtils::video_query_info
LocaleGuard is in use so float <=> string conversions must be expected in C
locale format
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/utils_videotl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc index 3933022adc..10a21f3b99 100644 --- a/gtk2_ardour/utils_videotl.cc +++ b/gtk2_ardour/utils_videotl.cc @@ -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 |