Rename video/audio/subtitle part methods.

11 files changed, 95 insertions, 95 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 2120c3a1f..a1354e9f8 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -239,9 +239,9 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 void
 AudioDialog::content_changed (int p)
 {
-	if (p == AudioContentProperty::AUDIO_STREAMS) {
+	if (p == AudioContentProperty::STREAMS) {
 		try_to_load_analysis ();
-	} else if (p == AudioContentProperty::AUDIO_GAIN) {
+	} else if (p == AudioContentProperty::GAIN) {
 		if (_playlist->content().size() == 1 && _analysis) {
 			/* We can use a short-cut to render the effect of this
 			   change, rather than recalculating everything.
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index a41e428ec..f6a29da2a 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -65,10 +65,10 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	_gain = new ContentSpinCtrlDouble<AudioContent> (
 		this,
 		new wxSpinCtrlDouble (this),
-		AudioContentProperty::AUDIO_GAIN,
+		AudioContentProperty::GAIN,
 		&Content::audio,
-		boost::mem_fn (&AudioContent::audio_gain),
-		boost::mem_fn (&AudioContent::set_audio_gain)
+		boost::mem_fn (&AudioContent::gain),
+		boost::mem_fn (&AudioContent::set_gain)
 		);
 
 	_gain->add (grid, wxGBPosition (r, 1));
@@ -81,10 +81,10 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	_delay = new ContentSpinCtrl<AudioContent> (
 		this,
 		new wxSpinCtrl (this),
-		AudioContentProperty::AUDIO_DELAY,
+		AudioContentProperty::DELAY,
 		&Content::audio,
-		boost::mem_fn (&AudioContent::audio_delay),
-		boost::mem_fn (&AudioContent::set_audio_delay)
+		boost::mem_fn (&AudioContent::delay),
+		boost::mem_fn (&AudioContent::set_delay)
 		);
 
 	_delay->add (grid, wxGBPosition (r, 1));
@@ -149,17 +149,17 @@ void
 AudioPanel::film_content_changed (int property)
 {
 	ContentList ac = _parent->selected_audio ();
-	if (property == AudioContentProperty::AUDIO_STREAMS) {
+	if (property == AudioContentProperty::STREAMS) {
 		if (ac.size() == 1) {
-			_mapping->set (ac.front()->audio->audio_mapping());
-			_mapping->set_input_channels (ac.front()->audio->audio_channel_names ());
+			_mapping->set (ac.front()->audio->mapping());
+			_mapping->set_input_channels (ac.front()->audio->channel_names ());
 		} else {
 			_mapping->set (AudioMapping ());
 		}
 		setup_description ();
 		setup_peak ();
 		_sizer->Layout ();
-	} else if (property == AudioContentProperty::AUDIO_GAIN) {
+	} else if (property == AudioContentProperty::GAIN) {
 		setup_peak ();
 	} else if (property == DCPContentProperty::REFERENCE_AUDIO) {
 		if (ac.size() == 1) {
@@ -218,7 +218,7 @@ AudioPanel::mapping_changed (AudioMapping m)
 {
 	ContentList c = _parent->selected_audio ();
 	if (c.size() == 1) {
-		c.front()->audio->set_audio_mapping (m);
+		c.front()->audio->set_mapping (m);
 	}
 }
 
@@ -230,7 +230,7 @@ AudioPanel::content_selection_changed ()
 	_gain->set_content (sel);
 	_delay->set_content (sel);
 
-	film_content_changed (AudioContentProperty::AUDIO_STREAMS);
+	film_content_changed (AudioContentProperty::STREAMS);
 	film_content_changed (DCPContentProperty::REFERENCE_AUDIO);
 
 	setup_sensitivity ();
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index f2e00ea42..21bbc0fb0 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -206,9 +206,9 @@ ContentMenu::remove ()
 			}
 
 			if (!video && audio) {
-				AudioMapping m = fc->audio->audio_mapping ();
+				AudioMapping m = fc->audio->mapping ();
 				m.unmap_all ();
-				fc->audio->set_audio_mapping (m);
+				fc->audio->set_mapping (m);
 				handled = true;
 			}
 		}
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 36f0a6bb2..a591c72b3 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -334,7 +334,7 @@ ContentPanel::add_folder_clicked ()
 			return;
 		}
 
-		ic->video->set_video_frame_rate (frame_rate);
+		ic->video->set_frame_rate (frame_rate);
 	}
 
 	_film->examine_and_add_content (content);
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 30657f841..ad6b6a9e0 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -427,10 +427,10 @@ DCPPanel::film_changed (int p)
 void
 DCPPanel::film_content_changed (int property)
 {
-	if (property == AudioContentProperty::AUDIO_STREAMS ||
-	    property == SubtitleContentProperty::USE_SUBTITLES ||
-	    property == SubtitleContentProperty::BURN_SUBTITLES ||
-	    property == VideoContentProperty::VIDEO_SCALE ||
+	if (property == AudioContentProperty::STREAMS ||
+	    property == SubtitleContentProperty::USE ||
+	    property == SubtitleContentProperty::BURN ||
+	    property == VideoContentProperty::SCALE ||
 	    property == DCPContentProperty::REFERENCE_VIDEO ||
 	    property == DCPContentProperty::REFERENCE_AUDIO ||
 	    property == DCPContentProperty::REFERENCE_SUBTITLE) {
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 1c49a2068..e328661c6 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -160,7 +160,7 @@ HintsDialog::film_changed ()
 
 	int three_d = 0;
 	BOOST_FOREACH (shared_ptr<const Content> i, content) {
-		if (i->video && i->video->video_frame_type() != VIDEO_FRAME_TYPE_2D) {
+		if (i->video && i->video->frame_type() != VIDEO_FRAME_TYPE_2D) {
 			++three_d;
 		}
 	}
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 6b910afae..3a0063c95 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -185,21 +185,21 @@ SubtitlePanel::film_content_changed (int property)
 			}
 		}
 		setup_sensitivity ();
-	} else if (property == SubtitleContentProperty::USE_SUBTITLES) {
-		checked_set (_use, scs ? scs->subtitle->use_subtitles() : false);
+	} else if (property == SubtitleContentProperty::USE) {
+		checked_set (_use, scs ? scs->subtitle->use() : false);
 		setup_sensitivity ();
-	} else if (property == SubtitleContentProperty::BURN_SUBTITLES) {
-		checked_set (_burn, scs ? scs->subtitle->burn_subtitles() : false);
-	} else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
-		checked_set (_x_offset, scs ? lrint (scs->subtitle->subtitle_x_offset() * 100) : 0);
-	} else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
-		checked_set (_y_offset, scs ? lrint (scs->subtitle->subtitle_y_offset() * 100) : 0);
-	} else if (property == SubtitleContentProperty::SUBTITLE_X_SCALE) {
-		checked_set (_x_scale, scs ? lrint (scs->subtitle->subtitle_x_scale() * 100) : 100);
-	} else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) {
-		checked_set (_y_scale, scs ? lrint (scs->subtitle->subtitle_y_scale() * 100) : 100);
-	} else if (property == SubtitleContentProperty::SUBTITLE_LANGUAGE) {
-		checked_set (_language, scs ? scs->subtitle->subtitle_language() : "");
+	} else if (property == SubtitleContentProperty::BURN) {
+		checked_set (_burn, scs ? scs->subtitle->burn() : false);
+	} else if (property == SubtitleContentProperty::X_OFFSET) {
+		checked_set (_x_offset, scs ? lrint (scs->subtitle->x_offset() * 100) : 0);
+	} else if (property == SubtitleContentProperty::Y_OFFSET) {
+		checked_set (_y_offset, scs ? lrint (scs->subtitle->y_offset() * 100) : 0);
+	} else if (property == SubtitleContentProperty::X_SCALE) {
+		checked_set (_x_scale, scs ? lrint (scs->subtitle->x_scale() * 100) : 100);
+	} else if (property == SubtitleContentProperty::Y_SCALE) {
+		checked_set (_y_scale, scs ? lrint (scs->subtitle->y_scale() * 100) : 100);
+	} else if (property == SubtitleContentProperty::LANGUAGE) {
+		checked_set (_language, scs ? scs->subtitle->language() : "");
 	} else if (property == DCPContentProperty::REFERENCE_SUBTITLE) {
 		if (scs) {
 			shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (scs);
@@ -216,7 +216,7 @@ void
 SubtitlePanel::use_toggled ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_subtitle ()) {
-		i->subtitle->set_use_subtitles (_use->GetValue());
+		i->subtitle->set_use (_use->GetValue());
 	}
 }
 
@@ -224,7 +224,7 @@ void
 SubtitlePanel::burn_toggled ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_subtitle ()) {
-		i->subtitle->set_burn_subtitles (_burn->GetValue());
+		i->subtitle->set_burn (_burn->GetValue());
 	}
 }
 
@@ -259,7 +259,7 @@ SubtitlePanel::setup_sensitivity ()
 		if (i->subtitle->has_image_subtitles ()) {
 			++image_subs;
 			/* We must burn image subtitles at the moment */
-			i->subtitle->set_burn_subtitles (true);
+			i->subtitle->set_burn (true);
 		}
 	}
 
@@ -314,7 +314,7 @@ void
 SubtitlePanel::x_offset_changed ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_subtitle ()) {
-		i->subtitle->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
+		i->subtitle->set_x_offset (_x_offset->GetValue() / 100.0);
 	}
 }
 
