smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix 6677: Post-export script reinterprets timestamp format placeholder giving incorrect filename

Browse source 
Due to localtime and its statically allocated buffer, time_struct variable is
set at construct time but its value changes over time due to subsequent calls to localtime
in ardour process. Replacing localtime by localtime_r fix the problem.

This also fix 6713: Name of Audio (timestamp) does not match with written Filename in CD-Cue file
This commit is contained in:
Julien ROGER 2016-02-11 03:46:51 +01:00 • committed by Tim Mayberry
parent 1fbe4253aa
commit a3dd27c41b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/export_filename.h
View file

@ -112,8 +112,7 @@ class LIBARDOUR_API ExportFilename {
TimeFormat time_format; TimeFormat time_format;
std::string get_formatted_time (std::string const & format) const; std::string get_formatted_time (std::string const & format) const;
// Due to the static allocation used in strftime(), no destructor or copy-ctor is needed for this struct tm time_struct;
struct tm * time_struct;
ExportTimespanPtr timespan; ExportTimespanPtr timespan;
ExportChannelConfigPtr channel_config; ExportChannelConfigPtr channel_config;

5
libs/ardour/export_filename.cc
View file

@ -26,6 +26,7 @@
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "pbd/convert.h" #include "pbd/convert.h"
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include "pbd/localtime_r.h"
#include "ardour/libardour_visibility.h" #include "ardour/libardour_visibility.h"
#include "ardour/session.h" #include "ardour/session.h"
@ -62,7 +63,7 @@ ExportFilename::ExportFilename (Session & session) :
{ {
time_t rawtime; time_t rawtime;
std::time (&rawtime); std::time (&rawtime);
time_struct = localtime (&rawtime); localtime_r (&rawtime, &time_struct);
folder = session.session_directory().export_path(); folder = session.session_directory().export_path();
@ -339,7 +340,7 @@ string
ExportFilename::get_formatted_time (string const & format) const ExportFilename::get_formatted_time (string const & format) const
{ {
char buffer [80]; char buffer [80];
strftime (buffer, 80, format.c_str(), time_struct); strftime (buffer, 80, format.c_str(), &time_struct);
string return_value (buffer); string return_value (buffer);
return return_value; return return_value;