From a2315091cd9471016e7ed0165d9152a335b8af4f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 17 Dec 2012 23:52:38 +0000 Subject: Minimum still duration of 1s; give new content a default format. --- src/lib/film.cc | 10 ++++++++++ src/wx/film_editor.cc | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src') 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); } -- cgit v1.2.3