Allow configuration of MXF/XML filenames (part of #710).

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index f3795c26406c75a6b4e286cde16510a93b2e8ca7..a0d6453ff76af2f5d2a44e3a924ebf5092cabfad 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -35,8 +35,8 @@
 #include "rect.h"
 #include "digester.h"
 #include "audio_processor.h"
-#include "safe_stringstream.h"
 #include "compose.hpp"
+#include <locked_sstream.h>
 #include <dcp/util.h>
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>
@@ -115,7 +115,7 @@ seconds_to_hms (int s)
        int h = m / 60;
        m -= (h * 60);
 
-       SafeStringStream hms;
+       locked_stringstream hms;
        hms << h << N_(":");
        hms.width (2);
        hms << setfill ('0') << m << N_(":");
@@ -136,7 +136,7 @@ seconds_to_approximate_hms (int s)
        int h = m / 60;
        m -= (h * 60);
 
-       SafeStringStream ap;
+       locked_stringstream ap;
 
        bool const hours = h > 0;
        bool const minutes = h < 6 && m > 0;
@@ -617,15 +617,31 @@ split_get_request (string url)
 }
 
 string
-video_asset_filename (shared_ptr<dcp::PictureAsset> asset)
+video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
-       return "j2c_" + asset->id() + ".mxf";
+       dcp::NameFormat::Map values;
+       values['t'] = "j2c";
+       values['i'] = asset->id();
+       values['r'] = raw_convert<string> (reel_index + 1);
+       values['n'] = raw_convert<string> (reel_count);
+       if (summary) {
+               values['c'] = summary.get();
+       }
+       return Config::instance()->dcp_filename_format().get(values) + ".mxf";
 }
 
 string
-audio_asset_filename (shared_ptr<dcp::SoundAsset> asset)
+audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
-       return "pcm_" + asset->id() + ".mxf";
+       dcp::NameFormat::Map values;
+       values['t'] = "pcm";
+       values['i'] = asset->id();
+       values['r'] = raw_convert<string> (reel_index + 1);
+       values['n'] = raw_convert<string> (reel_count);
+       if (summary) {
+               values['c'] = summary.get();
+       }
+       return Config::instance()->dcp_filename_format().get(values) + ".mxf";
 }
 
 float