@@ -322,7 +322,7 @@ void
 SubtitlePanel::y_offset_changed ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_subtitle ()) {
-		i->subtitle->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
+		i->subtitle->set_y_offset (_y_offset->GetValue() / 100.0);
 	}
 }
 
@@ -331,7 +331,7 @@ SubtitlePanel::x_scale_changed ()
 {
 	ContentList c = _parent->selected_subtitle ();
 	if (c.size() == 1) {
-		c.front()->subtitle->set_subtitle_x_scale (_x_scale->GetValue() / 100.0);
+		c.front()->subtitle->set_x_scale (_x_scale->GetValue() / 100.0);
 	}
 }
 
@@ -339,7 +339,7 @@ void
 SubtitlePanel::y_scale_changed ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_subtitle ()) {
-		i->subtitle->set_subtitle_y_scale (_y_scale->GetValue() / 100.0);
+		i->subtitle->set_y_scale (_y_scale->GetValue() / 100.0);
 	}
 }
 
@@ -347,7 +347,7 @@ void
 SubtitlePanel::language_changed ()
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_subtitle ()) {
-		i->subtitle->set_subtitle_language (wx_to_std (_language->GetValue()));
+		i->subtitle->set_language (wx_to_std (_language->GetValue()));
 	}
 }
 
