Basic support for 7.1/HI/VI audio tracks.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index b8ea6ebec0d6798e2daf07e05b32c5975ee93262..ef29cc08f27f3ff411d74904b99632d70548cda1 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -49,7 +49,9 @@ extern "C" {
 #undef check
 
 /** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 6
+#define MAX_AUDIO_CHANNELS 8
+
+#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
 
 namespace libdcp {
        class Signer;
@@ -65,8 +67,7 @@ extern double seconds (struct timeval);
 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 (boost::filesystem::path);
-extern std::string md5_digest_directory (boost::filesystem::path, boost::shared_ptr<Job>);
+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);
@@ -77,6 +78,8 @@ extern boost::filesystem::path mo_path ();
 extern std::string tidy_for_filename (std::string);
 extern boost::shared_ptr<const libdcp::Signer> make_signer ();
 extern libdcp::Size fit_ratio_within (float ratio, libdcp::Size);
+extern std::string entities_to_text (std::string e);
+extern std::map<std::string, std::string> split_get_request (std::string url);
 
 struct FrameRateConversion
 {
@@ -88,17 +91,15 @@ struct FrameRateConversion
        float factor () const {
                if (skip) {
                        return 0.5;
-               } else if (repeat) {
-                       return 2;
                }
 
-               return 1;
+               return repeat;
        }
 
        /** true to skip every other frame */
        bool skip;
-       /** true to repeat every frame once */
-       bool repeat;
+       /** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */
+       int repeat;
        /** true if this DCP will run its video faster or slower than the source
         *  without taking into account `repeat' nor `skip'.
         *  (e.g. change_speed will be true if
@@ -121,6 +122,7 @@ extern float get_required_float (std::multimap<std::string, std::string> const &
 extern std::string get_required_string (std::multimap<std::string, std::string> const & kv, std::string k);
 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);
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
@@ -133,13 +135,15 @@ class Socket
 {
 public:
        Socket (int timeout = 30);
+       ~Socket ();
 
        /** @return Our underlying socket */
        boost::asio::ip::tcp::socket& socket () {
                return _socket;
        }
 
-       void connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint);
+       void connect (boost::asio::ip::tcp::endpoint);
+       void accept (int);
 
        void write (uint32_t n);
        void write (uint8_t const * data, int size);
@@ -155,6 +159,7 @@ private:
        boost::asio::io_service _io_service;
        boost::asio::deadline_timer _deadline;
        boost::asio::ip::tcp::socket _socket;
+       boost::asio::ip::tcp::acceptor* _acceptor;
        int _timeout;
 };