projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index e0c5cb2f702f6c2d4baa62d7ba4eb2e92515223e..5fc56acfb0613570bc29b1067181703cc03b5319 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-29,7
+29,6
@@
#include "change_signaller.h"
#include "dcp_text_track.h"
#include "frame_rate_change.h"
#include "change_signaller.h"
#include "dcp_text_track.h"
#include "frame_rate_change.h"
-#include "isdcf_metadata.h"
#include "signaller.h"
#include "types.h"
#include "util.h"
#include "signaller.h"
#include "types.h"
#include "util.h"
@@
-217,7
+216,6
@@
public:
RESOLUTION,
ENCRYPTED,
J2K_BANDWIDTH,
RESOLUTION,
ENCRYPTED,
J2K_BANDWIDTH,
- ISDCF_METADATA,
VIDEO_FRAME_RATE,
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
VIDEO_FRAME_RATE,
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
@@
-286,10
+284,6
@@
public:
return _j2k_bandwidth;
}
return _j2k_bandwidth;
}
- ISDCFMetadata isdcf_metadata () const {
- return _isdcf_metadata;
- }
-
/** @return The frame rate of the DCP */
int video_frame_rate () const {
return _video_frame_rate;
/** @return The frame rate of the DCP */
int video_frame_rate () const {
return _video_frame_rate;
@@
-418,7
+412,6
@@
public:
void set_resolution (Resolution, bool user_explicit = true);
void set_encrypted (bool);
void set_j2k_bandwidth (int);
void set_resolution (Resolution, bool user_explicit = true);
void set_encrypted (bool);
void set_j2k_bandwidth (int);
- void set_isdcf_metadata (ISDCFMetadata);
void set_video_frame_rate (int rate, bool user_explicit = false);
void set_audio_channels (int);
void set_three_d (bool);
void set_video_frame_rate (int rate, bool user_explicit = false);
void set_audio_channels (int);
void set_three_d (bool);
@@
-518,8
+511,6
@@
private:
std::string _context_id;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
std::string _context_id;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
- /** ISDCF naming stuff */
- ISDCFMetadata _isdcf_metadata;
/** Frames per second to run our DCP at */
int _video_frame_rate;
/** The date that we should use in a ISDCF name */
/** Frames per second to run our DCP at */
int _video_frame_rate;
/** The date that we should use in a ISDCF name */