allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Use PBD::string_to functions in VideoUtils::video_query_info

Browse Source 
LocaleGuard is in use so float <=> string conversions must be expected in C
locale format
This commit is contained in:
Tim Mayberry
2016-09-05 09:28:50 +10:00
parent e7a23eaaa8
commit df2b0e33b9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/utils_videotl.cc
View 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