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

This commit is contained in:
louisjb 2008-12-31 18:10:12 +00:00
parent 9be8aa910f
commit e4ce4e3dbf
5 changed files with 13 additions and 11 deletions

View File

@ -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)
{

View File

@ -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()));
}

View File

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>246</width>
<height>266</height>
<width>250</width>
<height>298</height>
</rect>
</property>
<property name="windowTitle" >
@ -58,7 +58,7 @@
<widget class="QComboBox" name="midiOutputCombo" />
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<widget class="QLabel" name="latencyFixLabel" >
<property name="text" >
<string>Latency fix (mSec):</string>
</property>
@ -95,7 +95,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

View File

@ -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()));

View File

@ -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
*/