diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-21 23:10:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-21 23:10:41 +0000 |
| commit | e754a107a0003a7dcc84aaa3d1f01bac4d5591fd (patch) | |
| tree | 6c69bee91c6731b350a8ff29f89fbfeb2f0fac65 /src | |
| parent | 5c6def04502f97fbf827890c5598f9f8b98bd346 (diff) | |
| parent | 81c40635c73b402e13613a614fa8b9e9c2aa703a (diff) | |
Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dvdomatic.cc | 6 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 59f3ebc3e..9d0d58662 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -350,7 +350,11 @@ public: { wxAboutDialogInfo info; info.SetName (_("DVD-o-matic")); - info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + if (strcmp (dvdomatic_git_commit, "release") == 0) { + info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version))); + } else { + info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + } info.SetDescription (_("Free, open-source DCP generation from almost anything.")); info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); wxArrayString authors; diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index c90122aff..8cf8c5fda 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -611,9 +611,7 @@ FilmEditor::film_changed (Film::Property p) break; case Film::WITH_SUBTITLES: checked_set (_with_subtitles, _film->with_subtitles ()); - _subtitle_stream->Enable (_film->with_subtitles ()); - _subtitle_scale->Enable (_film->with_subtitles ()); - _subtitle_offset->Enable (_film->with_subtitles ()); + setup_subtitle_control_sensitivity (); _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); break; case Film::SUBTITLE_OFFSET: @@ -965,9 +963,9 @@ FilmEditor::setup_subtitle_control_sensitivity () } _with_subtitles->Enable (h); - _subtitle_stream->Enable (h); - _subtitle_offset->Enable (h); - _subtitle_scale->Enable (h); + _subtitle_stream->Enable (_film->with_subtitles ()); + _subtitle_offset->Enable (_film->with_subtitles ()); + _subtitle_scale->Enable (_film->with_subtitles ()); } void |