root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
}
if (_default_dcp_content_type) {
- /* [XML:opt] DefaultDCPContentType Default content type ot use when creating new films (<code>FTR</code>, <code>SHR</code>,
+ /* [XML:opt] DefaultDCPContentType Default content type to use when creating new films (<code>FTR</code>, <code>SHR</code>,
<code>TLR</code>, <code>TST</code>, <code>XSN</code>, <code>RTG</code>, <code>TSR</code>, <code>POL</code>,
<code>PSA</code> or <code>ADV</code>). */
root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ());
add_to_history_internal (_history, p);
}
-/** Remove non-existant items from the history */
+/** Remove non-existent items from the history */
void
Config::clean_history ()
{
}
-/* Take soem OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
+/* Take some OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
* and find those drives that we could write a DCP to. The drives returned are "real" (not synthesized)
* and are whole disks (not partitions). They may be mounted, or contain mounted partitions, in which
* their mounted() method will return true.
boost::filesystem::path const asset =
film()->internal_video_asset_dir() / film()->internal_video_asset_filename(_period);
- _first_nonexistant_frame = check_existing_picture_asset (asset);
+ _first_nonexistent_frame = check_existing_picture_asset (asset);
- if (_first_nonexistant_frame < period.duration().frames_round(film()->video_frame_rate())) {
+ if (_first_nonexistent_frame < period.duration().frames_round(film()->video_frame_rate())) {
/* We do not have a complete picture asset. If there is an
existing asset, break any hard links to it as we are about
to change its contents (if only by changing the IDs); see
}
_picture_asset->set_file (asset);
- _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0);
+ _picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistent_frame > 0);
} else if (!text_only) {
/* We already have a complete picture asset that we can just re-use */
/* XXX: what about if the encryption key changes? */
int const n = (boost::filesystem::file_size(info_file->get().path()) / _info_size) - 1;
LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size(info_file->get().path()), _info_size);
- Frame first_nonexistant_frame;
+ Frame first_nonexistent_frame;
if (film()->three_d()) {
/* Start looking at the last left frame */
- first_nonexistant_frame = n / 2;
+ first_nonexistent_frame = n / 2;
} else {
- first_nonexistant_frame = n;
+ first_nonexistent_frame = n;
}
- while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistant_frame) && first_nonexistant_frame > 0) {
- --first_nonexistant_frame;
+ while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistent_frame) && first_nonexistent_frame > 0) {
+ --first_nonexistent_frame;
}
- if (!film()->three_d() && first_nonexistant_frame > 0) {
+ if (!film()->three_d() && first_nonexistent_frame > 0) {
/* If we are doing 3D we might have found a good L frame with no R, so only
do this if we're in 2D and we've just found a good B(oth) frame.
*/
- ++first_nonexistant_frame;
+ ++first_nonexistent_frame;
}
- LOG_GENERAL ("Proceeding with first nonexistant frame %1", first_nonexistant_frame);
+ LOG_GENERAL ("Proceeding with first nonexistent frame %1", first_nonexistent_frame);
- return first_nonexistant_frame;
+ return first_nonexistent_frame;
}
return _period;
}
- int first_nonexistant_frame () const {
- return _first_nonexistant_frame;
+ int first_nonexistent_frame () const {
+ return _first_nonexistent_frame;
}
dcp::FrameInfo read_frame_info (std::shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const;
dcpomatic::DCPTimePeriod _period;
/** the first picture frame index that does not already exist in our MXF */
- int _first_nonexistant_frame;
+ int _first_nonexistent_frame;
/** the data of the last written frame, if there is one */
std::shared_ptr<const dcp::Data> _last_written[static_cast<int>(Eyes::COUNT)];
/** index of this reel within the DCP (starting from 0) */
using std::string;
-/** @param film Film thta the problem is with, or 0.
+/** @param film Film that the problem is with, or 0.
* @param from Email address to use for From:
* @param summary Summary of the problem.
*/
struct update_checker_test;
-/** Class to check for the existance of an update for DCP-o-matic on a remote server */
+/** Class to check for the existence of an update for DCP-o-matic on a remote server */
class UpdateChecker : public Signaller
{
public:
if (!_position) {
/* This is the first data we have received since initialisation or seek. Set
the position based on the frame that was given. After this first time
- we just cound frames, since (as with audio) it seems that ContentTimes
+ we just count frames, since (as with audio) it seems that ContentTimes
are unreliable from FFmpegDecoder. They are much better than audio times
but still we get the occasional one which is duplicated. In this case
ffmpeg seems to carry on regardless, processing the video frame as normal.
/* Make frame relative to the start of the reel */
frame -= reel.start ();
- return (frame != 0 && frame < reel.first_nonexistant_frame());
+ return (frame != 0 && frame < reel.first_nonexistent_frame());
}
int pos = _history_position;
- /* Clear out non-existant history items before we re-build the menu */
+ /* Clear out non-existent history items before we re-build the menu */
Config::instance()->clean_player_history ();
auto history = Config::instance()->player_history ();
print("W %d" % wait)
# Seek
print("S %d" % random.randint(0, 4095))
- # Make sure we're stil playing
+ # Make sure we're still playing
print("P")
- test_seconds -= wait / 1000
+ test_seconds -= wait / 1000
def repeat(dcp_seconds):
print("O %s" % args.dcp)
ContentPanel::remove_clicked (bool hotkey)
{
/* If the method was called because Delete was pressed check that our notebook page
- is visible and that the content list is focussed.
+ is visible and that the content list is focused.
*/
if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) {
return true;
*
* This allows us to turn off accelerators for the duration of the focus so that they don't steal
* keypresses. It's a hack but the only way I could make it work on all platforms (looking for
- * the focussed thing and doing ev.Skip() if it's a wxTextCtrl did not work for me on Windows:
+ * the focused thing and doing ev.Skip() if it's a wxTextCtrl did not work for me on Windows:
* ev.Skip() did not cause the event to be delivered).
*/
class FocusManager
_certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
_thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
} catch (dcp::MiscError& e) {
- error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what())));
+ error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what())));
}
}
}
guess_check ("more_Lss_s.wav", 4);
guess_check ("other_Rss.aiff", 5);
- /* Only the filename should be taken into acccount */
+ /* Only the filename should be taken into account */
guess_check ("-Lfe-/foo_L.wav", 0);
}
boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
Config::instance();
try {
- /* This will fail to write cinemas.xml since the link is to a non-existant directory */
+ /* This will fail to write cinemas.xml since the link is to a non-existent directory */
Config::instance()->write();
} catch (...) {}
});
film->write_metadata ();
- /* Move the content somewhere eles */
+ /* Move the content somewhere else */
auto moved = path("build/test") / path(name + "_moved");
remove_all (moved);
rename (content_dir, moved);