git-svn-id: https://svn.code.sf.net/p/pianobooster/code/trunk@14 ba081f5d-443b-49a7-ac4b-446c3f91f371

This commit is contained in:
louisjb 2008-12-16 21:35:42 +00:00
parent f64181d5aa
commit be60ae242c
5 changed files with 9 additions and 9 deletions

View File

@ -2,7 +2,7 @@
/*! /*!
@file Chord.h @file Chord.h
@brief Find the all the chords in a piece of muisic. @brief Find the all the chords in a piece of music.
@author L. J. Barman @author L. J. Barman
@ -140,7 +140,7 @@ public:
} }
static void setPianoRange(int lowestNote, int highestNote ){ static void setPianoRange(int lowestNote, int highestNote ){
m_cfg_highestPianoNote = highestNote; // The highest note on the users piano keboard; m_cfg_highestPianoNote = highestNote; // The highest note on the users piano keyboard;
m_cfg_lowestPianoNote = lowestNote; m_cfg_lowestPianoNote = lowestNote;
} }

View File

@ -731,7 +731,7 @@ void CConductor::rewind()
m_currentTimeSigTop = m_startTimeSigTop; m_currentTimeSigTop = m_startTimeSigTop;
m_currentTimeSigBottom = m_startTimeSigBottom; m_currentTimeSigBottom = m_startTimeSigBottom;
m_goodPlayedNotes.clear(); // The good notes the pianest plays m_goodPlayedNotes.clear(); // The good notes the pianist plays
m_goodNoteLines.clear(); m_goodNoteLines.clear();
m_badNoteLines.clear(); m_badNoteLines.clear();
resetWantedChord(); resetWantedChord();

View File

@ -2,7 +2,7 @@
/*! /*!
@file Conductor.h @file Conductor.h
@brief The realtime midi engine. Send notes to the midi device and reponds to the midi keyboard. @brief The realtime midi engine. Send notes to the midi device and responds to the midi keyboard.
@author L. J. Barman @author L. J. Barman
@ -74,7 +74,7 @@ public:
//! first check if there is space to add a midi event //! first check if there is space to add a midi event
int midiEventSpace(); int midiEventSpace();
//! add a chord to be played by the pianest //! add a chord to be played by the pianist
void chordEventInsert(CChord chord) {m_wantedChordQueue->push(chord);} void chordEventInsert(CChord chord) {m_wantedChordQueue->push(chord);}
//! first check if there is space to add a chord event //! first check if there is space to add a chord event
@ -237,8 +237,8 @@ private:
int m_silenceTimeOut; // used to create silence if the student stops for toooo long int m_silenceTimeOut; // used to create silence if the student stops for toooo long
CChord m_wantedChord; // The chord the pianist needs to play CChord m_wantedChord; // The chord the pianist needs to play
CChord m_savedwantedChord; // A copy of the wanted chord complete with both left and right parts CChord m_savedwantedChord; // A copy of the wanted chord complete with both left and right parts
CChord m_goodPlayedNotes; // The good notes the pianest plays CChord m_goodPlayedNotes; // The good notes the pianist plays
CChord m_goodNoteLines; // The coloured note lines that appear on the score when the pianest plays CChord m_goodNoteLines; // The coloured note lines that appear on the score when the pianist plays
CChord m_badNoteLines; CChord m_badNoteLines;
int m_pianistSplitPoint; // Defines which notes go in the base and treble clef int m_pianistSplitPoint; // Defines which notes go in the base and treble clef
int m_lastSound; int m_lastSound;

View File

@ -44,7 +44,7 @@ public:
CMidiDevice(); CMidiDevice();
~CMidiDevice(); ~CMidiDevice();
void init(); void init();
//! add a midi event to be played imidiataly //! add a midi event to be played immediately
void playMidiEvent(CMidiEvent event); void playMidiEvent(CMidiEvent event);
int checkMidiInput(); int checkMidiInput();
CMidiEvent readMidiInput(); CMidiEvent readMidiInput();

View File

@ -111,7 +111,7 @@ private:
int m_head; int m_head;
int m_tail; int m_tail;
// this should be atomic operation when two dfferent threads are at each end of the queue // this should be atomic operation when two different threads are at each end of the queue
volatile int m_count; volatile int m_count;
}; };