X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=b1dfeab558421d3406d5535ad3022e2d63409687;hp=00f36f2178b495b85e480b7d1188f8a03d1d1281;hb=89ae13638097f259f3e50b4b61068dd23451107d;hpb=5d71b86e818f9dfa3f7f573e438f2f6ddd5cdefc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 00f36f217..b1dfeab55 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -88,6 +88,7 @@ using std::pair;
 using std::cout;
 using std::bad_alloc;
 using std::set_terminate;
+using std::make_pair;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
@@ -462,7 +463,7 @@ digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
 
 /** Round a number up to the nearest multiple of another number.
  *  @param c Index.
- *  @param s Array of numbers to round, indexed by c.
+ *  @param stride Array of numbers to round, indexed by c.
  *  @param t Multiple to round to.
  *  @return Rounded number.
  */
@@ -533,8 +534,8 @@ short_audio_channel_name (int c)
 		_("BsR"),
 		_("DBP"),
 		_("DBS"),
-		_(""),
-		_("")
+		"",
+		""
 	};
 
 	return channels[c];
@@ -557,6 +558,18 @@ valid_image_file (boost::filesystem::path f)
 		);
 }
 
+bool
+valid_sound_file (boost::filesystem::path f)
+{
+	if (boost::starts_with (f.leaf().string(), "._")) {
+		return false;
+	}
+
+	string ext = f.extension().string();
+	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+	return (ext == ".wav" || ext == ".mp3" || ext == ".aif" || ext == ".aiff");
+}
+
 bool
 valid_j2k_file (boost::filesystem::path f)
 {
@@ -646,7 +659,7 @@ video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int r
 	values['r'] = raw_convert<string> (reel_index + 1);
 	values['n'] = raw_convert<string> (reel_count);
 	if (summary) {
-		values['c'] = summary.get();
+		values['c'] = careful_string_filter (summary.get());
 	}
 	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
@@ -659,7 +672,7 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int ree
 	values['r'] = raw_convert<string> (reel_index + 1);
 	values['n'] = raw_convert<string> (reel_count);
 	if (summary) {
-		values['c'] = summary.get();
+		values['c'] = careful_string_filter (summary.get());
 	}
 	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
@@ -676,8 +689,47 @@ relaxed_string_to_float (string s)
 	}
 }
 
-bool
-string_not_empty (string s)
+string
+careful_string_filter (string s)
+{
+	/* Filter out `bad' characters which `may' cause problems with some systems (either for DCP name or filename).
+	   There's no apparent list of what really is allowed, so this is a guess.
+	   Safety first and all that.
+	*/
+
+	string out;
+	string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.";
+	for (size_t i = 0; i < s.size(); ++i) {
+		if (allowed.find (s[i]) != string::npos) {
+			out += s[i];
+		}
+	}
+
+	return out;
+}
+
+/** @param mapped List of mapped audio channels from a Film.
+ *  @param channels Total number of channels in the Film.
+ *  @return First: number of non-LFE channels, second: number of LFE channels.
+ */
+pair<int, int>
+audio_channel_types (list<int> mapped, int channels)
 {
-	return !s.empty ();
+	int non_lfe = 0;
+	int lfe = 0;
+
+	BOOST_FOREACH (int i, mapped) {
+		if (i >= channels) {
+			/* This channel is mapped but is not included in the DCP */
+			continue;
+		}
+
+		if (static_cast<dcp::Channel> (i) == dcp::LFE) {
+			++lfe;
+		} else {
+			++non_lfe;
+		}
+	}
+
+	return make_pair (non_lfe, lfe);
 }