diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-24 12:19:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-24 12:19:50 +0000 |
| commit | 85c65bd422742813992686c17a5e1b718cc3c449 (patch) | |
| tree | 21750399bcb19e1fb6242bba7595773513a80912 /src/lib/util.h | |
| parent | e2be8234013335379bd49a53854218039348c7a4 (diff) | |
| parent | eed40e4e5ca46bbc31a9833d2b766c96c11b0254 (diff) | |
Merge master; specify libdcp-1.0.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index b89c71eee..76dbda190 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -50,7 +50,7 @@ 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" @@ -79,6 +79,8 @@ extern boost::filesystem::path mo_path (); extern std::string tidy_for_filename (std::string); extern boost::shared_ptr<const dcp::Signer> make_signer (); extern dcp::Size fit_ratio_within (float ratio, dcp::Size); +extern std::string entities_to_text (std::string e); +extern std::map<std::string, std::string> split_get_request (std::string url); struct FrameRateChange { |