X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=b152b67b514cfb3ba2a9db90d094e8774d7bb190;hb=3458d0ec34f08a8eeef9b158f26a476a18548353;hp=e163e1a8f2feebcc4fed9e883967426bff890e95;hpb=332ad44023ff81ae44b15f2587f4d40e4d5ccff5;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index e163e1a8f..b152b67b5 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -27,6 +27,7 @@
 
 #include "types.h"
 #include "dcpomatic_time.h"
+#include "audio_mapping.h"
 #include <dcp/util.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
@@ -56,6 +57,7 @@ namespace dcp {
 extern std::string program_name;
 
 struct AVSubtitle;
+class AudioBuffers;
 
 extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
@@ -68,6 +70,7 @@ extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
 extern std::string short_audio_channel_name (int);
 extern bool valid_image_file (boost::filesystem::path);
+extern bool valid_sound_file (boost::filesystem::path);
 extern bool valid_j2k_file (boost::filesystem::path);
 #ifdef DCPOMATIC_WINDOWS
 extern boost::filesystem::path mo_path ();
@@ -81,5 +84,8 @@ extern std::map<std::string, std::string> split_get_request (std::string url);
 extern std::string video_asset_filename (boost::shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
 extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
 extern float relaxed_string_to_float (std::string);
+extern std::string careful_string_filter (std::string);
+extern std::pair<int, int> audio_channel_types (std::list<int> mapped, int channels);
+extern boost::shared_ptr<AudioBuffers> remap (boost::shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map);
 
 #endif