diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index b630cccb..7a7cac94 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -91,7 +91,7 @@ nightly builds. ## Branching and merging The 'master' branch should be a stable branch. The nightly 'beta' versions built -from the master branch should be useable and a potential candidate for an +from the master branch should be usable and a potential candidate for an official release. Bugfixes and features are developed in separate branches. These branches are @@ -101,7 +101,7 @@ changes are done directly in master (spelling errors etc.). ### Merge requests Once approved, a MR is merged to master. It should be complete so that no -further work is neccesary in the master branch, so: +further work is necessary in the master branch, so: - Basic functionality is tested (with the latest master branch merged into it) - The changelog in `README.md` is updated diff --git a/README.md b/README.md index d5f40f4e..2ef28e55 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Notable features: - Multiple songs - Copy / paste and modify selected area - Built-in packer and relocator to position the music anywhere in the Commodore - 64 memory. Relocate used zero page adresses. + 64 memory. Relocate used zero page addresses. - Includes demo tunes to learn from. - Cross platform: Windows, macOS (Intel and ARM) and Linux versions. - Configurable settings, shortcuts and keyboard layout diff --git a/SIDFactoryII/change_todo.txt b/SIDFactoryII/change_todo.txt index 8d096439..9a632be2 100644 --- a/SIDFactoryII/change_todo.txt +++ b/SIDFactoryII/change_todo.txt @@ -6,12 +6,12 @@ Editor: * Marking for copy/paste functionality * Marking for play in loop (not sure this can be done!) * Remember user folder when exit and restart SF2 -* Add ".." to file menues for easier folder navigation +* Add ".." to file menus for easier folder navigation * Ability to add strings to orderlist overview and instruments * Load and save instruments * Follow play functionality * Markers component. Single click [or ENTER], select and move to. Double click [or Ctrl + ENTER] select and play from. -* CTRL + F on index pointers in tables will automatically find next free index in the table pointed to and insert that value before transfering focus the that table. +* CTRL + F on index pointers in tables will automatically find next free index in the table pointed to and insert that value before transferring focus the that table. * Clicking somewhere in the track should move the cursor to that position * CTRL + Enter in sequence should add 0x10 more rows DONE * ½ button should fast forward the music when playing @@ -25,7 +25,7 @@ DONE * Utilities: * Import - * Import auxilary data + * Import auxiliary data * Packing * Run optimization analyzer on packing, and show dialogue if any optimizations are possible. diff --git a/SIDFactoryII/source/libraries/ghc/filesystem.h b/SIDFactoryII/source/libraries/ghc/filesystem.h index 5cd76aed..b873f22b 100644 --- a/SIDFactoryII/source/libraries/ghc/filesystem.h +++ b/SIDFactoryII/source/libraries/ghc/filesystem.h @@ -171,7 +171,7 @@ #define LWG_2682_BEHAVIOUR //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // LWG #2395 makes crate_directory/create_directories not emit an error if there is a regular -// file with that name, it is superceded by P1164R1, so only activate if really needed +// file with that name, it is superseded by P1164R1, so only activate if really needed // #define LWG_2935_BEHAVIOUR //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // LWG #2937 enforces that fs::equivalent emits an error, if !fs::exists(p1)||!exists(p2) @@ -194,7 +194,7 @@ #define GHC_WITH_EXCEPTIONS #endif #if !defined(GHC_WITH_EXCEPTIONS) && defined(GHC_RAISE_UNICODE_ERRORS) -#error "Can't raise unicode errors whith exception support disabled" +#error "Can't raise unicode errors with exception support disabled" #endif namespace ghc { @@ -245,7 +245,7 @@ class GHC_FS_API_CLASS path using path_helper_base::preferred_separator; // 30.10.10.1 enumeration format - /// The path format in wich the constructor argument is given. + /// The path format in which the constructor argument is given. enum format { generic_format, ///< The generic format, internally used by ///< ghc::filesystem::path with slashes diff --git a/SIDFactoryII/source/libraries/ghc/fs_fwd.h b/SIDFactoryII/source/libraries/ghc/fs_fwd.h index 6de1810c..0b0fc3f8 100644 --- a/SIDFactoryII/source/libraries/ghc/fs_fwd.h +++ b/SIDFactoryII/source/libraries/ghc/fs_fwd.h @@ -25,7 +25,7 @@ // SOFTWARE. // //--------------------------------------------------------------------------------------- -// fs_fwd.hpp - The forwarding header for the header/implementation seperated usage of +// fs_fwd.hpp - The forwarding header for the header/implementation separated usage of // ghc::filesystem. // This file can be include at any place, where ghc::filesystem api is needed while // not bleeding implementation details (e.g. system includes) into the global namespace, diff --git a/SIDFactoryII/source/libraries/ghc/fs_impl.h b/SIDFactoryII/source/libraries/ghc/fs_impl.h index a8625f7f..d2f3efd0 100644 --- a/SIDFactoryII/source/libraries/ghc/fs_impl.h +++ b/SIDFactoryII/source/libraries/ghc/fs_impl.h @@ -25,7 +25,7 @@ // SOFTWARE. // //--------------------------------------------------------------------------------------- -// fs_impl.hpp - The implementation header for the header/implementation seperated usage of +// fs_impl.hpp - The implementation header for the header/implementation separated usage of // ghc::filesystem. // This file can be used to hide the implementation of ghc::filesystem into a single cpp. // The cpp has to include this before including fs_fwd.hpp directly or via a different diff --git a/SIDFactoryII/source/libraries/ghc/fs_std_fwd.h b/SIDFactoryII/source/libraries/ghc/fs_std_fwd.h index 9956a861..c32d3659 100644 --- a/SIDFactoryII/source/libraries/ghc/fs_std_fwd.h +++ b/SIDFactoryII/source/libraries/ghc/fs_std_fwd.h @@ -25,7 +25,7 @@ // SOFTWARE. // //--------------------------------------------------------------------------------------- -// fs_std_fwd.hpp - The forwarding header for the header/implementation seperated usage of +// fs_std_fwd.hpp - The forwarding header for the header/implementation separated usage of // ghc::filesystem that uses std::filesystem if it detects it. // This file can be include at any place, where fs::filesystem api is needed while // not bleeding implementation details (e.g. system includes) into the global namespace, diff --git a/SIDFactoryII/source/libraries/ghc/fs_std_impl.h b/SIDFactoryII/source/libraries/ghc/fs_std_impl.h index 85d4c443..70f57936 100644 --- a/SIDFactoryII/source/libraries/ghc/fs_std_impl.h +++ b/SIDFactoryII/source/libraries/ghc/fs_std_impl.h @@ -25,7 +25,7 @@ // SOFTWARE. // //--------------------------------------------------------------------------------------- -// fs_std_impl.hpp - The implementation header for the header/implementation seperated usage of +// fs_std_impl.hpp - The implementation header for the header/implementation separated usage of // ghc::filesystem that does nothing if std::filesystem is detected. // This file can be used to hide the implementation of ghc::filesystem into a single cpp. // The cpp has to include this before including fs_std_fwd.hpp directly or via a different diff --git a/SIDFactoryII/source/libraries/miniz/miniz.c b/SIDFactoryII/source/libraries/miniz/miniz.c index 73afcf14..5a7f70de 100644 --- a/SIDFactoryII/source/libraries/miniz/miniz.c +++ b/SIDFactoryII/source/libraries/miniz/miniz.c @@ -9,7 +9,7 @@ * Change History 10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!): - Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks kahmyong.moon@hp.com) which could cause locate files to not find files. This bug - would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() + would only have occurred in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() (which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag). - Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size - Fixing mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries. @@ -699,7 +699,7 @@ enum // pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. // On return: // Function returns a pointer to the decompressed data, or NULL on failure. -// *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. +// *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on incompressible data. // The caller must call mz_free() on the returned block when it's no longer needed. void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); @@ -811,7 +811,7 @@ enum // flags: The max match finder probes (default is 128) logically OR'd against the above flags. Higher probes are slower but improve compression. // On return: // Function returns a pointer to the compressed data, or NULL on failure. -// *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on uncompressible data. +// *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on incompressible data. // The caller must free() the returned block when it's no longer needed. void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); diff --git a/SIDFactoryII/source/libraries/miniz/tinfl.c b/SIDFactoryII/source/libraries/miniz/tinfl.c index a17a156b..3b34484a 100644 --- a/SIDFactoryII/source/libraries/miniz/tinfl.c +++ b/SIDFactoryII/source/libraries/miniz/tinfl.c @@ -55,7 +55,7 @@ enum // pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. // On return: // Function returns a pointer to the decompressed data, or NULL on failure. -// *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. +// *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on incompressible data. // The caller must free() the returned block when it's no longer needed. void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); diff --git a/SIDFactoryII/source/libraries/picopng/picopng.cpp b/SIDFactoryII/source/libraries/picopng/picopng.cpp index c54888a1..21dc9a56 100644 --- a/SIDFactoryII/source/libraries/picopng/picopng.cpp +++ b/SIDFactoryII/source/libraries/picopng/picopng.cpp @@ -13,13 +13,13 @@ in_size: size of the input PNG file in bytes. convert_to_rgba32: optional parameter, true by default. Set to true to get the output in RGBA 32-bit (8 bit per channel) color format no matter what color type the original PNG image had. This gives predictable, - useable data from any random input PNG. + usable data from any random input PNG. Set to false to do no color conversion at all. The result then has the same data type as the PNG image, which can range from 1 bit to 64 bits per pixel. Information about the color type or palette colors are not provided. You need to know this information yourself to be able to use the data so this only works for trusted PNG files. Use LodePNG instead of picoPNG if you need this information. -return: 0 if success, not 0 if some error occured. +return: 0 if success, not 0 if some error occurred. */ namespace PicoPNG diff --git a/SIDFactoryII/source/libraries/residfp/EnvelopeGenerator.cpp b/SIDFactoryII/source/libraries/residfp/EnvelopeGenerator.cpp index 7a47f0aa..e97960a9 100644 --- a/SIDFactoryII/source/libraries/residfp/EnvelopeGenerator.cpp +++ b/SIDFactoryII/source/libraries/residfp/EnvelopeGenerator.cpp @@ -39,7 +39,7 @@ const unsigned int DAC_BITS = 8; * The rate counter is a 15 bit register which is left shifted each cycle. * When the counter reaches a specific comparison value, * the envelope counter is incremented (attack) or decremented - * (decay/release) and the rate counter is resetted. + * (decay/release) and the rate counter is reset. * * see [kevtris.org](http://blog.kevtris.org/?p=13) */ diff --git a/SIDFactoryII/source/libraries/residfp/Filter6581.h b/SIDFactoryII/source/libraries/residfp/Filter6581.h index ad0fe90c..eaca3911 100644 --- a/SIDFactoryII/source/libraries/residfp/Filter6581.h +++ b/SIDFactoryII/source/libraries/residfp/Filter6581.h @@ -154,7 +154,7 @@ class Integrator; * in triode mode (a.k.a. linear mode or ohmic mode). * * Even in "linear mode", an NMOS FET is only an approximation of a resistor, - * as the apparant resistance increases with increasing drain-to-source + * as the apparent resistance increases with increasing drain-to-source * voltage. If the drain-to-source voltage should approach the gate voltage * of 12V, the NMOS FET will enter saturation mode (a.k.a. active mode), and * the NMOS FET will not operate anywhere like a resistor. diff --git a/SIDFactoryII/source/libraries/residfp/SID.h b/SIDFactoryII/source/libraries/residfp/SID.h index dc328c9a..332fbbc1 100644 --- a/SIDFactoryII/source/libraries/residfp/SID.h +++ b/SIDFactoryII/source/libraries/residfp/SID.h @@ -121,7 +121,7 @@ class SID int output() const; /** - * Calculate the numebr of cycles according to current parameters + * Calculate the number of cycles according to current parameters * that it takes to reach sync. * * @param sync whether to do the actual voice synchronization @@ -201,7 +201,7 @@ class SID /** * Setting of SID sampling parameters. * - * Use a clock freqency of 985248Hz for PAL C64, 1022730Hz for NTSC C64. + * Use a clock frequency of 985248Hz for PAL C64, 1022730Hz for NTSC C64. * The default end of passband frequency is pass_freq = 0.9*sample_freq/2 * for sample frequencies up to ~ 44.1kHz, and 20kHz for higher sample frequencies. * diff --git a/SIDFactoryII/source/libraries/residfp/WaveformGenerator.cpp b/SIDFactoryII/source/libraries/residfp/WaveformGenerator.cpp index 7b9b43ee..29095326 100644 --- a/SIDFactoryII/source/libraries/residfp/WaveformGenerator.cpp +++ b/SIDFactoryII/source/libraries/residfp/WaveformGenerator.cpp @@ -69,7 +69,7 @@ const int DAC_BITS = 12; * cycle 2: second phase of the shift, the latched value becomes active in the first * half of the clock and from the second half the register returns to normal operation. * - * When the test or reset lines are active the first phase is executed at every cyle + * When the test or reset lines are active the first phase is executed at every cycle * until the signal is released triggering the second phase. */ void WaveformGenerator::clock_shift_register(unsigned int bit0) diff --git a/SIDFactoryII/source/libraries/residfp/resample/SincResampler.h b/SIDFactoryII/source/libraries/residfp/resample/SincResampler.h index 941e7c92..e49ff801 100644 --- a/SIDFactoryII/source/libraries/residfp/resample/SincResampler.h +++ b/SIDFactoryII/source/libraries/residfp/resample/SincResampler.h @@ -82,7 +82,7 @@ class SincResampler final : public Resampler public: /** - * Use a clock freqency of 985248Hz for PAL C64, 1022730Hz for NTSC C64. + * Use a clock frequency of 985248Hz for PAL C64, 1022730Hz for NTSC C64. * The default end of passband frequency is pass_freq = 0.9*sample_freq/2 * for sample frequencies up to ~ 44.1kHz, and 20kHz for higher sample frequencies. * diff --git a/SIDFactoryII/source/runtime/editor/components/component_track.h b/SIDFactoryII/source/runtime/editor/components/component_track.h index 0c6efb72..26932b7d 100644 --- a/SIDFactoryII/source/runtime/editor/components/component_track.h +++ b/SIDFactoryII/source/runtime/editor/components/component_track.h @@ -278,7 +278,7 @@ namespace Editor // Edit state const EditState& m_EditState; - // Auxilary song data + // Auxiliary song data const AuxilaryDataCollection& m_AuxilaryDataPlayMarkers; // Muted diff --git a/SIDFactoryII/source/runtime/editor/components/component_tracks.cpp b/SIDFactoryII/source/runtime/editor/components/component_tracks.cpp index 9b1ce2e7..08c03f8a 100644 --- a/SIDFactoryII/source/runtime/editor/components/component_tracks.cpp +++ b/SIDFactoryII/source/runtime/editor/components/component_tracks.cpp @@ -211,7 +211,7 @@ namespace Editor // Consume input on focus track consume |= (*m_DataSource)[m_FocusTrackIndex]->ConsumeInput(inKeyboard, inCursorControl, inComponentsManager); - // Syncronize event track position + // Synchronize event track position int focus_track_event_pos = (*m_DataSource)[m_FocusTrackIndex]->GetEventPosition(); if (m_EventPos != focus_track_event_pos) { diff --git a/SIDFactoryII/source/runtime/editor/components_manager.cpp b/SIDFactoryII/source/runtime/editor/components_manager.cpp index d0bef19a..2d45be88 100644 --- a/SIDFactoryII/source/runtime/editor/components_manager.cpp +++ b/SIDFactoryII/source/runtime/editor/components_manager.cpp @@ -390,7 +390,7 @@ namespace Editor return true; } - // Consume non exlusive input + // Consume non exclusive input if (m_FocusComponent == nullptr || !m_FocusComponent->ConsumeNonExclusiveInput(inMouse)) { for (auto& component : m_Components) diff --git a/SIDFactoryII/source/runtime/editor/converters/cc/source_ct.cpp b/SIDFactoryII/source/runtime/editor/converters/cc/source_ct.cpp index 787dc6ef..53d9f94b 100644 --- a/SIDFactoryII/source/runtime/editor/converters/cc/source_ct.cpp +++ b/SIDFactoryII/source/runtime/editor/converters/cc/source_ct.cpp @@ -311,7 +311,7 @@ namespace Converter } /** - * Query if convertions is possible + * Query if conversions is possible */ bool SourceCt::CanConvert() const @@ -496,7 +496,7 @@ namespace Converter unsigned short address_pulse_table = m_RawData[0x0fc2] | m_RawData[0x0fc3] << 8; // We cannot transfer the pulse table as is (too much action per row) so it is parked in an - // easy-to-access array for easier retrival when referred to from instruments and sequence + // easy-to-access array for easier retrieval when referred to from instruments and sequence // commands later. A set of rows (usually larger) in SF2 then have to be built up. for (int row = 0; row < 0x40; row++) for (int col = 0; col < 4; col++) diff --git a/SIDFactoryII/source/runtime/editor/converters/null/converter_null.cpp b/SIDFactoryII/source/runtime/editor/converters/null/converter_null.cpp index 823a5058..dc92caaf 100644 --- a/SIDFactoryII/source/runtime/editor/converters/null/converter_null.cpp +++ b/SIDFactoryII/source/runtime/editor/converters/null/converter_null.cpp @@ -47,7 +47,7 @@ namespace Editor )); } - // Return true, to indicate that the convertion + // Return true, to indicate that the conversion return true; } diff --git a/SIDFactoryII/source/runtime/editor/converters/utils/sf2_interface.cpp b/SIDFactoryII/source/runtime/editor/converters/utils/sf2_interface.cpp index cc99e64e..4ed9567c 100644 --- a/SIDFactoryII/source/runtime/editor/converters/utils/sf2_interface.cpp +++ b/SIDFactoryII/source/runtime/editor/converters/utils/sf2_interface.cpp @@ -56,7 +56,7 @@ namespace SF2 m_CommandName[Cmd_Arpeggio] = "Arpeggio/Chord"; m_CommandName[Cmd_Fret] = "Fret"; m_CommandName[Cmd_ADSR_Note] = "ADSR (Note)"; - m_CommandName[Cmd_ADSR_Persist] = "ADSR (Persistant)"; + m_CommandName[Cmd_ADSR_Persist] = "ADSR (Persistent)"; m_CommandName[Cmd_Index_Filter] = "Filter Index"; m_CommandName[Cmd_Index_Wave] = "Wave Index"; m_CommandName[Cmd_Demo_Flag] = "Demo Flag"; @@ -159,7 +159,7 @@ namespace SF2 unsigned short auxilary_data_vector = file_writer.GetWriteAddress(); m_DriverInfo->GetAuxilaryDataCollection().Save(file_writer); - // Adjust IRQ and auxilary data vectors in file + // Adjust IRQ and auxiliary data vectors in file const unsigned short driver_init_vector = m_DriverInfo->GetDriverCommon().m_InitAddress; (*file)[driver_init_vector - 2] = static_cast(irq_vector & 0xff); (*file)[driver_init_vector - 1] = static_cast(irq_vector >> 8); @@ -331,7 +331,7 @@ namespace SF2 /** * Returns a bool whether the specified table is supported by the SF2 driver. * - * If TRUE is specified as the second paramater, a message is written to the + * If TRUE is specified as the second parameter, a message is written to the * console and the program stops. */ bool Interface::IsTableSupported(int inTableType, bool inCoutOnError) @@ -685,7 +685,7 @@ namespace SF2 } /** - * Append or reuse an entire row of bytes in the specificed table. + * Append or reuse an entire row of bytes in the specified table. * * This version is suitable for tables such as instruments or commands, where * the rows are completely independent. diff --git a/SIDFactoryII/source/runtime/editor/datasources/datasource_directory.cpp b/SIDFactoryII/source/runtime/editor/datasources/datasource_directory.cpp index e484c458..d54ab56c 100644 --- a/SIDFactoryII/source/runtime/editor/datasources/datasource_directory.cpp +++ b/SIDFactoryII/source/runtime/editor/datasources/datasource_directory.cpp @@ -169,7 +169,7 @@ namespace Editor // Sort the list std::sort(m_List.begin(), m_List.end(), [](const DirectoryEntry& inEntry1, const DirectoryEntry& inEntry2) { - // If the types are the same, lets check the filenames against eachother (and ignore case .. which means a transformation per comparasin, not fast.. but who cares! This is disk operation stuff) + // If the types are the same, lets check the filenames against each other (and ignore case .. which means a transformation per comparasin, not fast.. but who cares! This is disk operation stuff) if (inEntry1.m_Type == inEntry2.m_Type) { if (!(inEntry1.m_DisplayName.empty() ^ inEntry2.m_DisplayName.empty())) diff --git a/SIDFactoryII/source/runtime/editor/editor_facility.cpp b/SIDFactoryII/source/runtime/editor/editor_facility.cpp index fd77b021..38a06c89 100644 --- a/SIDFactoryII/source/runtime/editor/editor_facility.cpp +++ b/SIDFactoryII/source/runtime/editor/editor_facility.cpp @@ -712,7 +712,7 @@ namespace Editor const unsigned short auxilary_data_vector = file_writer.GetWriteAddress(); m_DriverInfo->GetAuxilaryDataCollection().Save(file_writer); - // Adjust IRQ and auxilary data vectors in file + // Adjust IRQ and auxiliary data vectors in file const unsigned short driver_init_vector = m_DriverInfo->GetDriverCommon().m_InitAddress; (*file)[driver_init_vector - 2] = static_cast(irq_vector & 0xff); (*file)[driver_init_vector - 1] = static_cast(irq_vector >> 8); diff --git a/SIDFactoryII/source/runtime/editor/overlay_control.cpp b/SIDFactoryII/source/runtime/editor/overlay_control.cpp index 6f97f9c3..ffb7cac9 100644 --- a/SIDFactoryII/source/runtime/editor/overlay_control.cpp +++ b/SIDFactoryII/source/runtime/editor/overlay_control.cpp @@ -185,7 +185,7 @@ namespace Editor } } - // sort the list, so that versions of drivers are ordered. This will be usefull to display a driver overlay of a lesser minor version! + // sort the list, so that versions of drivers are ordered. This will be useful to display a driver overlay of a lesser minor version! } diff --git a/SIDFactoryII/source/runtime/editor/screens/screen_edit.cpp b/SIDFactoryII/source/runtime/editor/screens/screen_edit.cpp index b2af035a..11cd650c 100644 --- a/SIDFactoryII/source/runtime/editor/screens/screen_edit.cpp +++ b/SIDFactoryII/source/runtime/editor/screens/screen_edit.cpp @@ -1098,7 +1098,7 @@ namespace Editor // Create data containers for each sequence ScreenEditUtils::PrepareSequenceDataSources(*m_DriverInfo, m_DriverState, *m_CPUMemory, m_SequenceDataSources); - // Status report lamda for sequence editing + // Status report lambda for sequence editing auto sequence_editing_status_report = [&](bool inIsSequenceReport, int inDataIndex, int inPackedSize) { m_IsTrackDataReportSequence = inIsSequenceReport; diff --git a/SIDFactoryII/source/runtime/editor/undo/undo.cpp b/SIDFactoryII/source/runtime/editor/undo/undo.cpp index ec9bd61a..51bf8446 100644 --- a/SIDFactoryII/source/runtime/editor/undo/undo.cpp +++ b/SIDFactoryII/source/runtime/editor/undo/undo.cpp @@ -263,7 +263,7 @@ namespace Editor m_CPUMemory.GetData(m_DataSnapshotAddressBegin, static_cast(data), m_DataSnapshotSize); inData.SetCPUMemoryData(data); - // Auxilary data table text + // Auxiliary data table text const auto& table_text = m_DriverInfo.GetAuxilaryDataCollection().GetTableText(); inData.SetAuxilaryDataTableText(table_text); } @@ -274,7 +274,7 @@ namespace Editor // CPU Memory m_CPUMemory.SetData(m_DataSnapshotAddressBegin, static_cast(inData.GetCPUMemoryData()), m_DataSnapshotSize); - // Auxilary data table text + // Auxiliary data table text auto& table_text = m_DriverInfo.GetAuxilaryDataCollection().GetTableText(); table_text = inData.GetAuxilaryDataTableText(); } diff --git a/SIDFactoryII/source/runtime/editor/utilities/import_utils.cpp b/SIDFactoryII/source/runtime/editor/utilities/import_utils.cpp index 81f8539e..c20e726c 100644 --- a/SIDFactoryII/source/runtime/editor/utilities/import_utils.cpp +++ b/SIDFactoryII/source/runtime/editor/utilities/import_utils.cpp @@ -325,7 +325,7 @@ namespace Editor // Copy music data CopyMusicData(inLoadedDriverInfo, inCPUMemory, inImportDriverInfo, inImportFile); - // Copy auxilary data + // Copy auxiliary data inLoadedDriverInfo.GetAuxilaryDataCollection() = inImportDriverInfo.GetAuxilaryDataCollection(); // Lock CPU memory for writing diff --git a/SIDFactoryII/source/runtime/execution/executionhandler.cpp b/SIDFactoryII/source/runtime/execution/executionhandler.cpp index 7b87022c..2657f9df 100644 --- a/SIDFactoryII/source/runtime/execution/executionhandler.cpp +++ b/SIDFactoryII/source/runtime/execution/executionhandler.cpp @@ -454,7 +454,7 @@ namespace Emulation { for (unsigned int i = 0; i < m_FastForwardUpdateCount; ++i) { - // Break out if less than a quater of the cycles of a frame remains + // Break out if less than a quarter of the cycles of a frame remains if (m_CyclesPerFrame - frameCapture.GetCyclesSpend() < m_CyclesPerFrame >> 2) break; diff --git a/SIDFactoryII/source/utils/config/configcolors.cpp b/SIDFactoryII/source/utils/config/configcolors.cpp index f8d8e13c..c030404a 100644 --- a/SIDFactoryII/source/utils/config/configcolors.cpp +++ b/SIDFactoryII/source/utils/config/configcolors.cpp @@ -122,7 +122,7 @@ namespace Utility Details::SetUserColor(inConfigFile, "Color.ScreenEdit.InfoRect.Text.Time.PlaybackState", UserColor::ScreenEditInfoRectTextTimePlaybackState, ioViewport, Color::DarkerGrey); Details::SetUserColor(inConfigFile, "Color.ScreenEdit.Table.Headline", UserColor::ScreenEditTableHeadline, ioViewport, Color::LightBlue); Details::SetUserColor(inConfigFile, "Color.ScreenEdit.Table.Headline.HotkeyLetter", UserColor::ScreenEditTableHeadlineHotkeyLetter, ioViewport, Color::White); - Details::SetUserColor(inConfigFile, "Color.Converters.Backgroud", UserColor::ConvertersBackground, ioViewport, Color::DarkerGrey); + Details::SetUserColor(inConfigFile, "Color.Converters.Background", UserColor::ConvertersBackground, ioViewport, Color::DarkerGrey); Details::SetUserColor(inConfigFile, "Color.Console.Background", UserColor::ConsoleBackground, ioViewport, Color::Black); Details::SetUserColor(inConfigFile, "Color.Console.Text", UserColor::ConsoleText, ioViewport, Color::LightGreen); diff --git a/SIDFactoryII/source/utils/config/configtypes.cpp b/SIDFactoryII/source/utils/config/configtypes.cpp index 90c50dba..6cec8896 100644 --- a/SIDFactoryII/source/utils/config/configtypes.cpp +++ b/SIDFactoryII/source/utils/config/configtypes.cpp @@ -167,7 +167,7 @@ namespace Utility if (!is_decimal) { - // Check if hexdecimal + // Check if hexadecimal if (length <= 2) return false; diff --git a/libs/SDL2-2.0.12/docs/doxyfile b/libs/SDL2-2.0.12/docs/doxyfile index baf1c98d..2c837dee 100644 --- a/libs/SDL2-2.0.12/docs/doxyfile +++ b/libs/SDL2-2.0.12/docs/doxyfile @@ -290,10 +290,10 @@ TYPEDEF_HIDES_STRUCT = YES # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/libs/SDL2-2.0.12/include/SDL_config_psp.h b/libs/SDL2-2.0.12/include/SDL_config_psp.h index 28efb4c5..3312e1c6 100644 --- a/libs/SDL2-2.0.12/include/SDL_config_psp.h +++ b/libs/SDL2-2.0.12/include/SDL_config_psp.h @@ -123,10 +123,10 @@ /* Enable the stub audio driver (src/audio/psp/\*.c) */ #define SDL_AUDIO_DRIVER_PSP 1 -/* PSP video dirver */ +/* PSP video driver */ #define SDL_VIDEO_DRIVER_PSP 1 -/* PSP render dirver */ +/* PSP render driver */ #define SDL_VIDEO_RENDER_PSP 1 #define SDL_POWER_PSP 1 diff --git a/libs/SDL2-2.0.12/include/SDL_hints.h b/libs/SDL2-2.0.12/include/SDL_hints.h index a3a53738..416b4338 100644 --- a/libs/SDL2-2.0.12/include/SDL_hints.h +++ b/libs/SDL2-2.0.12/include/SDL_hints.h @@ -174,7 +174,7 @@ extern "C" { * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the * context will be automatically saved and restored when pausing the application. Additionally, some * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this - * behavior, which is desireable when the application manages the graphics context, such as + * behavior, which is desirable when the application manages the graphics context, such as * an externally managed OpenGL context or attaching a Vulkan surface to the window. */ #define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" diff --git a/libs/SDL2-2.0.12/include/SDL_system.h b/libs/SDL2-2.0.12/include/SDL_system.h index d7974eb0..1d2b889a 100644 --- a/libs/SDL2-2.0.12/include/SDL_system.h +++ b/libs/SDL2-2.0.12/include/SDL_system.h @@ -281,7 +281,7 @@ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * \brief Detects the device family of WinRT platform on runtime * * \return Device family */ diff --git a/libs/SDL2-2.0.12/include/SDL_vulkan.h b/libs/SDL2-2.0.12/include/SDL_vulkan.h index d69a436b..9f1f552e 100644 --- a/libs/SDL2-2.0.12/include/SDL_vulkan.h +++ b/libs/SDL2-2.0.12/include/SDL_vulkan.h @@ -61,7 +61,7 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ * \name Vulkan support functions * * \note SDL_Vulkan_GetInstanceExtensions & SDL_Vulkan_CreateSurface API - * is compatable with Tizen's implementation of Vulkan in SDL. + * is compatible with Tizen's implementation of Vulkan in SDL. */ /* @{ */ diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h b/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h index 50a5a089..ff2329ed 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_hints.h @@ -174,7 +174,7 @@ extern "C" { * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the * context will be automatically saved and restored when pausing the application. Additionally, some * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this - * behavior, which is desireable when the application manages the graphics context, such as + * behavior, which is desirable when the application manages the graphics context, such as * an externally managed OpenGL context or attaching a Vulkan surface to the window. */ #define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h b/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h index d296ab1f..e502a91d 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_system.h @@ -290,7 +290,7 @@ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * \brief Detects the device family of WinRT platform on runtime * * \return Device family */ diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_vulkan.h b/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_vulkan.h index a3de1cea..5f5911ae 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_vulkan.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Headers/SDL_vulkan.h @@ -61,7 +61,7 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ * \name Vulkan support functions * * \note SDL_Vulkan_GetInstanceExtensions & SDL_Vulkan_CreateSurface API - * is compatable with Tizen's implementation of Vulkan in SDL. + * is compatible with Tizen's implementation of Vulkan in SDL. */ /* @{ */ diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h b/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h index 50a5a089..ff2329ed 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_hints.h @@ -174,7 +174,7 @@ extern "C" { * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the * context will be automatically saved and restored when pausing the application. Additionally, some * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this - * behavior, which is desireable when the application manages the graphics context, such as + * behavior, which is desirable when the application manages the graphics context, such as * an externally managed OpenGL context or attaching a Vulkan surface to the window. */ #define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h b/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h index d296ab1f..e502a91d 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_system.h @@ -290,7 +290,7 @@ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * \brief Detects the device family of WinRT platform on runtime * * \return Device family */ diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h b/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h index a3de1cea..5f5911ae 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_vulkan.h @@ -61,7 +61,7 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ * \name Vulkan support functions * * \note SDL_Vulkan_GetInstanceExtensions & SDL_Vulkan_CreateSurface API - * is compatable with Tizen's implementation of Vulkan in SDL. + * is compatible with Tizen's implementation of Vulkan in SDL. */ /* @{ */ diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h b/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h index 50a5a089..ff2329ed 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_hints.h @@ -174,7 +174,7 @@ extern "C" { * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the * context will be automatically saved and restored when pausing the application. Additionally, some * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this - * behavior, which is desireable when the application manages the graphics context, such as + * behavior, which is desirable when the application manages the graphics context, such as * an externally managed OpenGL context or attaching a Vulkan surface to the window. */ #define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h b/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h index d296ab1f..e502a91d 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_system.h @@ -290,7 +290,7 @@ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * \brief Detects the device family of WinRT platform on runtime * * \return Device family */ diff --git a/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_vulkan.h b/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_vulkan.h index a3de1cea..5f5911ae 100644 --- a/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_vulkan.h +++ b/macos/App/Contents/Frameworks/SDL2.framework/Versions/Current/Headers/SDL_vulkan.h @@ -61,7 +61,7 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ * \name Vulkan support functions * * \note SDL_Vulkan_GetInstanceExtensions & SDL_Vulkan_CreateSurface API - * is compatable with Tizen's implementation of Vulkan in SDL. + * is compatible with Tizen's implementation of Vulkan in SDL. */ /* @{ */ diff --git a/macos/Makefile b/macos/Makefile index 631d2e71..84a9ef97 100644 --- a/macos/Makefile +++ b/macos/Makefile @@ -128,7 +128,7 @@ $(DMG_CONTENTS): $(APP) $(EXE_SF2C) $(ARTIFACTS_FOLDER)/keys.html cp -r $(PROJECT_ROOT)/drivers ${DMG_CONTENTS}/$(APP_NAME)/drivers ln -s /Applications $(DMG_CONTENTS)/Applications -# Make a temporary DMG. This needs to be layed out nicely by hand before building the final DMG. +# Make a temporary DMG. This needs to be laid out nicely by hand before building the final DMG. $(DMG_RAW): $(DMG_CONTENTS) rm -f $(DMG_RAW) hdiutil create -srcfolder "$<" -volname "$(DMG_TITLE)" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size $(DMG_SIZE)k $@ diff --git a/macos/README.md b/macos/README.md index bbcb1c19..5884810d 100644 --- a/macos/README.md +++ b/macos/README.md @@ -23,7 +23,7 @@ version is correct) ### Build "raw" DMG image This creates a DMG image that is ready for distribution, except that the window -not nicely layed out when you open it, and it isn't compressed. The created +not nicely laid out when you open it, and it isn't compressed. The created image is in the `artifacts` folder. From `sidfactory2/macos`: diff --git a/tools/pngquant/README.txt b/tools/pngquant/README.txt index bbb28e84..4a034841 100644 --- a/tools/pngquant/README.txt +++ b/tools/pngquant/README.txt @@ -1,6 +1,6 @@ # pngquant 2 -[pngquant](https://pngquant.org) is a PNG compresor that significantly reduces file sizes by converting images to a more efficient 8-bit PNG format *with alpha channel* (often 60-80% smaller than 24/32-bit PNG files). Compressed images are fully standards-compliant and are supported by all web browsers and operating systems. +[pngquant](https://pngquant.org) is a PNG compressor that significantly reduces file sizes by converting images to a more efficient 8-bit PNG format *with alpha channel* (often 60-80% smaller than 24/32-bit PNG files). Compressed images are fully standards-compliant and are supported by all web browsers and operating systems. [This](https://github.com/kornelski/pngquant) is the official `pngquant` repository. The compression engine is also available [as an embeddable library](https://github.com/ImageOptim/libimagequant).