diff --git a/contrib/midi/2B-test.midi b/contrib/midi/2B-test.midi index db0f490a..ee67d46b 100644 Binary files a/contrib/midi/2B-test.midi and b/contrib/midi/2B-test.midi differ diff --git a/contrib/midi/CountryStrum.mid b/contrib/midi/CountryStrum.mid index 3bab92de..10b686a3 100644 Binary files a/contrib/midi/CountryStrum.mid and b/contrib/midi/CountryStrum.mid differ diff --git a/data/readme.text b/data/readme.text index 1f07eea6..967dfa05 100644 --- a/data/readme.text +++ b/data/readme.text @@ -1,6 +1,8 @@ -readme.text for Seq66 0.99.6 and above +readme.text for Seq66 0.99.7 and above Chris Ahlstrom -2015-09-10 to 2023-07-01 +2015-09-10 to 2023-07-17 + +Release 0.99.7 fixes known issues and greatly enhances playlist support. Seq66 is a refactoring of a reboot (sequencer64) of seq24, extending it with new features and bug fixes, and incorporation of Modern C++ (C++11/C++14). It diff --git a/data/readme.windows b/data/readme.windows index e8d1e093..3fc423a9 100644 --- a/data/readme.windows +++ b/data/readme.windows @@ -1,12 +1,15 @@ -readme.windows for Seq66 0.99.6 and above +readme.windows for Seq66 0.99.7 and above Chris Ahlstrom -2018-05-13 to 2023-07-01 +2018-05-13 to 2023-07-17 This README file tells you how to run the native Windows implmentation of seq66, an executable named qpseq66.exe. It provides some notes on Seq66 and Windows. We mostly use Windows 10; some features might differ in Windows 7 or Windows 2012+ Server. +Release 0.99.7 fixes known issues and greatly enhances playlist support, and +includes a Windows-specific sample play-list file in "data/win".. + There will eventually be a portable ZIP package for qpseq66; an NSIS-based installer is available (replace "0.99" with the latest version number): diff --git a/data/win/win_midi.playlist b/data/win/win_midi.playlist new file mode 100644 index 00000000..ebab835b --- /dev/null +++ b/data/win/win_midi.playlist @@ -0,0 +1,90 @@ +# Seq66 0.99.7 playlist configuration file +# +# C:/Program Files/Seq66/data/win/win_midi.playlist +# Written 2023-07-17 09:50:24 +# +# This file holds multiple playlists, each in a [playlist] section. Each has +# a user-specified number for sorting and MIDI control, ranging from 0 to 127. +# Next comes a quoted name for this list, followed by the quoted name +# of the song directory using the UNIX separator ('/'). +# +# Next is a list of tunes, each starting with a MIDI control number and the +# quoted name of the MIDI file, sorted by control number. They can be simple +# 'base.midi' file-names; the playlist directory is prepended to access the +# song file. If the file-name has a path, that will be used. + +[Seq66] + +config-type = "playlist" +version = 1 + +# [comments] holds user documentation for this file. The first empty, hash- +# commented, or tag line ends the comment. + +[comments] + +This playlist points to files installed in Windows. I created these files +long, long ago. Ah, such memories. Added them to the install to make live +testing easier. + +[playlist-options] + +unmute-new-song = true +deep-verify = false + +# Here are the playlist settings, default storage folder, and then a list of +# each tune with its control number. The playlist number is arbitrary but +# unique. 0 to 127 enforced for use with MIDI playlist controls. Similar +# for the tune numbers. Each tune can include a path; it overrides the base +# directory. + +[playlist] + +number = 0 +name = "Legacy Midi Files" +directory = "C:/Program Files/Seq66/data/midi/FM/" + +0 "brecluse.mid" +1 "carptsun.mid" +2 "cbflitfm.mid" +3 "dasmodel.mid" +4 "grntamb.mid" +5 "hapwandr.mid" +6 "judyblue.mid" +7 "k_seq11.mid" +8 "longhair.mid" +9 "marraksh.mid" +10 "oxyg4bfm.mid" +11 "pirates.mid" +12 "pss680.mid" +13 "qufrency.mid" +14 "stdemo3.mid" +15 "viceuk.mid" +16 "wallstsm.mid" + +[playlist] + +number = 1 +name = "PSS-790 Midi Files" +directory = "C:/Program Files/Seq66/data/midi/PSS-790/" + +0 "ancestor.mid" +10 "carptsun.mid" +20 "cbflite.mid" +30 "old_love.mid" + +[playlist] + +number = 3 +name = "Live vs Song Files" +directory = "C:/Program Files/Seq66/data/midi/" + +1 "Peter_Gunn-reconstructed.midi" +2 "Chameleon-HHancock-Ov.midi" +3 "Kraftwerk-Europe_Endless-reconstructed.midi" +4 "If_You_Could_Read_My_Mind.mid" +5 "b4uacuse-gm-patchless.midi" + +# End of /home/ahlstrom/.config/seq66/win_midi.playlist +# +# vim: sw=4 ts=4 wm=4 et ft=dosini diff --git a/nsis/README b/nsis/README index 6d0413ea..34106998 100644 --- a/nsis/README +++ b/nsis/README @@ -1,6 +1,6 @@ NSIS Notes Chris Ahlstrom -2021-12-11 to 2023-07-01 +2021-12-11 to 2023-07-17 This directory contains files that allow Linux and Windows users to create an NSIS installer for Seq66. The latest version adds application diff --git a/nsis/Seq66Constants.nsh b/nsis/Seq66Constants.nsh index 16301d1f..e741a86c 100644 --- a/nsis/Seq66Constants.nsh +++ b/nsis/Seq66Constants.nsh @@ -3,8 +3,8 @@ ; File: Seq66Constants.nsh ; Author: Chris Ahlstrom ; Date: 2018-05-26 -; Updated: 2023-06-10 -; Version: 0.99.6 +; Updated: 2023-07-17 +; Version: 0.99.7 ; ; Provides constants commonly used by the installer for Seq66 for ; Windows. @@ -31,7 +31,7 @@ !define VER_MAIN_PURPOSE "Seq66 for Windows" !define VER_NUMBER "0.99" -!define VER_REVISION "6" +!define VER_REVISION "7" !define VER_VARIANT "Windows" !define PRODUCT_VERSION "${VER_NUMBER} ${VER_VARIANT} (rev ${VER_REVISION})" !define PRODUCT_PUBLISHER "C. Ahlstrom (ahlstromcj@gmail.com)" diff --git a/nsis/Seq66Setup.nsi b/nsis/Seq66Setup.nsi index 5a92a9bb..f957c01a 100644 --- a/nsis/Seq66Setup.nsi +++ b/nsis/Seq66Setup.nsi @@ -3,8 +3,8 @@ ; File: Seq66Setup.nsi ; Author: Chris Ahlstrom ; Date: 2018-05-26 -; Updated: 2023-05-28 -; Version: 0.99.6 +; Updated: 2023-07-17 +; Version: 0.99.7 ; ; Usage of this Windows build script: ; diff --git a/nsis/build_release_package.bat b/nsis/build_release_package.bat index 7af2e3c9..150dba68 100644 --- a/nsis/build_release_package.bat +++ b/nsis/build_release_package.bat @@ -7,7 +7,7 @@ :: \library Seq66 for Windows :: \author Chris Ahlstrom :: \date 2018-05-26 -:: \update 2023-07-01 +:: \update 2023-07-17 :: \license $XPC_SUITE_GPL_LICENSE$ :: :: This script sets up and creates a release build of Seq66 for @@ -171,8 +171,8 @@ :: ::--------------------------------------------------------------------------- -set PROJECT_VERSION=0.99.6 -set PROJECT_DATE=2023-07-01 +set PROJECT_VERSION=0.99.7 +set PROJECT_DATE=2023-07-17 set PROJECT_DRIVE=C: :: Set the bits of the project, either 64 or 32. Also define WIN64 versus @@ -286,7 +286,7 @@ mkdir %RELEASE_DIR%\%TUTORIAL_DIR% copy %PROJECT_REL_ROOT%\%AUX_DIR%\license.* %RELEASE_DIR%\%AUX_DIR% copy %PROJECT_REL_ROOT%\%AUX_DIR%\readme.* %RELEASE_DIR%\%AUX_DIR% copy %PROJECT_REL_ROOT%\%AUX_DIR%\linux\*.* %RELEASE_DIR%\%AUX_DIR%\linux -copy %PROJECT_REL_ROOT%\%AUX_DIR%\midi\*.* %RELEASE_DIR%\%AUX_DIR%\midi +xcopy %PROJECT_REL_ROOT%\%AUX_DIR%\midi\*.* %RELEASE_DIR%\%AUX_DIR%\midi /f /s /e /y /i copy %PROJECT_REL_ROOT%\%AUX_DIR%\pixmaps\*.* %RELEASE_DIR%\%AUX_DIR%\pixmaps copy %PROJECT_REL_ROOT%\%AUX_DIR%\samples\*.* %RELEASE_DIR%\%AUX_DIR%\samples copy %PROJECT_REL_ROOT%\%AUX_DIR%\win\*.* %RELEASE_DIR%\%AUX_DIR%\win diff --git a/seq_qt5/src/qt5_helpers.cpp b/seq_qt5/src/qt5_helpers.cpp index 60cd975d..fa23500b 100644 --- a/seq_qt5/src/qt5_helpers.cpp +++ b/seq_qt5/src/qt5_helpers.cpp @@ -116,7 +116,9 @@ qt_keystroke_test (QKeyEvent * event, keystroke::action act) * one of them, for example. * * We can also check the nativeVirtualKey() result for the event. Even that - * can be fooled by a change in the keyboard encoding. Yeesh! + * can be fooled by a change in the keyboard encoding. Yeesh! And on + * Windows, the native value is different from that of Linux for the arrow + * keys. * * The qt_modkey_ordinal() function in the keymap module can use all these * codes to try to figure out the proper ordinal to return.