projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash.
[dcpomatic.git]
/
src
/
lib
/
util.h
diff --git
a/src/lib/util.h
b/src/lib/util.h
index 121deb532eb62cae1ab1e7f5e40eddc3fa2da10c..5e568cc27934cb84828cea9a0a25743520dea1b9 100644
(file)
--- a/
src/lib/util.h
+++ b/
src/lib/util.h
@@
-51,8
+51,13
@@
extern "C" {
/** The maximum number of audio channels that we can cope with */
#define MAX_AUDIO_CHANNELS 6
/** The maximum number of audio channels that we can cope with */
#define MAX_AUDIO_CHANNELS 6
-class Scaler;
-class Film;
+#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+
+namespace libdcp {
+ class Signer;
+}
+
+class Job;
extern std::string seconds_to_hms (int);
extern std::string seconds_to_approximate_hms (int);
extern std::string seconds_to_hms (int);
extern std::string seconds_to_approximate_hms (int);
@@
-63,7
+68,7
@@
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 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);
+extern std::string md5_digest_directory (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);
extern std::string md5_digest (void const *, int);
extern void ensure_ui_thread ();
extern std::string audio_channel_name (int);
@@
-71,6
+76,9
@@
extern bool valid_image_file (boost::filesystem::path);
#ifdef DCPOMATIC_WINDOWS
extern boost::filesystem::path mo_path ();
#endif
#ifdef DCPOMATIC_WINDOWS
extern boost::filesystem::path mo_path ();
#endif
+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);
struct FrameRateConversion
{
struct FrameRateConversion
{
@@
-82,17
+90,15
@@
struct FrameRateConversion
float factor () const {
if (skip) {
return 0.5;
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 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
/** 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
@@
-127,13
+133,15
@@
class Socket
{
public:
Socket (int timeout = 30);
{
public:
Socket (int timeout = 30);
+ ~Socket ();
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
return _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);
void write (uint32_t n);
void write (uint8_t const * data, int size);
@@
-149,6
+157,7
@@
private:
boost::asio::io_service _io_service;
boost::asio::deadline_timer _deadline;
boost::asio::ip::tcp::socket _socket;
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;
};
int _timeout;
};