Skip to content

Commit 0d1f4ca

Browse files
Merge pull request #1317 from luzpaz/typos
Fix various typos
2 parents b921d8f + ca76357 commit 0d1f4ca

File tree

13 files changed

+29
-29
lines changed

13 files changed

+29
-29
lines changed

src/README.developer

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Anyway, maybe some things should be a bit more clearly defined so I started this
66
document with some pointers for best practices and procedures.
77

88
* STYLE *
9-
whatever floats your boat. Okay, maybe try to keep it atleast somewhat consistent :)
9+
whatever floats your boat. Okay, maybe try to keep it at least somewhat consistent :)
1010

1111
* TOOLS *
1212
MusE is highly dependent on Qt, mostly this is a good thing, especially as we want to
@@ -20,37 +20,37 @@ library, do check if Qt can provide the necessary functionality. Many times it c
2020
When making a release there are some steps that should always be done to make the
2121
packaging consistent and traceable.
2222

23-
1. make sure that version info is updated.
23+
1. Make sure that version info is updated.
2424
CMakeLists.txt:SET(MusE_VERSION "3.0.0pre1")
2525
CMakeLists.txt:SET(MusE_VERSION_FULL "3.0.0pre1")
2626

27-
2. add a release-line to the ChangeLog (search for old ones for some format hints)
27+
2. Add a release-line to the ChangeLog (search for old ones for some format hints)
2828

29-
3. commit everything to git
29+
3. Commit everything to git
3030

31-
4. now create the tarball from the build dir (could be a good idea to create a new build dir)
31+
4. Now create the tarball from the build dir (could be a good idea to create a new build dir)
3232
$ make clean (otherwise the tarball will way too big)
3333
$ make package_source
3434
feel free to ctrl-c out of this as soon as the .tar.gz build is done as it contines to make
3535
a lot of variants that we do not use.
3636

37-
5. verify that the built package has the right name and can be built
37+
5. Verify that the built package has the right name and can be built
3838

3939
NOTE: if you are making a point release (e.g. 3.0.1) the file name is based of the path so
4040
the package will be called muse-3.0.tar.gz while it really should be muse-3.0.1. Easiest
4141
way to fix this (for now) is to untar the package, rename the folder (in this case) from
4242
muse-3.0 to muse-3.0.1 and tar it back into muse-3.0.1.tar.gz.
4343

44-
6. make a tag in git for this particular checkin when you are satisfied the release is correct
44+
6. Make a tag in git for this particular checkin when you are satisfied the release is correct
4545
From 4.0 release we use https://semver.org/ formatted tags.
4646
For instance 4.0 pre release 2 is 4.0.0-pre2.
4747
'git tag -l' lists all of the previous tags.
4848
Use git tag -a <tag name> to create an annotated tag.
4949
To push the tag to master: git push --tags
5050

51-
7. create a releasenote
51+
7. Create a releasenote
5252

