Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed many typos #194

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions SIDFactoryII/change_todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest we remove this file. @TheRealLaxity? @RawPowerLaxity?

* 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
Expand All @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions SIDFactoryII/source/libraries/ghc/filesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The folder libraries contains dependencies that are copied from the source. Please do not change these files, as it will make upgrading dependencies harder.

// 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)
Expand All @@ -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 {
Expand Down Expand Up @@ -245,7 +245,7 @@ class GHC_FS_API_CLASS path
using path_helper_base<value_type>::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
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/libraries/ghc/fs_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/libraries/ghc/fs_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/libraries/ghc/fs_std_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/libraries/ghc/fs_std_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions SIDFactoryII/source/libraries/miniz/miniz.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]) 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.
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/libraries/miniz/tinfl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions SIDFactoryII/source/libraries/picopng/picopng.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/libraries/residfp/Filter6581.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions SIDFactoryII/source/libraries/residfp/SID.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ namespace Editor
// Edit state
const EditState& m_EditState;

// Auxilary song data
// Auxiliary song data
const AuxilaryDataCollection& m_AuxilaryDataPlayMarkers;

// Muted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/runtime/editor/components_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ namespace Converter
}

/**
* Query if convertions is possible
* Query if conversions is possible
*/

bool SourceCt::CanConvert() const
Expand Down Expand Up @@ -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++)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace Editor
));
}

// Return true, to indicate that the convertion
// Return true, to indicate that the conversion
return true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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<unsigned char>(irq_vector & 0xff);
(*file)[driver_init_vector - 1] = static_cast<unsigned char>(irq_vector >> 8);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/runtime/editor/editor_facility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<unsigned char>(irq_vector & 0xff);
(*file)[driver_init_vector - 1] = static_cast<unsigned char>(irq_vector >> 8);
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/runtime/editor/overlay_control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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!
}


Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/runtime/editor/screens/screen_edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions SIDFactoryII/source/runtime/editor/undo/undo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ namespace Editor
m_CPUMemory.GetData(m_DataSnapshotAddressBegin, static_cast<void*>(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);
}
Expand All @@ -274,7 +274,7 @@ namespace Editor
// CPU Memory
m_CPUMemory.SetData(m_DataSnapshotAddressBegin, static_cast<const void*>(inData.GetCPUMemoryData()), m_DataSnapshotSize);

// Auxilary data table text
// Auxiliary data table text
auto& table_text = m_DriverInfo.GetAuxilaryDataCollection().GetTableText();
table_text = inData.GetAuxilaryDataTableText();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SIDFactoryII/source/runtime/execution/executionhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading