Removed Cfg2
git-svn-id: https://svn.code.sf.net/p/pianobooster/code/trunk@21 ba081f5d-443b-49a7-ac4b-446c3f91f371
This commit is contained in:
parent
b0ee185f7c
commit
9be8aa910f
|
@ -50,6 +50,12 @@ public:
|
||||||
|
|
||||||
static const float staveThickness() {return 1;}
|
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 menuColour() {return CColour(0.1, 0.6, 0.6);}
|
||||||
static const CColour menuSelectedColour(){return CColour(0.7, 0.7, 0.1);}
|
static const CColour menuSelectedColour(){return CColour(0.7, 0.7, 0.1);}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "Util.h"
|
#include "Cfg.h"
|
||||||
#include "MidiFile.h"
|
#include "MidiFile.h"
|
||||||
#include "Queue.h"
|
#include "Queue.h"
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ public:
|
||||||
m_runningDeltaTime = 0;
|
m_runningDeltaTime = 0;
|
||||||
m_completeChord.clear();
|
m_completeChord.clear();
|
||||||
m_currentChord.clear();
|
m_currentChord.clear();
|
||||||
m_cfg_ChordNoteGap = CMidiFile::ppqnAdjust(Cfg2::chordNoteGap());
|
m_cfg_ChordNoteGap = CMidiFile::ppqnAdjust(Cfg::chordNoteGap());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -369,7 +369,7 @@ void CConductor::resetWantedChord()
|
||||||
m_wantedChord.clear();
|
m_wantedChord.clear();
|
||||||
m_chordDeltaTime = m_playingDeltaTime;
|
m_chordDeltaTime = m_playingDeltaTime;
|
||||||
m_pianistSplitPoint = MIDDLE_C;
|
m_pianistSplitPoint = MIDDLE_C;
|
||||||
m_followPlayingTimeOut = CMidiFile::ppqnAdjust(Cfg2::playZoneLate() * SPEED_ADJUST_FACTOR);
|
m_followPlayingTimeOut = CMidiFile::ppqnAdjust(Cfg::playZoneLate() * SPEED_ADJUST_FACTOR);
|
||||||
|
|
||||||
outputStavedNotes();
|
outputStavedNotes();
|
||||||
m_followState = PB_FOLLOW_searching;
|
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
|
// Don't keep any saved notes off if there are no notes down
|
||||||
if (pianistNotesDown() == 0)
|
if (pianistNotesDown() == 0)
|
||||||
outputSavedNotesOff();
|
outputSavedNotesOff();
|
||||||
m_silenceTimeOut = Cfg2::silenceTimeOut();
|
m_silenceTimeOut = Cfg::silenceTimeOut();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
@ -773,8 +773,8 @@ void CConductor::rewind()
|
||||||
m_cfg_imminentNotesOffPoint = CMidiFile::ppqnAdjust(-15); // look ahead and find an Notes off coming up
|
m_cfg_imminentNotesOffPoint = CMidiFile::ppqnAdjust(-15); // look ahead and find an Notes off coming up
|
||||||
// Annie song 25
|
// Annie song 25
|
||||||
|
|
||||||
m_cfg_playZoneEarly = CMidiFile::ppqnAdjust(Cfg2::playZoneEarly()); // when playing along
|
m_cfg_playZoneEarly = CMidiFile::ppqnAdjust(Cfg::playZoneEarly()); // when playing along
|
||||||
m_cfg_playZoneLate = CMidiFile::ppqnAdjust(Cfg2::playZoneLate());
|
m_cfg_playZoneLate = CMidiFile::ppqnAdjust(Cfg::playZoneLate());
|
||||||
}
|
}
|
||||||
|
|
||||||
void CConductor::init()
|
void CConductor::init()
|
||||||
|
|
|
@ -428,8 +428,8 @@ void CDraw::drawSymbol(CSymbol symbol, float x, float y)
|
||||||
{
|
{
|
||||||
float topY = CStavePos(PB_PART_right, 10).getPosY();
|
float topY = CStavePos(PB_PART_right, 10).getPosY();
|
||||||
float bottomY = CStavePos(PB_PART_left, -10).getPosY();
|
float bottomY = CStavePos(PB_PART_left, -10).getPosY();
|
||||||
float early = Cfg2::playZoneEarly() * HORIZONTAL_SPACING_FACTOR;
|
float early = Cfg::playZoneEarly() * HORIZONTAL_SPACING_FACTOR;
|
||||||
float late = Cfg2::playZoneLate() * HORIZONTAL_SPACING_FACTOR;
|
float late = Cfg::playZoneLate() * HORIZONTAL_SPACING_FACTOR;
|
||||||
//glColor3f (0.7, 1.0, 0.7);
|
//glColor3f (0.7, 1.0, 0.7);
|
||||||
glColor3f (0.0, 0.0, 0.3);
|
glColor3f (0.0, 0.0, 0.3);
|
||||||
glRectf(x-late, topY, x + early, bottomY);
|
glRectf(x-late, topY, x + early, bottomY);
|
||||||
|
|
|
@ -4,7 +4,9 @@ v0.5.0: (28 November 2008)
|
||||||
|
|
||||||
v0.5.0: (29 December 2008)
|
v0.5.0: (29 December 2008)
|
||||||
- fixed the windows file open bug
|
- fixed the windows file open bug
|
||||||
|
- Changed the default wrong note sound to
|
||||||
- changed the wrong note sound to use a separate midi channel.
|
- changed the wrong note sound to use a separate midi channel.
|
||||||
|
-
|
||||||
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -83,14 +83,4 @@ void ppError(const char *msg, ...);
|
||||||
#define SPEED_ADJUST_FACTOR 1000
|
#define SPEED_ADJUST_FACTOR 1000
|
||||||
#define deltaAdjust(delta) ((delta)/SPEED_ADJUST_FACTOR )
|
#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__
|
#endif //__UTIL_H__
|
||||||
|
|
Loading…
Reference in New Issue
Block a user