Merge branch 'master' of /home/carl/git/dvdomatic

6 files changed, 8 insertions, 30 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index cb0a44a45..d2a1948ca 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -584,13 +584,6 @@ Film::set_scaler (Scaler const * s)
 	signal_changed (SCALER);
 }
 
-void
-Film::set_frames_per_second (float f)
-{
-	_state.frames_per_second = f;
-	signal_changed (FRAMES_PER_SECOND);
-}
-
 /** @return full paths to any audio files that this Film has */
 vector<string>
 Film::audio_files () const
diff --git a/src/lib/film.h b/src/lib/film.h
index dc766252d..3ff671fbe 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -138,7 +138,6 @@ public:
 	void set_bottom_crop (int);
 	void set_left_crop (int);
 	void set_right_crop (int);
-	void set_frames_per_second (float);
 	void set_format (Format const *);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_audio_gain (float);
diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index e23bf9148..e0ad20417 100644
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -275,9 +275,8 @@ FilmState::bytes_per_sample () const
 	case AV_SAMPLE_FMT_S16:
 		return 2;
 	default:
-		assert (false);
+		return 0;
 	}
 
-	assert (false);
 	return 0;
 }
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 4240bc05c..f35996644 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -116,6 +116,7 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 		s->Add (video_control (_audio_gain), 1);
 		video_control (add_label_to_sizer (s, this, "dB"));
 		_audio_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
+		video_control (_audio_gain_calculate_button);
 		s->Add (_audio_gain_calculate_button, 1, wxEXPAND);
 		_sizer->Add (s);
 	}
@@ -130,7 +131,7 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	}
 
 	video_control (add_label_to_sizer (_sizer, this, "Frames Per Second"));
-	_frames_per_second = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
+	_frames_per_second = new wxStaticText (this, wxID_ANY, wxT (""));
 	_sizer->Add (video_control (_frames_per_second));
 	
 	video_control (add_label_to_sizer (_sizer, this, "Original Size"));
@@ -201,7 +202,6 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	
 	/* Now connect to them, since initial values are safely set */
 	_name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this);
-	_frames_per_second->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::frames_per_second_changed), 0, this);
 	_format->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
 	_content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this);
 	_left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
@@ -373,7 +373,7 @@ FilmEditor::film_changed (Film::Property p)
 	{
 		stringstream s;
 		s << fixed << setprecision(2) << _film->frames_per_second();
-		_frames_per_second->ChangeValue (std_to_wx (s.str ()));
+		_frames_per_second->SetLabel (std_to_wx (s.str ()));
 		break;
 	}
 	case Film::AUDIO_CHANNELS:
@@ -558,19 +558,6 @@ FilmEditor::scaler_changed (wxCommandEvent &)
 	_ignore_changes = Film::NONE;
 }
 
-/** Called when the frames per second widget has been changed */
-void
-FilmEditor::frames_per_second_changed (wxCommandEvent &)
-{
-	if (!_film) {
-		return;
-	}
-
-	_ignore_changes = Film::FRAMES_PER_SECOND;
-	_film->set_frames_per_second (boost::lexical_cast<float> (wx_to_std (_frames_per_second->GetValue ())));
-	_ignore_changes = Film::NONE;
-}
-
 void
 FilmEditor::audio_gain_changed (wxCommandEvent &)
 {
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 0b4c1e7c1..ac9a5fb31 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -50,7 +50,6 @@ private:
 	void top_crop_changed (wxCommandEvent &);
 	void bottom_crop_changed (wxCommandEvent &);
 	void content_changed (wxCommandEvent &);
-	void frames_per_second_changed (wxCommandEvent &);
 	void format_changed (wxCommandEvent &);
 	void dcp_range_changed (int, TrimAction);
 	void dcp_content_type_changed (wxCommandEvent &);
@@ -79,8 +78,6 @@ private:
 	Film* _film;
 	/** The Film's name */
 	wxTextCtrl* _name;
-	/** The Film's frames per second */
-	wxTextCtrl* _frames_per_second;
 	/** The Film's format */
 	wxComboBox* _format;
 	/** The Film's content file */
@@ -101,11 +98,14 @@ private:
 	wxComboBox* _scaler;
 	/** The Film's audio gain */
 	wxSpinCtrl* _audio_gain;
+	/** A button to open the gain calculation dialogue */
 	wxButton* _audio_gain_calculate_button;
 	/** The Film's audio delay */
 	wxSpinCtrl* _audio_delay;
 	/** The Film's DCP content type */
 	wxComboBox* _dcp_content_type;
+	/** The Film's frames per second */
+	wxStaticText* _frames_per_second;
 	/** The Film's original size */
 	wxStaticText* _original_size;
 	/** The Film's length */
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a7b8a9550..8398b8162 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -216,7 +216,7 @@ FilmViewer::film_changed (Film::Property p)
 		}
 		
 		_slider->SetValue (0);
-		_thumb_panel->refresh ();
+		set_thumbnail (0);
 	} else if (p == Film::FORMAT) {
 		_thumb_panel->refresh ();
 	} else if (p == Film::CONTENT) {