@@ -355,13 +355,13 @@ void
 SubtitlePanel::content_selection_changed ()
 {
 	film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
-	film_content_changed (SubtitleContentProperty::USE_SUBTITLES);
-	film_content_changed (SubtitleContentProperty::BURN_SUBTITLES);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_X_SCALE);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE);
+	film_content_changed (SubtitleContentProperty::USE);
+	film_content_changed (SubtitleContentProperty::BURN);
+	film_content_changed (SubtitleContentProperty::X_OFFSET);
+	film_content_changed (SubtitleContentProperty::Y_OFFSET);
+	film_content_changed (SubtitleContentProperty::X_SCALE);
+	film_content_changed (SubtitleContentProperty::Y_SCALE);
+	film_content_changed (SubtitleContentProperty::LANGUAGE);
 	film_content_changed (SubtitleContentProperty::FONTS);
 	film_content_changed (DCPContentProperty::REFERENCE_SUBTITLE);
 }
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index f9fd16578..08029068f 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -149,7 +149,7 @@ Timeline::recreate_views ()
 			_views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
 		}
 
-		if (i->audio && !i->audio->audio_mapping().mapped_output_channels().empty ()) {
+		if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) {
 			_views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
 		}
 
@@ -168,7 +168,7 @@ Timeline::film_content_changed (int property, bool frequent)
 {
 	ensure_ui_thread ();
 
-	if (property == AudioContentProperty::AUDIO_STREAMS) {
+	if (property == AudioContentProperty::STREAMS) {
 		recreate_views ();
 	} else if (!frequent) {
 		setup_pixels_per_second ();
diff --git a/src/wx/timeline_subtitle_content_view.cc b/src/wx/timeline_subtitle_content_view.cc
index 83360ac42..c28ac93ef 100644
--- a/src/wx/timeline_subtitle_content_view.cc
+++ b/src/wx/timeline_subtitle_content_view.cc
@@ -54,5 +54,5 @@ TimelineSubtitleContentView::active () const
 {
 	shared_ptr<Content> c = _content.lock ();
 	DCPOMATIC_ASSERT (c);
-	return c->subtitle && c->subtitle->use_subtitles();
+	return c->subtitle && c->subtitle->use();
 }
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 573d76f48..191106471 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -210,10 +210,10 @@ TimingPanel::film_content_changed (int property)
 
 	} else if (
 		property == ContentProperty::LENGTH ||
-		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
-		property == AudioContentProperty::AUDIO_VIDEO_FRAME_RATE ||
-		property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE
+		property == VideoContentProperty::FRAME_RATE ||
+		property == VideoContentProperty::FRAME_TYPE ||
+		property == AudioContentProperty::VIDEO_FRAME_RATE ||
+		property == SubtitleContentProperty::VIDEO_FRAME_RATE
 		) {
 
 		update_full_length ();
@@ -249,16 +249,16 @@ TimingPanel::film_content_changed (int property)
 		property == ContentProperty::LENGTH ||
 		property == ContentProperty::TRIM_START ||
 		property == ContentProperty::TRIM_END ||
-		property == VideoContentProperty::VIDEO_FRAME_RATE ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
-		property == AudioContentProperty::AUDIO_VIDEO_FRAME_RATE ||
-		property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE
+		property == VideoContentProperty::FRAME_RATE ||
+		property == VideoContentProperty::FRAME_TYPE ||
+		property == AudioContentProperty::VIDEO_FRAME_RATE ||
+		property == SubtitleContentProperty::VIDEO_FRAME_RATE
 		) {
 
 		update_play_length ();
 	}
 
-	if (property == VideoContentProperty::VIDEO_FRAME_RATE || property == SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE) {
+	if (property == VideoContentProperty::FRAME_RATE || property == SubtitleContentProperty::VIDEO_FRAME_RATE) {
 		set<double> check_vc;
 		shared_ptr<const Content> vc;
 		int count_ac = 0;
@@ -267,7 +267,7 @@ TimingPanel::film_content_changed (int property)
 		shared_ptr<const Content> sc;
 		BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
 			if (i->video) {
-				check_vc.insert (i->video->video_frame_rate ());
+				check_vc.insert (i->video->frame_rate ());
 				vc = i;
 			}
 			shared_ptr<const AudioContent> at = dynamic_pointer_cast<const AudioContent> (i);
@@ -288,9 +288,9 @@ TimingPanel::film_content_changed (int property)
 			if (vc) {
 				checked_set (_video_frame_rate, raw_convert<string> (vc->video->video_frame_rate (), 5));
 			} else if (ac) {
-				checked_set (_video_frame_rate, raw_convert<string> (ac->audio->audio_video_frame_rate (), 5));
+				checked_set (_video_frame_rate, raw_convert<string> (ac->audio->video_frame_rate (), 5));
 			} else if (sc) {
-				checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle->subtitle_video_frame_rate (), 5));
+				checked_set (_video_frame_rate, raw_convert<string> (sc->subtitle->video_frame_rate (), 5));
 			}
 			_video_frame_rate->Enable (true);
 		} else {
@@ -328,7 +328,7 @@ TimingPanel::full_length_changed ()
 		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
 		if (ic && ic->still ()) {
 			int const vfr = _parent->film()->video_frame_rate ();
-			ic->video->set_video_length (_full_length->get (vfr).frames_round (vfr));
+			ic->video->set_length (_full_length->get (vfr).frames_round (vfr));
 		}
 	}
 }
