Add M_PI which isn't defined by gcc with std=c++11.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index e163e1a8f2feebcc4fed9e883967426bff890e95..1d4b013581870c97184eff2b11453766a205c97a 100644 (file)
--- 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>
@@ -42,6 +43,10 @@ namespace dcp {
        class SoundAsset;
 }
 
+#ifndef M_PI
+#define M_PI (3.14159265358979323846)
+#endif
+
 /** The maximum number of audio channels that we can have in a DCP */
 #define MAX_DCP_AUDIO_CHANNELS 16
 /** Message broadcast to find possible encoding servers */
@@ -56,8 +61,10 @@ namespace dcp {
 extern std::string program_name;
 
 struct AVSubtitle;
+class AudioBuffers;
 
 extern std::string seconds_to_hms (int);
+extern std::string time_to_hmsf (DCPTime time, Frame rate);
 extern std::string seconds_to_approximate_hms (int);
 extern double seconds (struct timeval);
 extern void dcpomatic_setup ();
@@ -68,6 +75,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 +89,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