projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 671f53ef32dbcaf955f8109e6d46de6444ab8158..f0d2630d0c893b22edf39c7a041d52e5d30ba2f4 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-28,7
+28,7
@@
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
-#include <
lib
dcp/metadata.h>
+#include <dcp/metadata.h>
#include "isdcf_metadata.h"
#include "colour_conversion.h"
#include "server.h"
#include "isdcf_metadata.h"
#include "colour_conversion.h"
#include "server.h"
@@
-141,7
+141,7
@@
public:
return _default_dcp_content_type;
}
return _default_dcp_content_type;
}
-
lib
dcp::XMLMetadata dcp_metadata () const {
+ dcp::XMLMetadata dcp_metadata () const {
return _dcp_metadata;
}
return _dcp_metadata;
}
@@
-284,7
+284,7
@@
public:
changed ();
}
changed ();
}
- void set_dcp_metadata (
lib
dcp::XMLMetadata m) {
+ void set_dcp_metadata (dcp::XMLMetadata m) {
_dcp_metadata = m;
changed ();
}
_dcp_metadata = m;
changed ();
}
@@
-395,7
+395,7
@@
private:
int _default_still_length;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
int _default_still_length;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
-
lib
dcp::XMLMetadata _dcp_metadata;
+ dcp::XMLMetadata _dcp_metadata;
int _default_j2k_bandwidth;
int _default_audio_delay;
std::vector<PresetColourConversion> _colour_conversions;
int _default_j2k_bandwidth;
int _default_audio_delay;
std::vector<PresetColourConversion> _colour_conversions;