diff --git a/BUILD.md b/BUILD.md index 52b4aef..e3cf1a9 100644 --- a/BUILD.md +++ b/BUILD.md @@ -17,7 +17,8 @@ To compile the PianoBooster source code type: `make -j$(nproc)` -The pianobooster binary executable is now in a new build subdirectory. Piano Booster is designed to run in place so you can type `build/pianobooster` to start running the program. +The pianobooster binary executable is now in a new build subdirectory. +PianoBooster is designed to run in place so you can type `build/pianobooster` to start running the program. (Optional) If you wish to install PianoBooster as root type: @@ -74,7 +75,7 @@ Or alternatively you can install QtCreator and then open the `CMakeLists.txt`. # Build options Using `cmake` without any flags defaults to the recommended build options. -However the following build options below can be changed by using the `-D` flag to `cmake`. +However the following build options below can be changed by using the `-D` flag to `cmake`. **WITH_INTERNAL_FLUIDSYNTH:** build with an internal FluidSynth sound generator [Default:ON] diff --git a/Changelog.txt b/Changelog.txt index ad4ff8d..2848f93 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,4 @@ -0.7.4-RC1 (28 May 2020) +1.0.0-RC1 (12 Dec 2020) - Integrated fluidsynth as a build option. - Changes necessary for building an AppImage. - Added to the manual language selection. diff --git a/README.md b/README.md index d8974e0..d5e4563 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # == THE URL HAS CHANGED == -This Piano Booster repository has now been transferred to @pianobooster as the new owner. +This **PianoBooster** repository has now been transferred to @pianobooster as the new owner. Please update all your bookmarks and [update](https://docs.github.com/en/free-pro-team@latest/github/using-git/changing-a-remotes-url) any existing local clones to point to the new repository URL https://github.com/pianobooster/PianoBooster @@ -9,15 +9,15 @@ Please update all your bookmarks and [update](https://docs.github.com/en/free-pr # INTRODUCTION -Piano Booster is a MIDI file player that displays the musical notes AND teaches you how to +**PianoBooster** is a MIDI file player that displays the musical notes AND teaches you how to play the piano. The difference between playing along to a CD or a standard MIDI file is that Piano Booster listens and reacts to what you are playing on a MIDI piano keyboard. -You can play along to any track in the MIDI file and PianoBooster will +You can play along to any track in the MIDI file and Piano Booster will follow your playing. Piano Booster makes learning to sight read fun! -Piano Booster is a free (Open Source) program, available from: +Piano Booster is a free (Open Source) program, available from: # FEATURES @@ -35,16 +35,19 @@ Piano Booster is a free (Open Source) program, available from: ). Piano booster now includes a built in version of the FluidSynth sound generator. In order for FluidSynth to work and to hear sound a `.sf2` (sound font) file is required which must be loaded using the MIDI Setup/Fluidsynth menu of Piano Booster. A recommended General Midi (GM) sound font file is the `FluidR3_GM.sf2` +Binary executable version of **PianoBooster** are available for Windows, MacOS and Linux, which can be downloaded from the [Piano Booster website](). +Piano Booster now includes a built in version of the FluidSynth sound generator. +In order for FluidSynth to work and to hear sound a `.sf2` (sound font) file is required which must be loaded using the MIDI Setup/Fluidsynth menu of Piano Booster. +A recommended General Midi (GM) sound font file is the `FluidR3_GM.sf2` -To play along with Piano Booster you will need a MIDI Piano Keyboard. -If you don't have a MIDI keyboard you can still try out PianoBooster using the PC keyboard, 'x' is middle C - but a MIDI piano is highly recommended. +To play along with **PianoBooster** you will need a MIDI Piano Keyboard. +If you don't have a MIDI keyboard you can still try out Piano Booster using the PC keyboard, 'x' is middle C - but a MIDI piano is highly recommended. After connecting the MIDI keyboard you need to setup the midi input device using the Piano Booster MIDI setup menu. -Piano Booster now comes with a music teaching course called Booster Music. +**PianoBooster** now comes with a music teaching course called Booster Music. The MIDI files for this course are in a folder called `BoosterMusicBooks` located in the `Music` folder on your PC. -The Booster Music teaching course is also available on the [Piano Booster website](). +The Booster Music teaching course is also available on the [Piano Booster website](). Use the File/Open from the Piano Booster menu to load the MIDI file ".mid" or a karaoke ".kar" file. Finally choose the skill level, if you want to @@ -54,7 +57,7 @@ start. # TRANSLATIONS -PianoBooster isn't translated in your language? Help us, and we will gladly ship +**PianoBooster** isn't translated in your language? Help us, and we will gladly ship new translations with it. Please see the [Web-based continuous localisation](https://hosted.weblate.org/projects/pianobooster/) (Weblate) to contribute to the language translations. @@ -63,27 +66,29 @@ The translation required for the Piano Booster app are located [here](https://ho # LICENSE -Piano Booster is fully copyrighted by the authors and all rights are reserved. +**PianoBooster** is fully copyrighted by the authors and all rights are reserved. -PianoBooster is free software (Open Source software): you can redistribute it and/or modify +**PianoBooster** is free software (Open Source software): you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -PianoBooster is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +**PianoBooster** is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License in the file "gplv3.txt" or from the web site or [gplv3.txt](gplv3.txt). -The Piano Booster Documentation and Music are released under the Creative Commons License (CC-BY). +The **PianoBooster** documentation and music are released under the Creative Commons License (CC-BY). [PianoBooster License](license.txt) # SOURCE CODE -As part of GNU General Public License the source code for PianoBooster is available from +As part of GNU General Public License the source code for **PianoBooster** is available from the GitHub site . See the [BUILD.md](BUILD.md) for instructions on how to build the source code. +This source code URL has recently changed so please update all your bookmarks and change any existing local clones to point to the new repository URL. + # BUGTRACKER @@ -91,7 +96,7 @@ instructions on how to build the source code. # CONTRIBUTING -PianoBooster is community developing project. You're welcome with patches: +**PianoBooster** is community developing project. You're welcome with patches: [Pull Requests](https://github.com/pianobooster/PianoBooster/pulls) diff --git a/doc/README.md b/doc/README.md index 7bb14be..50371c2 100644 --- a/doc/README.md +++ b/doc/README.md @@ -13,10 +13,9 @@ - [Piano Booster Music](courses/README.md) External links: -- [Original project](http://pianobooster.sourceforge.net) -- [Original source tree](http://sourceforge.net/projects/pianobooster/) -- [Original User Forum](http://piano-booster.2625608.n2.nabble.com/Piano-Booster-Users-f1591936.html) -- [Original Development Forum](http://piano-booster.2625608.n2.nabble.com/Piano-Booster-Development-f2625691.html) +- [Web site](https://www.pianobooster.org) +- [User Forum](http://piano-booster.2625608.n2.nabble.com/Piano-Booster-Users-f1591936.html) +- [Development Forum](http://piano-booster.2625608.n2.nabble.com/Piano-Booster-Development-f2625691.html) ## Presentation diff --git a/pianobooster.6 b/pianobooster.6 index 5ead6f5..f3cc5fd 100644 --- a/pianobooster.6 +++ b/pianobooster.6 @@ -82,6 +82,6 @@ Timing markers show whether you are playing ahead or behind of the beat. They ap .br - A different instrument sound is used for the right and wrong notes that you play. .SH "SEE ALSO" -You can find more about the game on its homepage: http://pianobooster.sourceforge.net +You can find more about the game on its homepage: https://www.pianobooster.org .SH "AUTHOR" The game was originally written by Louis James Barman , . This manual page was written by Miriam Ruiz for the Debian project, but can be used by others. diff --git a/pkgs/win32/pianobooster.nsi b/pkgs/win32/pianobooster.nsi index 7b00ce9..fa5aaf1 100644 --- a/pkgs/win32/pianobooster.nsi +++ b/pkgs/win32/pianobooster.nsi @@ -170,8 +170,13 @@ Section "Install Section" CreateDirectory $INSTDIR\translations SetOutPath $INSTDIR\translations - File "${PB_BUILT_DIR}\translations\*.*" + File "${PB_BUILT_DIR}\translations\*.qm" + File "${PB_BUILT_DIR}\translations\langs.json" + CreateDirectory $INSTDIR\fonts + SetOutPath $INSTDIR\fonts + File "${PB_BUILT_DIR}\fonts\*.ttf" + CreateDirectory $INSTDIR\doc SetOutPath $INSTDIR\doc File license.txt @@ -180,7 +185,7 @@ Section "Install Section" CreateDirectory "$DOCUMENTS\My Music" SetOutPath "$DOCUMENTS\My Music" ; Temporary fix - File /r "${PB_BUILT_DIR}\BoosterMusicBooks\BoosterMusicBooks3" + File /r "${PB_BUILT_DIR}\BoosterMusicBooks\BoosterMusicBooks4" SetOutPath $INSTDIR diff --git a/src/QtWindow.cpp b/src/QtWindow.cpp index b9de6d5..c6361d2 100644 --- a/src/QtWindow.cpp +++ b/src/QtWindow.cpp @@ -517,7 +517,7 @@ void QtWindow::setCurrentFile(const QString &fileName) void QtWindow::website() { - QDesktopServices::openUrl(QUrl("http://pianobooster.sourceforge.net/")); + QDesktopServices::openUrl(QUrl("https://www.pianobooster.org/")); } void QtWindow::help() @@ -546,11 +546,11 @@ void QtWindow::help() "you are ready click the play icon (or press the space bar) to roll the music.") + tr("