@@ -407,14 +407,14 @@ TimingPanel::set_video_frame_rate ()
 		shared_ptr<TextSubtitleContent> tsc = dynamic_pointer_cast<TextSubtitleContent> (i);
 		double const fr = raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ()));
 		if (i->video) {
-			i->video->set_video_frame_rate (fr);
+			i->video->set_frame_rate (fr);
 		} else if (i->audio) {
 			/* Audio but not video, i.e. SndfileContent */
 			i->audio->set_audio_video_frame_rate (fr);
 		} else if (dsc) {
-			dsc->set_subtitle_video_frame_rate (fr);
+			dsc->subtitle->set_video_frame_rate (fr);
 		} else if (tsc) {
-			tsc->set_subtitle_video_frame_rate (fr);
+			tsc->subtitle->set_video_frame_rate (fr);
 		}
 		_set_video_frame_rate->Enable (false);
 	}
@@ -429,9 +429,9 @@ TimingPanel::content_selection_changed ()
 	film_content_changed (ContentProperty::LENGTH);
 	film_content_changed (ContentProperty::TRIM_START);
 	film_content_changed (ContentProperty::TRIM_END);
-	film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
-	film_content_changed (AudioContentProperty::AUDIO_VIDEO_FRAME_RATE);
+	film_content_changed (VideoContentProperty::FRAME_RATE);
+	film_content_changed (SubtitleContentProperty::VIDEO_FRAME_RATE);
+	film_content_changed (AudioContentProperty::VIDEO_FRAME_RATE);
 }
 
 void
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 8bdac0076..28a26ce08 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -86,10 +86,10 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
 		this,
 		new wxChoice (this, wxID_ANY),
-		VideoContentProperty::VIDEO_FRAME_TYPE,
+		VideoContentProperty::FRAME_TYPE,
 		&Content::video,
-		boost::mem_fn (&VideoContent::video_frame_type),
-		boost::mem_fn (&VideoContent::set_video_frame_type),
+		boost::mem_fn (&VideoContent::frame_type),
+		boost::mem_fn (&VideoContent::set_frame_type),
 		&caster<int, VideoFrameType>,
 		&caster<VideoFrameType, int>
 		);
