summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-09-15 01:15:55 +0200
committerCarl Hetherington <cth@carlh.net>2022-09-15 01:15:55 +0200
commitc103d8c1306e5fb3937b3a6c430a3fff32653fa3 (patch)
tree60609a21e09595990e38d33fa5df2f32a49fe8b9 /src
parent41bab4e95911d3ae99081556db5fe1d29ac008b5 (diff)
Fix some spelling mistakes (mostly in comments).
Diffstat (limited to 'src')
-rw-r--r--src/lib/config.cc4
-rw-r--r--src/lib/cross_common.cc2
-rw-r--r--src/lib/reel_writer.cc24
-rw-r--r--src/lib/reel_writer.h6
-rw-r--r--src/lib/send_problem_report_job.cc2
-rw-r--r--src/lib/update_checker.h2
-rw-r--r--src/lib/video_decoder.cc2
-rw-r--r--src/lib/writer.cc2
-rw-r--r--src/tools/dcpomatic_player.cc2
-rwxr-xr-xsrc/tools/stress4
-rw-r--r--src/wx/content_panel.cc2
-rw-r--r--src/wx/focus_manager.h2
-rw-r--r--src/wx/screen_dialog.cc2
13 files changed, 28 insertions, 28 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 18c792223..eeb009594 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -734,7 +734,7 @@ Config::write_config () const
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 ());
@@ -1235,7 +1235,7 @@ Config::add_to_history (boost::filesystem::path p)
add_to_history_internal (_history, p);
}
-/** Remove non-existant items from the history */
+/** Remove non-existent items from the history */
void
Config::clean_history ()
{
diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index d313445da..e8c209b21 100644
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -156,7 +156,7 @@ analyse_osx_media_path (string path)
}
-/* 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.
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index baeabc4fd..a247349d5 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -125,9 +125,9 @@ ReelWriter::ReelWriter (
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
@@ -160,7 +160,7 @@ ReelWriter::ReelWriter (
}
_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? */
@@ -280,28 +280,28 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
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;
}
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index e578a4813..6e92e8923 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -91,8 +91,8 @@ public:
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;
@@ -123,7 +123,7 @@ private:
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) */
diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 6fbb73430..34822b156 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -38,7 +38,7 @@ using std::shared_ptr;
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.
*/
diff --git a/src/lib/update_checker.h b/src/lib/update_checker.h
index 53ef4457b..f0ea9798c 100644
--- a/src/lib/update_checker.h
+++ b/src/lib/update_checker.h
@@ -35,7 +35,7 @@
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:
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 8d6f7e6c7..cf21f885a 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -96,7 +96,7 @@ VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> im
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.
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7792dda8e..2dd46f0b2 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -801,7 +801,7 @@ Writer::can_fake_write (Frame frame) const
/* 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());
}
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 043e90b9e..90c37d08c 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -970,7 +970,7 @@ private:
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 ();
diff --git a/src/tools/stress b/src/tools/stress
index f861753e6..66edec6b9 100755
--- a/src/tools/stress
+++ b/src/tools/stress
@@ -25,9 +25,9 @@ def seek(dcp_seconds):
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)
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 5f3b3e476..f51d5ed48 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -550,7 +550,7 @@ bool
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;
diff --git a/src/wx/focus_manager.h b/src/wx/focus_manager.h
index 337d87739..ca4c4e384 100644
--- a/src/wx/focus_manager.h
+++ b/src/wx/focus_manager.h
@@ -31,7 +31,7 @@ class wxFocusEvent;
*
* 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
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 38e6a85bf..716f9e9eb 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -70,7 +70,7 @@ public:
_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())));
}
}
}