Hints on Playing the Piano

" "

For hints on how to play the piano see: ") + - "" + tr("Piano Hints") + "

" + + "" + tr("Piano Hints") + "

" + tr("

More Information

" "

For more help please visit the PianoBooster ") + - "" + tr("website") + ", " + - tr("the PianoBooster") + " " + tr("FAQ") + " " + + "" + tr("website") + ", " + + tr("the PianoBooster") + " " + tr("FAQ") + " " + tr("and the") + " " +tr("user forum") +"." ); @@ -565,7 +565,7 @@ void QtWindow::about() msgBox.setText( tr("PianoBooster - Version %1

").arg(PB_VERSION) + tr("Boost your Piano playing skills!

") + - "http://pianobooster.sourceforge.net/

" + + "https://www.pianobooster.org/

" + tr("Copyright(c) L. J. Barman, 2008-2020; All rights reserved.
") + tr("Copyright(c) Fabien Givors, 2018-2019; All rights reserved.
") + "
" + diff --git a/src/Util.cpp b/src/Util.cpp index 5cad15f..f1f3c9b 100644 --- a/src/Util.cpp +++ b/src/Util.cpp @@ -32,8 +32,6 @@ #include "Util.h" #include "Cfg.h" -static QTime s_realtime; - static FILE * logInfoFile = nullptr; static FILE * logErrorFile = nullptr; @@ -190,6 +188,10 @@ void ppLogError(const char *msg, ...) flushLogs(); } +#ifdef DEBUG_LOG_TIMING +static QTime s_realtime; +#endif + void ppTiming(const char *msg, ...) { #ifdef DEBUG_LOG_TIMING diff --git a/src/version.h b/src/version.h index 41738a0..4943457 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define PB_VERSION "0.7.4-RC1" +#define PB_VERSION "1.0.0-RC1" #define MUSIC_RELEASE 4