diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-21 14:12:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-21 14:12:51 +0100 |
| commit | 55e12147bd1f50ca022262f2f334fe731bd4195a (patch) | |
| tree | 0b9c1416e96aef6546816451e071629a5a4d6d77 /src | |
| parent | 91a31b5bc0f47958c7f412526ddc590c19ef23e2 (diff) | |
Use blank details for film size, audio frames etc. when there is no information.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtk/film_editor.cc | 22 | ||||
| -rw-r--r-- | src/tools/dvdomatic.cc | 1 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/gtk/film_editor.cc b/src/gtk/film_editor.cc index 0fa100de9..67cde2364 100644 --- a/src/gtk/film_editor.cc +++ b/src/gtk/film_editor.cc @@ -333,19 +333,27 @@ FilmEditor::film_changed (Film::Property p) break; case Film::AUDIO_CHANNELS: case Film::AUDIO_SAMPLE_RATE: - s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz"; - _audio.set_text (s.str ()); + if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) { + _audio.set_text (""); + } else { + s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz"; + _audio.set_text (s.str ()); + } break; case Film::SIZE: - s << _film->size().width << " x " << _film->size().height; - _original_size.set_text (s.str ()); + if (_film->size().width == 0 && _film->size().height == 0) { + _original_size.set_text (""); + } else { + s << _film->size().width << " x " << _film->size().height; + _original_size.set_text (s.str ()); + } break; case Film::LENGTH: - if (_film->frames_per_second() > 0) { + if (_film->frames_per_second() > 0 && _film->length() > 0) { s << _film->length() << " frames; " << seconds_to_hms (_film->length() / _film->frames_per_second()); - } else { + } else if (_film->length() > 0) { s << _film->length() << " frames"; - } + } _length.set_text (s.str ()); break; case Film::DCP_CONTENT_TYPE: diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index b41724849..d32677619 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -265,6 +265,7 @@ setup_menu (Gtk::MenuBar& m) add_item (jobs_items, "_Make DCP", sigc::ptr_fun (jobs_make_dcp), NEEDS_FILM); add_item (jobs_items, "_Send DCP to TMS", sigc::ptr_fun (jobs_send_dcp_to_tms), NEEDS_FILM); add_item (jobs_items, "Copy from _DVD...", sigc::ptr_fun (jobs_copy_from_dvd), NEEDS_FILM); + jobs_items.push_back (SeparatorElem ()); add_item (jobs_items, "_Examine content", sigc::ptr_fun (jobs_examine_content), NEEDS_FILM); add_item (jobs_items, "Make DCP from _existing transcode", sigc::ptr_fun (jobs_make_dcp_from_existing_transcode), NEEDS_FILM); |