Minimum still duration of 1s; give new content a default format.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 2e2ec368abfafa74dd5e04989a9892a30a88b226..58d1e50103285b2d0a47126a04c462a04bb2ac00 100644 (file)
--- 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 4e7296a7ec488dbd97dc9ad94c46166d95ab6c95..da48c26457a8499a32bb03da918346b5c1437de3 100644 (file)
--- 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);
 }