Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index ee2865e763df84a2328c5b05064d4add768e43fc..143874c3b9431d804fae72babe070dc692d68bb4 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -24,17 +24,10 @@
 #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>
@@ -42,24 +35,28 @@ extern "C" {
 
 #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
 /** 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")
 
 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_head_tail (std::vector<boost::filesystem::path>, boost::uintmax_t size);
 extern void ensure_ui_thread ();
@@ -70,54 +67,12 @@ 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);
+extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset);
 
 #endif
-