projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for fixes to #2391 and #2394.
[dcpomatic.git]
/
test
/
test.h
diff --git
a/test/test.h
b/test/test.h
index 863a015af0916e6076f190f996afbc51fa9bccb5..8399abf9a3656687b83f90ba2cc295f68615344f 100644
(file)
--- a/
test/test.h
+++ b/
test/test.h
@@
-19,13
+19,14
@@
*/
*/
-#include "lib/
warnings
.h"
-#include
"lib/types.h"
+#include "lib/
video_frame_type
.h"
+#include
<dcp/types.h>
#include <dcp/verify.h>
#include <boost/filesystem.hpp>
#include <vector>
#include <dcp/verify.h>
#include <boost/filesystem.hpp>
#include <vector>
+class Content;
class Film;
class Image;
class Log;
class Film;
class Image;
class Log;
@@
-56,7
+57,6
@@
private:
extern bool wait_for_jobs ();
extern bool wait_for_jobs ();
-extern void setup_test_config ();
extern std::shared_ptr<Film> new_test_film (std::string);
extern std::shared_ptr<Film> new_test_film2 (std::string, std::vector<std::shared_ptr<Content>> content = {}, Cleanup* cleanup = nullptr);
extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
extern std::shared_ptr<Film> new_test_film (std::string);
extern std::shared_ptr<Film> new_test_film2 (std::string, std::vector<std::shared_ptr<Content>> content = {}, Cleanup* cleanup = nullptr);
extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
@@
-76,6
+76,9
@@
void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesys
extern boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
extern void make_random_file (boost::filesystem::path path, size_t size);
extern void make_and_verify_dcp (std::shared_ptr<Film> film, std::vector<dcp::VerificationNote::Code> ignore = {});
extern boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
extern void make_random_file (boost::filesystem::path path, size_t size);
extern void make_and_verify_dcp (std::shared_ptr<Film> film, std::vector<dcp::VerificationNote::Code> ignore = {});
+extern void check_int_close (int a, int b, int d);
+extern void check_int_close (std::pair<int, int>, std::pair<int, int>, int d);
+extern boost::filesystem::path find_file (boost::filesystem::path dir, std::string filename_part);
class LogSwitcher
class LogSwitcher
@@
-89,6
+92,27
@@
private:
};
};
+class ConfigRestorer
+{
+public:
+ ~ConfigRestorer();
+};
+
+
+class Editor
+{
+public:
+ Editor(boost::filesystem::path path);
+ ~Editor();
+
+ void replace(std::string a, std::string b);
+
+private:
+ boost::filesystem::path _path;
+ std::string _content;
+};
+
+
namespace dcp {
std::ostream& operator<< (std::ostream& s, dcp::Size i);
namespace dcp {
std::ostream& operator<< (std::ostream& s, dcp::Size i);