X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=e786bb9c1a7a4251ffe7d5a5a9974f531348d83f;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=b06c8a58b5e8b5f78ac33314261d8c3f6024212a;hpb=1e4f8cc123ccf1661ea4d23a51625614c2cf2e59;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index b06c8a58b..e786bb9c1 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,44 +25,43 @@
 #ifndef DCPOMATIC_UTIL_H
 #define DCPOMATIC_UTIL_H
 
-#include "compose.hpp"
 #include "types.h"
-#include "exceptions.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
-}
 #include <boost/shared_ptr.hpp>
-#include <boost/asio.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <string>
+#include <map>
 #include <vector>
 
 #undef check
 
+namespace dcp {
+	class PictureAsset;
+	class SoundAsset;
+}
+
 /** The maximum number of audio channels that we can have in a DCP */
-#define MAX_DCP_AUDIO_CHANNELS 12
+#define MAX_DCP_AUDIO_CHANNELS 16
 /** Message broadcast to find possible encoding servers */
-#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+#define DCPOMATIC_HELLO "I mean really, Ray, it's used."
 /** Number of films to keep in history */
 #define HISTORY_SIZE 10
 #define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com")
+#define TEXT_FONT_ID "font"
 
 extern std::string program_name;
 
-class Job;
 struct AVSubtitle;
 
 extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
-extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
 extern void dcpomatic_setup ();
+extern void dcpomatic_setup_path_encoding ();
 extern void dcpomatic_setup_gettext_i18n (std::string);
-extern std::string md5_digest (std::vector<boost::filesystem::path>, boost::shared_ptr<Job>);
+extern std::string digest_head_tail (std::vector<boost::filesystem::path>, boost::uintmax_t size);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
 extern bool valid_image_file (boost::filesystem::path);
@@ -70,54 +70,14 @@ extern bool valid_j2k_file (boost::filesystem::path);
 extern boost::filesystem::path mo_path ();
 #endif
 extern std::string tidy_for_filename (std::string);
-extern dcp::Size fit_ratio_within (float ratio, dcp::Size, int);
-extern int dcp_audio_frame_rate (int);
+extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
 extern int stride_round_up (int, int const *, int);
-extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);
-extern ContentTimePeriod subtitle_period (AVSubtitle const &);
 extern void set_backtrace_file (boost::filesystem::path);
-
-/** @class Socket
- *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
- *  that are useful for DCP-o-matic.
- *
- *  This class wraps some things that I could not work out how to do with boost;
- *  most notably, sync read/write calls with timeouts.
- */
-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::tcp::endpoint);
-	void accept (int);
-
-	void write (uint32_t n);
-	void write (uint8_t const * data, int size);
-	
-	void read (uint8_t* data, int size);
-	uint32_t read_uint32 ();
-	
-private:
-	void check ();
-
-	Socket (Socket const &);
-
-	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;
-};
-
-extern int64_t video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second);
+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 bool string_not_empty (std::string);
 
 #endif
-