Changed Midi to MIDI in the app and updated the translations.

src/Conductor.cpp

@@ -905,7 +905,7 @@ void CConductor::missedNotesColor(CColor color)
 void CConductor::realTimeEngine(int mSecTicks)
 {
     int type;
-    int ticks; // Midi ticks
+    int ticks; // MIDI ticks
 
     //mSecTicks = 2; // for debugging only
 
@@ -999,7 +999,7 @@ void CConductor::realTimeEngine(int mSecTicks)
         else if (type == MIDI_PB_timeSignature)
         {
             m_bar.setTimeSig(m_nextMidiEvent.data1(), m_nextMidiEvent.data2());
-            ppLogDebug("Midi Time Signature %d/%d", m_nextMidiEvent.data1(),m_nextMidiEvent.data2());
+            ppLogDebug("MIDI Time Signature %d/%d", m_nextMidiEvent.data1(),m_nextMidiEvent.data2());
 
         }
         else if ( type != MIDI_NONE )   // this marks the end of the piece of music

src/GlView.cpp

@@ -360,7 +360,7 @@ void CGLView::initializeGL()
 
     m_song->regenerateChordQueue();
 
-    // increased the tick time for Midi handling
+    // increased the tick time for MIDI handling
 
     m_timer.start(Cfg::tickRate, this );
 

src/GuiMidiSetupDialog.cpp

@@ -46,7 +46,7 @@ GuiMidiSetupDialog::GuiMidiSetupDialog(QWidget *parent)
     midiSetupTabWidget->removeTab(midiSetupTabWidget->indexOf(tab_2));
 #endif
 
-    setWindowTitle(tr("Midi Setup"));
+    setWindowTitle(tr("MIDI Setup"));
 }
 
 void GuiMidiSetupDialog::init(CSong* song, CSettings* settings)
@@ -141,19 +141,19 @@ void GuiMidiSetupDialog::updateMidiInfoText()
     if (midiInputCombo->currentIndex() == 0)
         midiInfoText->append("<span style=\"color:black\">" + tr("If you don't have a MIDI keyboard you can use the PC keyboard; 'X' is middle C.") + "</span>");
     else if (midiInputCombo->currentText().contains("Midi Through", Qt::CaseInsensitive))
-        midiInfoText->append("<span style=\"color:#FF6600\">" + tr("The use of Midi Through is not recommended!") + "</span>");
+        midiInfoText->append("<span style=\"color:#FF6600\">" + tr("The use of MIDI Through is not recommended!") + "</span>");
     else
-        midiInfoText->append("<span style=\"color:gray\">" + tr("Midi Input Device:") + " " + midiInputCombo->currentText() +"</span>");
+        midiInfoText->append("<span style=\"color:gray\">" + tr("MIDI Input Device:") + " " + midiInputCombo->currentText() +"</span>");
 
     if (midiOutputCombo->currentText() == tr("None"))
-        midiInfoText->append("<span style=\"color:red\">" + tr("No Sound Output Device selected; Choose a Midi Output Device") + "</span>");
-    else if (midiOutputCombo->currentText().contains("Midi Through", Qt::CaseInsensitive))
-        midiInfoText->append("<span style=\"color:#FF6600\">" + tr("The use of Midi Through is not recommended!") + "</span>");
+        midiInfoText->append("<span style=\"color:red\">" + tr("No Sound Output Device selected; Choose a MIDI Output Device") + "</span>");
+    else if (midiOutputCombo->currentText().contains("MIDI Through", Qt::CaseInsensitive))
+        midiInfoText->append("<span style=\"color:#FF6600\">" + tr("The use of MIDI Through is not recommended!") + "</span>");
     else if (midiOutputCombo->currentText().contains("Microsoft GS Wavetable", Qt::CaseInsensitive))
         midiInfoText->append("<span style=\"color:#FF6600\">" + tr("Note: the Microsoft GS Wavetable Synth introduces an unwanted delay!") + "\n"
                                 + tr("(Try a latency fix of 150msc)") + "</span>");
     else
-        midiInfoText->append("<span style=\"color:gray\">" + tr("Midi Output Device:") + " " + midiOutputCombo->currentText() +"</span>");
+        midiInfoText->append("<span style=\"color:gray\">" + tr("MIDI Output Device:") + " " + midiOutputCombo->currentText() +"</span>");
 
     latencyFixLabel->setText(tr("%1 mSec").arg(m_latencyFix));
 

src/Merge.cpp

