diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-24 00:17:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-24 00:17:26 +0000 |
| commit | e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a (patch) | |
| tree | 78aed756a937f979983de33f51acbf2b43744aa4 /src/lib/film.h | |
| parent | 794396aa29061894ea359a6f30aa0f759a1f1b74 (diff) | |
An unfortunately large set of timeline-related changes:
- Rename sequence_video to sequence, and sequence subtitle content
like we do video content (i.e. adding multiple subtitle contents
will result in them sequenced in time rather than overlaid).
- Stop doing selection-changed related stuff in ContentPanel
if no selection change has actually happened.
- Attempt to tidy up event handling in the timeline a bit.
Diffstat (limited to 'src/lib/film.h')
| -rw-r--r-- | src/lib/film.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/film.h b/src/lib/film.h index a33c0238e..b34e4bcfa 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -177,7 +177,7 @@ public: AUDIO_CHANNELS, /** The setting of _three_d has changed */ THREE_D, - SEQUENCE_VIDEO, + SEQUENCE, INTEROP, AUDIO_PROCESSOR, REEL_TYPE, @@ -246,8 +246,8 @@ public: return _three_d; } - bool sequence_video () const { - return _sequence_video; + bool sequence () const { + return _sequence; } bool interop () const { @@ -294,7 +294,7 @@ public: void set_audio_channels (int); void set_three_d (bool); void set_isdcf_date_today (); - void set_sequence_video (bool); + void set_sequence (bool); void set_interop (bool); void set_audio_processor (AudioProcessor const * processor); void set_reel_type (ReelType); @@ -358,7 +358,7 @@ private: This will be regardless of what content is on the playlist. */ bool _three_d; - bool _sequence_video; + bool _sequence; bool _interop; AudioProcessor const * _audio_processor; ReelType _reel_type; |
