summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/cassimg.cpp4
-rw-r--r--src/lib/formats/cassimg.h4
-rw-r--r--src/lib/util/options.h2
-rw-r--r--src/lib/util/zippath.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
index 474bf9db589..816af2dccfd 100644
--- a/src/lib/formats/cassimg.cpp
+++ b/src/lib/formats/cassimg.cpp
@@ -725,7 +725,7 @@ cassette_image::error cassette_put_modulated_data(cassette_image *cassette, int
b = *(data_bytes++);
for (i = 0; i < 8; i++)
{
- pulse_frequency = (b & (1 << i)) ? modulation->one_frequency_cannonical : modulation->zero_frequency_cannonical;
+ pulse_frequency = (b & (1 << i)) ? modulation->one_frequency_canonical : modulation->zero_frequency_canonical;
pulse_period = 1 / pulse_frequency;
err = cassette_put_samples(cassette, 0, time_index, pulse_period, wave_bytes_length, 1, wave_bytes, CASSETTE_WAVEFORM_8BIT);
if (err != cassette_image::error::SUCCESS)
@@ -836,7 +836,7 @@ cassette_image::error cassette_put_modulated_data_bit(cassette_image *cassette,
wave_bytes = choose_wave(modulation, &wave_bytes_length);
- pulse_frequency = (data) ? modulation->one_frequency_cannonical : modulation->zero_frequency_cannonical;
+ pulse_frequency = (data) ? modulation->one_frequency_canonical : modulation->zero_frequency_canonical;
pulse_period = 1 / pulse_frequency;
err = cassette_put_samples(cassette, 0, time_index, pulse_period, wave_bytes_length, 1, wave_bytes, CASSETTE_WAVEFORM_8BIT);
if (err != cassette_image::error::SUCCESS)
diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h
index 9ac2dad988b..5199c0e4a04 100644
--- a/src/lib/formats/cassimg.h
+++ b/src/lib/formats/cassimg.h
@@ -124,10 +124,10 @@ struct CassetteModulation
{
int flags;
double zero_frequency_low;
- double zero_frequency_cannonical;
+ double zero_frequency_canonical;
double zero_frequency_high;
double one_frequency_low;
- double one_frequency_cannonical;
+ double one_frequency_canonical;
double one_frequency_high;
};
diff --git a/src/lib/util/options.h b/src/lib/util/options.h
index 660ab9acdfa..3fcd9d5e144 100644
--- a/src/lib/util/options.h
+++ b/src/lib/util/options.h
@@ -248,7 +248,7 @@ private:
void throw_options_exception_if_appropriate(condition_type condition, std::ostringstream &error_stream);
// internal state
- std::vector<entry::shared_ptr> m_entries; // cannonical list of entries
+ std::vector<entry::shared_ptr> m_entries; // canonical list of entries
std::unordered_map<std::string, entry::weak_ptr> m_entrymap; // map for fast lookup
std::string m_command; // command found
std::vector<std::string> m_command_arguments; // command arguments
diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
index e04281cd98e..d8e90de11ff 100644
--- a/src/lib/util/zippath.cpp
+++ b/src/lib/util/zippath.cpp
@@ -867,7 +867,7 @@ done:
revised_path.clear();
if (filerr == osd_file::error::NONE)
{
- /* cannonicalize mainpath */
+ /* canonicalize mainpath */
std::string alloc_fullpath;
filerr = osd_get_full_path(alloc_fullpath, mainpath);
if (filerr == osd_file::error::NONE)