@@ -2,7 +2,7 @@
 /*!
 @file           Merge.cpp
 
-@brief          Merge Midi Events from multiple streams into a single stream.
+@brief          Merge MIDI Events from multiple streams into a single stream.
 
 @author         L. J. Barman
 

src/Merge.h

@@ -2,7 +2,7 @@
 /*!
 @file           Merge.h
 
-@brief          Merge Midi Events from multiple streams into a single stream.
+@brief          Merge MIDI Events from multiple streams into a single stream.
 
 @author         L. J. Barman
 

src/MidiFile.cpp

@@ -85,15 +85,15 @@ void CMidiFile::openMidiFile(string filename)
     m_file.open(filename.c_str(), ios_base::in | ios_base::binary);
     if (m_file.fail() == true)
     {
-        QMessageBox::warning(nullptr, QMessageBox::tr("Midi File Error"),
+        QMessageBox::warning(nullptr, QMessageBox::tr("MIDI File Error"),
                  QMessageBox::tr("Cannot open \"%1\"").arg(QString(filename.c_str())));
         midiError(SMF_CANNOT_OPEN_FILE);
         return;
     }
     rewind();
     if (getMidiError() != SMF_NO_ERROR)
-        QMessageBox::warning(nullptr, QMessageBox::tr("Midi File Error"),
-                 QMessageBox::tr("Midi file \"%1\" is corrupted").arg(QString(filename.c_str())));
+        QMessageBox::warning(nullptr, QMessageBox::tr("MIDI File Error"),
+                 QMessageBox::tr("MIDI file \"%1\" is corrupted").arg(QString(filename.c_str())));
 }
 
 void CMidiFile::rewind()

src/MidiTrack.cpp

@@ -61,7 +61,7 @@ CMidiTrack::CMidiTrack(fstream& file, int no) :m_file(file), m_trackNumber(no)
     {
         if (m_file.get() !="MTrk"[i] )
         {
-            ppLogError("No valid Midi tracks");
+            ppLogError("No valid MIDI tracks");
             errorFail(SMF_CORRUPTED_MIDI_FILE);
             return;
         }
@@ -330,7 +330,7 @@ void CMidiTrack::readMetaEvent(byte_t type)
         __dt(ppDebugTrack(2,"METACUEPT %s", text.c_str()));
         break;
 
-    case METACHANPFX:                         /* Midi Channel Prefix */
+    case METACHANPFX:                         /* MIDI Channel Prefix */
         __dt(data = readDataEvent(1));
         __dt(ppDebugTrack(2,"MIDI Channel Prefix %lu", data));
         break;

src/MidiTrack.h

@@ -95,7 +95,7 @@ private:
         {
             m_midiError = error;
             if (m_midiError != SMF_NO_ERROR)
-                ppLogError("Midi error %d", m_midiError);
+                ppLogError("MIDI error %d", m_midiError);
         }
     }
     void midiFailReset() { m_midiError = SMF_NO_ERROR;}

src/QtWindow.cpp

@@ -204,7 +204,7 @@ void QtWindow::decodeMidiFileArg(QString arg)
 
     if (!fileInfo.exists() )
     {
-        QMessageBox::warning(nullptr, tr("PianoBooster Midi File Error"),
+        QMessageBox::warning(nullptr, tr("PianoBooster MIDI File Error"),
                  tr("Cannot open \"%1\"").arg(QString(fileInfo.absoluteFilePath())));
         exit(1);
     }
@@ -212,8 +212,8 @@ void QtWindow::decodeMidiFileArg(QString arg)
              fileInfo.fileName().endsWith(".midi", Qt::CaseInsensitive ) ||
              fileInfo.fileName().endsWith(".kar", Qt::CaseInsensitive )) )
     {
-        QMessageBox::warning(nullptr, tr("PianoBooster Midi File Error"),
-                 tr("\"%1\" is not a Midi File").arg(QString(fileInfo.fileName())));
+        QMessageBox::warning(nullptr, tr("PianoBooster MIDI File Error"),
+                 tr("\"%1\" is not a MIDI File").arg(QString(fileInfo.fileName())));
         exit(1);
     }
     else
@@ -236,8 +236,8 @@ void QtWindow::decodeMidiFileArg(QString arg)
             m_settings->setValue("CurrentSong", fileInfo.absoluteFilePath());
         else
         {
-            QMessageBox::warning(nullptr, tr("PianoBooster Midi File Error"),
-                 tr("\"%1\" is not a valid Midi file").arg(QString(fileInfo.absoluteFilePath())));
+            QMessageBox::warning(nullptr, tr("PianoBooster MIDI File Error"),
+                 tr("\"%1\" is not a valid MIDI file").arg(QString(fileInfo.absoluteFilePath())));
             exit(1);
         }
     }
