diff --git a/PianoBooster/src/Conductor.cpp b/PianoBooster/src/Conductor.cpp
index 00fe693..b0b4753 100644
--- a/PianoBooster/src/Conductor.cpp
+++ b/PianoBooster/src/Conductor.cpp
@@ -708,6 +708,7 @@ void CConductor::realTimeEngine(int mSecTicks)
// Is this this channel_muted
//if (isChannelMuted(channel) == false) //fixme
+ if (channel!= m_pianistGoodChan && channel!= m_pianistBadChan)
{
if (getfollowState() >= PB_FOLLOW_earlyNotes && m_playMode == PB_PLAY_MODE_followYou)
{
diff --git a/PianoBooster/src/GuiMidiSetupDialog.cpp b/PianoBooster/src/GuiMidiSetupDialog.cpp
index 1a57ac6..8b30ba4 100644
--- a/PianoBooster/src/GuiMidiSetupDialog.cpp
+++ b/PianoBooster/src/GuiMidiSetupDialog.cpp
@@ -80,7 +80,8 @@ void GuiMidiSetupDialog::init(CSong* song, QSettings* settings)
midiOutputCombo->setCurrentIndex(i);
latencyFixEdit->setText(QString().setNum(Cfg::latencyFix));
-
+ latencyFixEdit->hide();
+ latencyFixLabel->hide();
updateMidiInfoText();
}
@@ -138,7 +139,7 @@ void GuiMidiSetupDialog::accept()
if (m_settings->value("midi/output").toString() != midiOutputCombo->currentText())
{
m_settings->setValue("midi/output", midiOutputCombo->currentText());
- m_settings->setValue("midi/latency", latencyFixEdit->text().toInt());
+ m_settings->setValue("midi/latency", latencyFixEdit->text().toInt());
m_song->openMidiPort(1,string(midiOutputCombo->currentText().toAscii()));
}
diff --git a/PianoBooster/src/GuiMidiSetupDialog.ui b/PianoBooster/src/GuiMidiSetupDialog.ui
index 93ae6db..af086ac 100644
--- a/PianoBooster/src/GuiMidiSetupDialog.ui
+++ b/PianoBooster/src/GuiMidiSetupDialog.ui
@@ -5,8 +5,8 @@
0
0
- 246
- 266
+ 250
+ 298
@@ -58,7 +58,7 @@
-
-
+
Latency fix (mSec):
@@ -95,7 +95,7 @@
Qt::Horizontal
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+ QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok
diff --git a/PianoBooster/src/QtWindow.cpp b/PianoBooster/src/QtWindow.cpp
index fc83b66..c163679 100644
--- a/PianoBooster/src/QtWindow.cpp
+++ b/PianoBooster/src/QtWindow.cpp
@@ -91,8 +91,8 @@ Window::Window()
CChord::setPianoRange(m_settings->value("Keyboard/lowestNote", 0).toInt(),
m_settings->value("Keyboard/highestNote", 127).toInt());
- Cfg::latencyFix = m_settings->value("midi/latency", 0).toInt();
-
+ Cfg::latencyFix = 0; //m_settings->value("midi/latency", 0).toInt();
+
m_song->openMidiPort(0, string(midiInputName.toAscii()));
diff --git a/PianoBooster/src/ReleaseNote.txt b/PianoBooster/src/ReleaseNote.txt
index 49bb8b5..559dc5d 100644
--- a/PianoBooster/src/ReleaseNote.txt
+++ b/PianoBooster/src/ReleaseNote.txt
@@ -2,11 +2,11 @@
v0.5.0: (28 November 2008)
- first release
-v0.5.0: (29 December 2008)
+v0.5.0: (1 January 2009)
- fixed the windows file open bug
-- Changed the default wrong note sound to
+- changed the default wrong note sound to Harpsichord
- changed the wrong note sound to use a separate midi channel.
--
+- on Windows removed the dos console
*/