53-
8. upload both releasenote and tarball to the sourceforge page (or whatever is in fashion when
53+
8. Upload both releasenote and tarball to the sourceforge page (or whatever is in fashion when
5454
it's time).
5555
Update: Currently we upload to both sourceforge (because we always have and it's not a lot of work)
5656
and to the Releases page on github.
@@ -59,6 +59,6 @@ packaging consistent and traceable.
5959
The frontpage is html and resides a specific git repo.
6060
The news page is in the muse github wiki.
6161

62-
10.Update wikipedia to reflect the new release.
62+
10. Update wikipedia to reflect the new release.
6363

64-
11. send out a release mail
64+
11. Send out a release mail

src/README.softsynth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Open Settings->MidiPorts/SoftSynth.
2121

2222
- select a software synthesizer
23-
- press "Add Instance" to create an istance of this
23+
- press "Add Instance" to create an instance of this
2424
synthesizer; the synthi shows up in the list
2525
of instances with a unique name
2626

src/grepmidi_qt/grepmidi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ int main(int argc, char* argv[])
410410
break;
411411

412412
default:
413-
printf("unkown error\n");
413+
printf("unknown error\n");
414414
return -1;
415415
}
416416
}

src/muse/app.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4478,7 +4478,7 @@ bool MusE::clearSong(bool clear_all)
44784478
// Are any of the windows marked as 'delete on close'?
44794479
// Then we MUST wait until they delete, otherwise crashes will happen
44804480
// when the song is cleared due to still-active signal/slot connections
4481-
// and attempts by the various top levels to access non-existant tracks etc.
4481+
// and attempts by the various top levels to access non-existent tracks etc.
44824482
// It turns out that close() will call deleteLater() - NOT delete!
44834483
// Simply calling processEvents() several times did not let them delete.
44844484
// From help on QCoreApplication::processEvents():
@@ -4645,7 +4645,7 @@ bool MusE::clearSong(bool clear_all)
46454645
// Are any of the windows marked as 'delete on close'?
46464646
// Then we MUST wait until they delete, otherwise crashes will happen
46474647
// when the song is cleared due to still-active signal/slot connections
4648-
// and attempts by the various top levels to access non-existant tracks etc.
4648+
// and attempts by the various top levels to access non-existent tracks etc.
46494649
// It turns out that close() will call deleteLater() - NOT delete!
46504650
// Simply calling processEvents() several times did not let them delete.
46514651
// From help on QCoreApplication::processEvents():

src/muse/audio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ bool Audio::start()
323323
// Before we seek the transport, tell the sync() routine that when it calls seek(), DON'T re-enable all controllers.
324324
// When loading a song and the audio is stopped before loading then restarted after, this allows synths and
325325
// plugins to disable any controls where state data exists (custom data or control values).
326-
// The state data takes priority over automation contollers.
326+
// The state data takes priority over automation controllers.
327327
// Since this start() comes AFTER song loading, we need a way to prevent seekTransport(), below, from causing
328328
// sync() to cause seek() to re-enable all the controllers.
329329
// Thus preserving the existing state of all the controller enable flags, just this one time only.

src/muse/audiotrack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ void AudioTrack::setupPlugin(PluginI* plugin, int idx)
688688
}
689689
}
690690
else
691-
// Plugin is missing. Grab the information from the plugin's persistent properies.
691+
// Plugin is missing. Grab the information from the plugin's persistent properties.
692692
{
693693
const PluginConfiguration &pc = plugin->initialConfiguration();
694694
for(ciPluginControlList ipcl = pc._initParams.cbegin(); ipcl != pc._initParams.cend(); ++ipcl)

src/muse/functions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ bool merge_parts(const set<const Part*>& parts)
16971697
if (begin==INT_MAX || end==0)
16981698
{
16991699
printf("THIS SHOULD NEVER HAPPEN: begin==INT_MAX || end==0 in merge_parts()\n");
1700-
continue; // skip the actual work, as we cannot work under errorneous conditions.
1700+
continue; // skip the actual work, as we cannot work under erroneous conditions.
17011701
}
17021702

17031703
// create and prepare the new part

src/muse/libdivide.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ namespace libdivide_internal {
18071807

18081808
// The following convenience macros are used to build a type of the base
18091809
// divider class and give it as template arguments the C functions
1810-
// related to the macro name and the macro type paramaters.
1810+
// related to the macro name and the macro type parameters.
18111811

18121812
#define BRANCHFULL_DIVIDER(INT, TYPE) \
18131813
typedef base<INT, \
@@ -1942,7 +1942,7 @@ namespace libdivide_internal {
19421942

19431943
// This is the main divider class for use by the user (C++ API).
19441944
// The divider itself is stored in the div variable who's
1945-
// type is chosen by the dispatcher based on the template paramaters.
1945+
// type is chosen by the dispatcher based on the template parameters.
19461946
template<typename T, int ALGO = BRANCHFULL>
19471947
class divider
19481948
{

src/muse/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ int main(int argc, char* argv[])
10481048
AudioDriverSelect audioType = DriverConfigSetting;
10491049
bool force_plugin_rescan = false;
10501050
bool dont_plugin_rescan = false;
1051-
// A block because we don't want ths hanging around. Use it then lose it.
1051+
// A block because we don't want this hanging around. Use it then lose it.
10521052
{
10531053
QCommandLineParser parser;
10541054
QString errorMessage;
@@ -1175,7 +1175,7 @@ int main(int argc, char* argv[])
11751175
// and should be letting Qt handle the locale stuff.
11761176
// Usually when someone uses a c function in this app, they are not expecting
11771177
// (or are even aware of) any locale and usually expect the normal "C" locale.
1178-
// A check of virually all such calls in this app reveals that they are all used for simple
1178+
// A check of virtually all such calls in this app reveals that they are all used for simple
11791179
// things which do not - or even must not - require locale.
11801180
// For project files for example, we NEVER want locale considerations because that would
11811181
// break portability, sharing files with other machines in other locales.

src/muse/song.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4448,7 +4448,7 @@ void Song::beat()
44484448
continue;
44494449
}
44504450

4451-
// Some syncronization commands have the complete implementation in sync.cc
4451+
// Some synchronization commands have the complete implementation in sync.cc
44524452
// some have the executive part here in the song class to be executed in the song thread.
44534453
switch (command)
44544454
{
@@ -4730,7 +4730,7 @@ void Song::clear(bool signal, bool clear_all)
47304730
// p3.3.45 Clear all midi port devices.
47314731
for(int i = 0; i < MusECore::MIDI_PORTS; ++i)
47324732
{
4733-
// p3.3.50 Since midi ports are not deleted, clear all midi port in/out routes. They point to non-existant tracks now.
4733+
// p3.3.50 Since midi ports are not deleted, clear all midi port in/out routes. They point to non-existent tracks now.
47344734
MusEGlobal::midiPorts[i].inRoutes()->clear();
47354735
MusEGlobal::midiPorts[i].outRoutes()->clear();
47364736

@@ -4759,7 +4759,7 @@ void Song::clear(bool signal, bool clear_all)
47594759
{
47604760
// Since Jack midi devices are created dynamically, we must delete them.
47614761
// The destructor unregisters the device from Jack, which also disconnects all device-to-jack routes.
4762-
// This will also delete all midi-track-to-device routes, they point to non-existant midi tracks
4762+
// This will also delete all midi-track-to-device routes, they point to non-existent midi tracks
47634763
// which were all deleted above
47644764
delete (*imd);
47654765
// Remove the device from the list.
@@ -4772,7 +4772,7 @@ void Song::clear(bool signal, bool clear_all)
47724772
else if(dynamic_cast< MidiAlsaDevice* >(*imd))
47734773
{
47744774
// With alsa devices, we must not delete them (they're always in the list). But we must
4775-
// clear all routes. They point to non-existant midi tracks, which were all deleted above.
4775+
// clear all routes. They point to non-existent midi tracks, which were all deleted above.
47764776
(*imd)->inRoutes()->clear();
47774777
(*imd)->outRoutes()->clear();
47784778
}

0 commit comments

Comments
 (0)