Skip to content

Commit

Permalink
Merge pull request #8 from a-detiste/master
Browse files Browse the repository at this point in the history
TOOLS: Fix typos
  • Loading branch information
sev- committed Feb 12, 2016
2 parents 1984f6b + 50102a8 commit 21a5976
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion compress.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ std::string CompressionTool::getHelp() const {

if (_supportedFormats & AUDIO_MP3) {
os << "\nMP3 mode params:\n";
os << " --lame-path <path> Path to the lame excutable to use (default:lame)\n";
os << " --lame-path <path> Path to the lame executable to use (default:lame)\n";
os << " -b <rate> <rate> is the minimal bitrate (default:unset)\n";
os << " -B <rate> <rate> is the maximum bitrate (default:unset)\n";
os << " --vbr LAME uses the VBR mode (default)\n";
Expand Down
2 changes: 1 addition & 1 deletion engines/mohawk/utils/stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Stream {
virtual ~Stream() {}

/**
* Returns true if any I/O failure occured.
* Returns true if any I/O failure occurred.
* This flag is never cleared automatically. In order to clear it,
* client code has to call clearIOFailed() explicitly.
*
Expand Down
4 changes: 2 additions & 2 deletions gui/pages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ wxWindow *ChooseAudioOptionsMp3Page::CreatePanel(wxWindow *parent) {

/*
"\nMP3 mode params:\n"
" --lame-path <path> Path to the lame excutable to use (default: lame)\n"
" --lame-path <path> Path to the lame executable to use (default: lame)\n"
" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:" minBitrDef_str "%d)\n"
" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%" maxBitrDef_str ")\n"
" --vbr LAME uses the VBR mode (default)\n"
Expand Down Expand Up @@ -1522,7 +1522,7 @@ wxThread::ExitCode ProcessToolThread::Entry() {
_success = true;
} catch (ToolException &err) {
wxMutexLocker lock(_output.mutex);
_output.buffer = _output.buffer + "\nFatal Error Occured: " + err.what() + "\n";
_output.buffer = _output.buffer + "\nFatal Error Occurred: " + err.what() + "\n";
}
_finished = true;
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion sound/audiostream.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class AudioStream {
/**
* Fill the given buffer with up to numSamples samples.
* Returns the actual number of samples read, or -1 if
* a critical error occured (note: you *must* check if
* a critical error occurred (note: you *must* check if
* this value is less than what you requested, this can
* happen when the stream is fully used up).
*
Expand Down

0 comments on commit 21a5976

Please sign in to comment.