Updated MIDI and Karaoke examples

pedrolcl · Apr 13, 2021 · 9c5f9fd · 9c5f9fd
1 parent f525af3
commit 9c5f9fd
Show file tree

Hide file tree

Showing 19 changed files with 75 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -190,6 +190,7 @@ endif()
 if(UNIX AND NOT APPLE)
     include(GNUInstallDirs)
     add_subdirectory(icons)
+    add_subdirectory(examples)
     install(TARGETS ${PROJECT_NAME}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
     install(FILES ${QM_FILES}

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB MIDI_FILES *.mid)
+file(GLOB KAR_FILES *.kar)
+install( FILES ${MIDI_FILES} ${KAR_FILES}
+         DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} )
diff --git a/examples/README.md b/examples/README.md
@@ -0,0 +1,9 @@
+# MIDI and Karaoke examples.
+
+The MIDI files have been created in [Rosegarden](https://www.rosegardenmusic.com/) and the corresponding sources are included in this directory.
+
+The license of the MIDI examples is [Creative Commons Attribution-Share Alike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/).
+
+The Karaoke example is created with [MMA](https://www.mellowood.ca/mma/index.html) (Musical MIDI Accompaniment) and the corresponding source is included in this directory. Use MMA 1.5e or newer.
+
+The MMA example is copyrighted by Bob van der Poel, and licensed under the terms of the GPLv2+, like the MMA program itself.
diff --git a/examples/haendel_hallelujah.mid b/examples/haendel_hallelujah.mid
diff --git a/examples/haendel_hallelujah.rg b/examples/haendel_hallelujah.rg
diff --git a/examples/lindaamiga.mid b/examples/lindaamiga.mid
diff --git a/examples/lindaamiga.rg b/examples/lindaamiga.rg
diff --git a/examples/mozart_aveverum.mid b/examples/mozart_aveverum.mid
diff --git a/examples/mozart_aveverum.rg b/examples/mozart_aveverum.rg
diff --git a/examples/mozart_diesirae.mid b/examples/mozart_diesirae.mid
diff --git a/examples/mozart_diesirae.rg b/examples/mozart_diesirae.rg
diff --git a/examples/mozart_konigdernacht.mid b/examples/mozart_konigdernacht.mid
diff --git a/examples/mozart_konigdernacht.rg b/examples/mozart_konigdernacht.rg
diff --git a/examples/schubert_avemaria.mid b/examples/schubert_avemaria.mid
diff --git a/examples/schubert_avemaria.rg b/examples/schubert_avemaria.rg
diff --git a/examples/twinkle.kar b/examples/twinkle.kar
diff --git a/examples/twinkle.mma b/examples/twinkle.mma
@@ -0,0 +1,58 @@
+// Twinkle, Twinkle, Little Star
+// for MMA, http://www.mellowood.ca/mma/index.html
+
+MIDICopyright &copy; 2002-2010 Bob van der Poel &lt;bob@mellowood.ca&gt;
+MIDIText @LENGL
+MIDIText @IFree use of this file is granted under the terms of the GNU General Public License.
+MIDIText @TTwinkle, Twinkle, Little Star
+
+Lyric Karmode=On
+
+Tempo 250
+
+Groove Metronome2
+
+z * 2
+
+Groove HillCountryPlus
+
+Begin Solo
+    Voice Recorder
+    Octave 7
+    Volume f
+    Harmony OpenBelow
+End
+
+Repeat
+
+G   {2g-;2g-;}  [\Twin-kle,] [\When the] 
+G   {2d;2d;}    [Twin-kle]   [bla-zing] 
+C   {2e;2e;}    [lit-tle]    [sun is] 
+G   {1d;}       [star;]      [gone,] 
+Am  {2c;2c;}    [/How I]     [/When he] 
+G   {2b-;2b-;}  [won-der]    [no-thing] 
+D7  {2a-;2a-;}  [what you]   [shines u-] 
+G   {1g-;}      [are.]       [pon.] 
+G   {2d;2d;}    [/Up a-]     [/Then you] 
+C   {2c;2c;}    [bove the]   [show your] 
+G   {2b-;2b-;}  [world so]   [lit-tle] 
+D   {1a-;}      [high,]      [light,] 
+G   {2d;2d;}    [/Like a]    [/Twin-kle,] 
+C   {2c;2c;}    [dia-mond]   [twin-kle,] 
+G   {2b-;2b-;}  [in the]     [all the] 
+D7  {1a-;}      [sky!]       [night.] 
+G   {2g-;2g-;}  [/Twin-kle,] 
+G   {2d;2d;}    [twin-kle] 
+C   {2e;2e;}    [Lit-tle] 
+G   {1d;}       [star,] 
+Am  {2c;2c;}    [/How I] 
+G   {2b-;2b-;}  [won-der] 
+D7  {2a-;2a-;}  [what you] 
+G   {1g-;}      [are./] 
+
+Lyric Verse=Inc
+RepeatEnd
+
+Groove HillCountryEnd
+
+G * 2
diff --git a/sequence.cpp b/sequence.cpp
@@ -454,8 +454,8 @@ void Sequence::smfUpdateLoadProgress()
 
 void Sequence::smfKeySig(int alt, int mode)
 {
-    Q_UNUSED(mode)
-    //qDebug() << Q_FUNC_INFO << "alt:" << alt << "mode:" << mode;
+    //Q_UNUSED(mode)
+    qDebug() << Q_FUNC_INFO << "alt:" << alt << "mode:" << mode;
     m_numAlterations = alt;
     smfUpdateLoadProgress();
 }

diff --git a/settings.cpp b/settings.cpp
@@ -197,7 +197,7 @@ void Settings::internalRead(QSettings &settings)
     settings.endGroup();
 
     settings.beginGroup("Preferences");
-    m_lastDirectory = settings.value("LastDirectory").toString();
+    m_lastDirectory = settings.value("LastDirectory", dataDirectory()).toString();
     m_showStatusBar = settings.value("ShowStatusBar", true).toBool();
     m_showToolBar = settings.value("ShowToolBar", true).toBool();
     m_drumsChannel = settings.value("DrumsChannel", MIDI_GM_STD_DRUM_CHANNEL+1).toInt();