diff --git a/PianoBooster/src/Cfg.h b/PianoBooster/src/Cfg.h index e584a15..71ddb8e 100644 --- a/PianoBooster/src/Cfg.h +++ b/PianoBooster/src/Cfg.h @@ -50,6 +50,12 @@ public: static const float staveThickness() {return 1;} + static const int playZoneEarly() {return 25;} // 20 Was 25 + static const int playZoneLate() {return 25;} + static const int silenceTimeOut() {return 8000;} // the time in msec before everything goes quiet + static const int chordNoteGap() {return 10;} // all notes in a cord must be spaced less than this a gap + + static const CColour menuColour() {return CColour(0.1, 0.6, 0.6);} static const CColour menuSelectedColour(){return CColour(0.7, 0.7, 0.1);} diff --git a/PianoBooster/src/Chord.h b/PianoBooster/src/Chord.h index 3106b19..c642639 100644 --- a/PianoBooster/src/Chord.h +++ b/PianoBooster/src/Chord.h @@ -31,7 +31,7 @@ #include -#include "Util.h" +#include "Cfg.h" #include "MidiFile.h" #include "Queue.h" @@ -186,7 +186,7 @@ public: m_runningDeltaTime = 0; m_completeChord.clear(); m_currentChord.clear(); - m_cfg_ChordNoteGap = CMidiFile::ppqnAdjust(Cfg2::chordNoteGap()); + m_cfg_ChordNoteGap = CMidiFile::ppqnAdjust(Cfg::chordNoteGap()); } diff --git a/PianoBooster/src/Conductor.cpp b/PianoBooster/src/Conductor.cpp index 7dda6ec..00fe693 100644 --- a/PianoBooster/src/Conductor.cpp +++ b/PianoBooster/src/Conductor.cpp @@ -369,7 +369,7 @@ void CConductor::resetWantedChord() m_wantedChord.clear(); m_chordDeltaTime = m_playingDeltaTime; m_pianistSplitPoint = MIDDLE_C; - m_followPlayingTimeOut = CMidiFile::ppqnAdjust(Cfg2::playZoneLate() * SPEED_ADJUST_FACTOR); + m_followPlayingTimeOut = CMidiFile::ppqnAdjust(Cfg::playZoneLate() * SPEED_ADJUST_FACTOR); outputStavedNotes(); m_followState = PB_FOLLOW_searching; @@ -660,7 +660,7 @@ void CConductor::realTimeEngine(int mSecTicks) // Don't keep any saved notes off if there are no notes down if (pianistNotesDown() == 0) outputSavedNotesOff(); - m_silenceTimeOut = Cfg2::silenceTimeOut(); + m_silenceTimeOut = Cfg::silenceTimeOut(); } } return; @@ -773,8 +773,8 @@ void CConductor::rewind() m_cfg_imminentNotesOffPoint = CMidiFile::ppqnAdjust(-15); // look ahead and find an Notes off coming up // Annie song 25 - m_cfg_playZoneEarly = CMidiFile::ppqnAdjust(Cfg2::playZoneEarly()); // when playing along - m_cfg_playZoneLate = CMidiFile::ppqnAdjust(Cfg2::playZoneLate()); + m_cfg_playZoneEarly = CMidiFile::ppqnAdjust(Cfg::playZoneEarly()); // when playing along + m_cfg_playZoneLate = CMidiFile::ppqnAdjust(Cfg::playZoneLate()); } void CConductor::init() diff --git a/PianoBooster/src/Draw.cpp b/PianoBooster/src/Draw.cpp index a59ce17..d9b570b 100644 --- a/PianoBooster/src/Draw.cpp +++ b/PianoBooster/src/Draw.cpp @@ -428,8 +428,8 @@ void CDraw::drawSymbol(CSymbol symbol, float x, float y) { float topY = CStavePos(PB_PART_right, 10).getPosY(); float bottomY = CStavePos(PB_PART_left, -10).getPosY(); - float early = Cfg2::playZoneEarly() * HORIZONTAL_SPACING_FACTOR; - float late = Cfg2::playZoneLate() * HORIZONTAL_SPACING_FACTOR; + float early = Cfg::playZoneEarly() * HORIZONTAL_SPACING_FACTOR; + float late = Cfg::playZoneLate() * HORIZONTAL_SPACING_FACTOR; //glColor3f (0.7, 1.0, 0.7); glColor3f (0.0, 0.0, 0.3); glRectf(x-late, topY, x + early, bottomY); diff --git a/PianoBooster/src/ReleaseNote.txt b/PianoBooster/src/ReleaseNote.txt index a97aafb..49bb8b5 100644 --- a/PianoBooster/src/ReleaseNote.txt +++ b/PianoBooster/src/ReleaseNote.txt @@ -4,7 +4,9 @@ v0.5.0: (28 November 2008) v0.5.0: (29 December 2008) - fixed the windows file open bug +- Changed the default wrong note sound to - changed the wrong note sound to use a separate midi channel. +- */ diff --git a/PianoBooster/src/Util.h b/PianoBooster/src/Util.h index 45153f9..a9c9e23 100644 --- a/PianoBooster/src/Util.h +++ b/PianoBooster/src/Util.h @@ -83,14 +83,4 @@ void ppError(const char *msg, ...); #define SPEED_ADJUST_FACTOR 1000 #define deltaAdjust(delta) ((delta)/SPEED_ADJUST_FACTOR ) -class Cfg2 -{ -public: - static const int playZoneEarly() {return 25;} // 20 Was 25 - static const int playZoneLate() {return 25;} - static const int silenceTimeOut() {return 8000;} // the time in msec before everything goes quiet - static const int chordNoteGap() {return 10;} // all notes in a cord must be spaced less than this a gap - -}; - #endif //__UTIL_H__