projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some include tidying.
[dcpomatic.git]
/
src
/
lib
/
util.h
diff --git
a/src/lib/util.h
b/src/lib/util.h
index 724e8937ca3e4fb3b7b22c36bd2e6650efaf9b7b..b6817f8837c0d675d07b5f569afd2a3e19710a33 100644
(file)
--- a/
src/lib/util.h
+++ b/
src/lib/util.h
@@
-25,20
+25,20
@@
#ifndef DCPOMATIC_UTIL_H
#define DCPOMATIC_UTIL_H
#ifndef DCPOMATIC_UTIL_H
#define DCPOMATIC_UTIL_H
-#include <string>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/asio.hpp>
-#include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include "compose.hpp"
+#include "types.h"
+#include "video_content.h"
#include <dcp/util.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavfilter/avfilter.h>
}
#include <dcp/util.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavfilter/avfilter.h>
}
-#include "compose.hpp"
-#include "types.h"
-#include "video_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/asio.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
#undef check
#undef check
@@
-46,6
+46,7
@@
extern "C" {
#define MAX_DCP_AUDIO_CHANNELS 12
#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
#define HISTORY_SIZE 10
#define MAX_DCP_AUDIO_CHANNELS 12
#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
#define HISTORY_SIZE 10
+#define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com")
class Job;
struct AVSubtitle;
class Job;
struct AVSubtitle;
@@
-62,6
+63,7
@@
extern std::string md5_digest (std::vector<boost::filesystem::path>, boost::shar
extern void ensure_ui_thread ();
extern std::string audio_channel_name (int);
extern bool valid_image_file (boost::filesystem::path);
extern void ensure_ui_thread ();
extern std::string audio_channel_name (int);
extern bool valid_image_file (boost::filesystem::path);
+extern bool valid_j2k_file (boost::filesystem::path);
#ifdef DCPOMATIC_WINDOWS
extern boost::filesystem::path mo_path ();
#endif
#ifdef DCPOMATIC_WINDOWS
extern boost::filesystem::path mo_path ();
#endif
@@
-81,6
+83,7
@@
extern std::string get_optional_string (std::multimap<std::string, std::string>
extern void* wrapped_av_malloc (size_t);
extern int64_t divide_with_round (int64_t a, int64_t b);
extern ContentTimePeriod subtitle_period (AVSubtitle const &);
extern void* wrapped_av_malloc (size_t);
extern int64_t divide_with_round (int64_t a, int64_t b);
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
/** @class Socket
* @brief A class to wrap a boost::asio::ip::tcp::socket with some things