diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-17 23:52:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-17 23:52:38 +0000 |
| commit | a2315091cd9471016e7ed0165d9152a335b8af4f (patch) | |
| tree | 478c4b72b06645f6d2b54be563d0059aeeccb160 /src | |
| parent | d2b325414bb9d8a426bc9606ba8555db42e4aad0 (diff) | |
Minimum still duration of 1s; give new content a default format.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 10 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 2e2ec368a..58d1e5010 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -890,6 +890,16 @@ Film::set_content (string c) throw; } + + /* Default format */ + switch (content_type()) { + case STILL: + set_format (Format::from_id ("var-185")); + break; + case VIDEO: + set_format (Format::from_id ("185")); + break; + } } void diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 4e7296a7e..da48c2645 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -269,7 +269,7 @@ FilmEditor::make_video_panel () _top_crop->SetRange (0, 1024); _right_crop->SetRange (0, 1024); _bottom_crop->SetRange (0, 1024); - _still_duration->SetRange (0, 60 * 60); + _still_duration->SetRange (1, 60 * 60); _dcp_trim_start->SetRange (0, 100); _dcp_trim_end->SetRange (0, 100); } |