@@ -328,9 +328,9 @@ void QtWindow::createActions()
     m_shortcutAct->setToolTip(tr("The PC Keyboard shortcut keys"));
     connect(m_shortcutAct, SIGNAL(triggered()), this, SLOT(keyboardShortcuts()));
 
-    m_setupMidiAct = new QAction(tr("&Midi Setup ..."), this);
+    m_setupMidiAct = new QAction(tr("&MIDI Setup ..."), this);
     m_setupMidiAct->setShortcut(tr("Ctrl+S"));
-    m_setupMidiAct->setToolTip(tr("Setup the Midi input and output"));
+    m_setupMidiAct->setToolTip(tr("Setup the MIDI input and output"));
     connect(m_setupMidiAct, SIGNAL(triggered()), this, SLOT(showMidiSetup()));
 
     m_setupKeyboardAct = new QAction(tr("Piano &Keyboard Setting ..."), this);
@@ -528,17 +528,16 @@ void QtWindow::help()
     tr("<h3>Getting Started</h3>") +
     tr("<p>You need a <b>MIDI Piano Keyboard </b> and a <b>MIDI interface</b> for the PC. If you "
        "don't have a MIDI keyboard you can still try out PianoBooster using the PC keyboard, 'X' is "
-       "middle C.</p>") +
-    tr("<p>To hear the music you will need a <b>General Midi sound synthesizer</b>. "
-       "The \"Microsoft GS Wavetable software synthesizer\" that comes with Windows can be used "
-       "but it introduces an unacceptable delay (latency). In Linux you can use ") +
-       "<a href=\"http://www.fluidsynth.org\">FluidSynth</a> " +
-    tr("or") +
-    " <a href=\"http://timidity.sourceforge.net/\">Timidity</a></p>" +
+       "middle C.</p>") +                
+
+    tr("<p>PianoBooster now includes a built-in sound generator called FluidSynth "
+    "which requires a General MIDI (GM) SoundFont. "
+    "Use the ‘Setup/MIDI Setup’ menu option and then the load button on the FluidSynth tab to install the SoundFont.</p>")   +
+
     tr("<p>PianoBooster works best with MIDI files that have separate left and right piano parts "
        "using MIDI channels 3 and 4.") +
     tr("<h3>Setting Up</h3>") +
-    tr("<p>First use the <i>Setup/Midi Setup</i> menu and in the dialog box select the MIDI input and MIDI "
+    tr("<p>First use the <i>Setup/MIDI Setup</i> menu and in the dialog box select the MIDI input and MIDI "
        "output interfaces that match your hardware. ") +
     tr("Next use <i>File/Open</i> to open the MIDI file \".mid\" or a karaoke \".kar\" file. "
        "Now select whether you want to just <i>listen</i> to the music or "
@@ -646,8 +645,8 @@ void QtWindow::open()
     else
         dir = QDir::homePath();
 
-    QString fileName = QFileDialog::getOpenFileName(this,tr("Open Midi File"),
-                            dir, tr("Midi Files") + " (*.mid *.MID *.midi *.MIDI *.kar *.KAR)");
+    QString fileName = QFileDialog::getOpenFileName(this,tr("Open MIDI File"),
+                            dir, tr("MIDI Files") + " (*.mid *.MID *.midi *.MIDI *.kar *.KAR)");
     if (!fileName.isEmpty()) {
 
         m_settings->openSongFile(fileName);

src/Settings.cpp

@@ -529,7 +529,7 @@ void CSettings::setChannelHands(int left, int right)
 void CSettings::updateWarningMessages()
 {
     if (!m_song->validMidiOutput())
-        m_warningMessage = tr("ERROR NO SOUND: To fix this use menu Setup/Midi Setup ...");
+        m_warningMessage = tr("ERROR NO SOUND: To fix this use menu Setup/MIDI Setup ...");
     else if (m_currentSongName.isEmpty())
         m_warningMessage = tr("ERROR NO MIDI FILE: To fix this use menu File/Open ...");
     else

src/Tempo.h

@@ -57,7 +57,7 @@ public:
     void setMidiTempo(int tempo)
     {
         m_midiTempo = (static_cast<float>(tempo) * DEFAULT_PPQN) / CMidiFile::getPulsesPerQuarterNote();
-        ppLogWarn("Midi Tempo %f  ppqn %d %d", m_midiTempo, CMidiFile::getPulsesPerQuarterNote(), tempo);
+        ppLogWarn("MIDI Tempo %f  ppqn %d %d", m_midiTempo, CMidiFile::getPulsesPerQuarterNote(), tempo);
     }
 
     void setSpeed(float speed)