@@ -105,7 +105,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_left_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-		VideoContentProperty::VIDEO_CROP,
+		VideoContentProperty::CROP,
 		&Content::video,
 		boost::mem_fn (&VideoContent::left_crop),
 		boost::mem_fn (&VideoContent::set_left_crop)
@@ -116,7 +116,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_right_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-		VideoContentProperty::VIDEO_CROP,
+		VideoContentProperty::CROP,
 		&Content::video,
 		boost::mem_fn (&VideoContent::right_crop),
 		boost::mem_fn (&VideoContent::set_right_crop)
@@ -129,7 +129,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_top_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-		VideoContentProperty::VIDEO_CROP,
+		VideoContentProperty::CROP,
 		&Content::video,
 		boost::mem_fn (&VideoContent::top_crop),
 		boost::mem_fn (&VideoContent::set_top_crop)
@@ -140,7 +140,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_bottom_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-		VideoContentProperty::VIDEO_CROP,
+		VideoContentProperty::CROP,
 		&Content::video,
 		boost::mem_fn (&VideoContent::bottom_crop),
 		boost::mem_fn (&VideoContent::set_bottom_crop)
@@ -164,7 +164,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_scale = new ContentChoice<VideoContent, VideoContentScale> (
 		this,
 		new wxChoice (this, wxID_ANY),
-		VideoContentProperty::VIDEO_SCALE,
+		VideoContentProperty::SCALE,
 		&Content::video,
 		boost::mem_fn (&VideoContent::scale),
 		boost::mem_fn (&VideoContent::set_scale),
@@ -273,13 +273,13 @@ VideoPanel::film_content_changed (int property)
 		fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
 	}
 
-	if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+	if (property == VideoContentProperty::FRAME_TYPE) {
 		setup_description ();
-	} else if (property == VideoContentProperty::VIDEO_CROP) {
+	} else if (property == VideoContentProperty::CROP) {
 		setup_description ();
-	} else if (property == VideoContentProperty::VIDEO_SCALE) {
+	} else if (property == VideoContentProperty::SCALE) {
 		setup_description ();
-	} else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
+	} else if (property == VideoContentProperty::FRAME_RATE) {
 		setup_description ();
 	} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
 		if (vcs && vcs->video->colour_conversion ()) {
@@ -308,7 +308,7 @@ VideoPanel::film_content_changed (int property)
 				checked_set (_filters, p);
 			}
 		}
-	} else if (property == VideoContentProperty::VIDEO_FADE_IN) {
+	} else if (property == VideoContentProperty::FADE_IN) {
 		set<Frame> check;
 		BOOST_FOREACH (shared_ptr<const Content> i, vc) {
 			check.insert (i->video->fade_in ());
@@ -316,13 +316,13 @@ VideoPanel::film_content_changed (int property)
 
 		if (check.size() == 1) {
 			_fade_in->set (
-				ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->video->video_frame_rate ()),
-				vc.front()->video->video_frame_rate ()
+				ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->video->frame_rate ()),
+				vc.front()->video->frame_rate ()
 				);
 		} else {
 			_fade_in->clear ();
 		}
-	} else if (property == VideoContentProperty::VIDEO_FADE_OUT) {
+	} else if (property == VideoContentProperty::FADE_OUT) {
 		set<Frame> check;
 		BOOST_FOREACH (shared_ptr<const Content> i, vc) {
 			check.insert (i->video->fade_out ());
@@ -330,8 +330,8 @@ VideoPanel::film_content_changed (int property)
 
 		if (check.size() == 1) {
 			_fade_out->set (
-				ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->video->video_frame_rate ()),
-				vc.front()->video->video_frame_rate ()
+				ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->video->frame_rate ()),
+				vc.front()->video->frame_rate ()
 				);
 		} else {
 			_fade_out->clear ();
@@ -433,11 +433,11 @@ VideoPanel::content_selection_changed ()
 	_bottom_crop->set_content (video_sel);
 	_scale->set_content (video_sel);
 
-	film_content_changed (VideoContentProperty::VIDEO_CROP);
-	film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	film_content_changed (VideoContentProperty::CROP);
+	film_content_changed (VideoContentProperty::FRAME_RATE);
 	film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
-	film_content_changed (VideoContentProperty::VIDEO_FADE_IN);
-	film_content_changed (VideoContentProperty::VIDEO_FADE_OUT);
+	film_content_changed (VideoContentProperty::FADE_IN);
+	film_content_changed (VideoContentProperty::FADE_OUT);
 	film_content_changed (FFmpegContentProperty::FILTERS);
 	film_content_changed (DCPContentProperty::REFERENCE_VIDEO);