Include audio mapping in the digest used to distinguish different

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

diff --git a/src/lib/util.h b/src/lib/util.h
index ef29cc08f27f3ff411d74904b99632d70548cda1..5d93456df6c043d2bac41d6b070b81e6f83ebcc6 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -40,16 +40,10 @@ extern "C" {
 #include "types.h"
 #include "video_content.h"
 
-#ifdef DCPOMATIC_DEBUG
-#define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
-#else
-#define TIMING(...)
-#endif
-
 #undef check
 
-/** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 8
+/** The maximum number of audio channels that we can have in a DCP */
+#define MAX_DCP_AUDIO_CHANNELS 12
 
 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
 
@@ -68,7 +62,6 @@ extern void dcpomatic_setup ();
 extern void dcpomatic_setup_gettext_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
 extern std::string md5_digest (std::vector<boost::filesystem::path>, boost::shared_ptr<Job>);
-extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
 extern bool valid_image_file (boost::filesystem::path);
@@ -123,6 +116,7 @@ extern std::string get_required_string (std::multimap<std::string, std::string>
 extern int get_optional_int (std::multimap<std::string, std::string> const & kv, std::string k);
 extern std::string get_optional_string (std::multimap<std::string, std::string> const & kv, std::string k);
 extern void* wrapped_av_malloc (size_t);
+extern int64_t divide_with_round (int64_t a, int64_t b);
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
@@ -165,16 +159,24 @@ private:
 
 extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second);
 
-class LocaleGuard
+class ScopedTemporary
 {
 public:
-       LocaleGuard ();
-       ~LocaleGuard ();
+       ScopedTemporary ();
+       ~ScopedTemporary ();
+
+       boost::filesystem::path file () const {
+               return _file;
+       }
        
+       char const * c_str () const;
+       FILE* open (char const *);
+       void close ();
+
 private:
-       char* _old;
+       boost::filesystem::path _file;
+       FILE* _open;
 };
 
-
 #endif