Hello community, here is the log from the commit of package qsynth for openSUSE:Factory checked in at 2019-07-13 13:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qsynth (Old) and /work/SRC/openSUSE:Factory/.qsynth.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qsynth" Sat Jul 13 13:50:20 2019 rev:7 rq:714915 version:0.5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/qsynth/qsynth.changes 2019-04-12 09:15:40.517723927 +0200 +++ /work/SRC/openSUSE:Factory/.qsynth.new.4615/qsynth.changes 2019-07-13 14:00:58.934887275 +0200 @@ -1,0 +2,8 @@ +Fri Jul 12 18:44:21 UTC 2019 - Luigi Baldoni <[email protected]> + +- Update to version 0.5.7 + * Updated for the newer Qt5 development tools (>= 5.13). + * Configure updated to check for qtchooser availability. + * Updated icon files into 128x128 base resolution. + +------------------------------------------------------------------- Old: ---- qsynth-0.5.6.tar.gz New: ---- qsynth-0.5.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qsynth.spec ++++++ --- /var/tmp/diff_new_pack.17bKEJ/_old 2019-07-13 14:00:59.366887143 +0200 +++ /var/tmp/diff_new_pack.17bKEJ/_new 2019-07-13 14:00:59.366887143 +0200 @@ -18,7 +18,7 @@ Name: qsynth -Version: 0.5.6 +Version: 0.5.7 Release: 0 Summary: Graphical User Interface for fluidsynth License: GPL-2.0-or-later ++++++ qsynth-0.5.6.tar.gz -> qsynth-0.5.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/CMakeLists.txt new/qsynth-0.5.7/CMakeLists.txt --- old/qsynth-0.5.6/CMakeLists.txt 2019-04-11 10:29:45.803795418 +0200 +++ new/qsynth-0.5.7/CMakeLists.txt 2019-07-12 12:35:23.872356128 +0200 @@ -42,13 +42,10 @@ # Check for Qt -if (UNIX AND NOT APPLE) - find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets X11Extras) -else () - find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets) -endif () +find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core Gui Widgets Network) find_package (Qt5LinguistTools) +include (GNUInstallDirs) include (CheckIncludeFile) include (CheckIncludeFiles) include (CheckFunctionExists) @@ -73,9 +70,6 @@ # Checks for header files. if (UNIX AND NOT APPLE) check_include_files ("fcntl.h;unistd.h;signal.h" HAVE_SIGNAL_H) - if (CONFIG_XUNIQUE) - find_library ( X11_LIBRARY X11 ) - endif () endif () # Check for fluidsynth headers. @@ -150,6 +144,9 @@ configure_file (qsynth.spec.in qsynth.spec IMMEDIATE @ONLY) +install (FILES qsynth.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +install (FILES qsynth.fr.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/fr/man1 RENAME qsynth.1) + # Configuration status macro (SHOW_OPTION text value) if (${value}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/ChangeLog new/qsynth-0.5.7/ChangeLog --- old/qsynth-0.5.6/ChangeLog 2019-04-11 10:29:45.803795418 +0200 +++ new/qsynth-0.5.7/ChangeLog 2019-07-12 12:35:23.872356128 +0200 @@ -4,6 +4,20 @@ ChangeLog +0.5.7 2019-07-12 A Summer'19 Release. + +- Updated for the newer Qt5 development tools (>= 5.13). + +- Configure updated to check for qtchooser availability. + +- Minor update to Debian packaging control file. + +- Settled to initial default MIDI and audio drivers on + MacOSX to "coremidi" and "coreaudio" resp. + +- Updated icon files into 128x128 base resolution. + + 0.5.6 2019-04-11 A Spring-Break'19 Release. - Re-defined all main application UNIX signal handling. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/Makefile.in new/qsynth-0.5.7/Makefile.in --- old/qsynth-0.5.6/Makefile.in 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/Makefile.in 2019-07-12 12:35:23.873356128 +0200 @@ -93,8 +93,8 @@ @$(QMAKE) -o $(name).mak $(name).pro -translations_lupdate: $(name).pro - @$(LUPDATE) -verbose -no-obsolete $(name).pro +translations_lupdate: $(translations_sources) + @$(LUPDATE) -verbose -no-obsolete -recursive src -ts $(translations_sources) translations_lrelease: translations_lupdate $(translations_targets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/README-OSX new/qsynth-0.5.7/README-OSX --- old/qsynth-0.5.6/README-OSX 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/README-OSX 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Compiling qsynth-0.3.3 on Mac OS 10.5.6 (Leopard) ------------------------------------------------- -by: Ebrahim Mayat <emayat at users dot sourceforge dot net> - -Requirements: - -- fluidsynth - -- XcodeTools.mpkg, X11SDK.pkg, DevSDK.pkg, CoreAudioSDK.pkg, OpenGLSDK.pkg and QuickTimeSDK.pkg <http://developer.apple.com> - -- Fink installation <http://fink.sourceforge.net> - -- qt4-mac "$ fink install qt4-mac" - -Configure and make: - -PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --with-qt=/sw/lib/qt4-mac "LDFAGS=-lfluidsynth" ; make - -You now have a clickable application icon. Enjoy. - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/configure new/qsynth-0.5.7/configure --- old/qsynth-0.5.6/configure 2019-04-11 10:30:21.013793320 +0200 +++ new/qsynth-0.5.7/configure 2019-07-12 12:35:46.904354755 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Qsynth 0.5.6. +# Generated by GNU Autoconf 2.69 for Qsynth 0.5.7. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Qsynth' PACKAGE_TARNAME='qsynth' -PACKAGE_VERSION='0.5.6' -PACKAGE_STRING='Qsynth 0.5.6' +PACKAGE_VERSION='0.5.7' +PACKAGE_STRING='Qsynth 0.5.7' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -642,6 +642,7 @@ ac_moc ac_cv_qmake ac_qmake +ac_qtchooser PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -1276,7 +1277,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Qsynth 0.5.6 to adapt to many kinds of systems. +\`configure' configures Qsynth 0.5.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1337,7 +1338,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Qsynth 0.5.6:";; + short | recursive ) echo "Configuration of Qsynth 0.5.7:";; esac cat <<\_ACEOF @@ -1456,7 +1457,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Qsynth configure 0.5.6 +Qsynth configure 0.5.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1900,7 +1901,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Qsynth $as_me 0.5.6, which was +It was created by Qsynth $as_me 0.5.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3967,6 +3968,109 @@ # A common error message: ac_errmsg="not found in current PATH. Maybe QT development environment isn't available." +# Check for qtchooser availability. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args. +set dummy ${ac_tool_prefix}qtchooser; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_qtchooser+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_qtchooser in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_qtchooser="$ac_qtchooser" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $ac_path +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_qtchooser="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_qtchooser=$ac_cv_path_ac_qtchooser +if test -n "$ac_qtchooser"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_qtchooser" >&5 +$as_echo "$ac_qtchooser" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_ac_qtchooser"; then + ac_pt_ac_qtchooser=$ac_qtchooser + # Extract the first word of "qtchooser", so it can be a program name with args. +set dummy qtchooser; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_ac_qtchooser+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_ac_qtchooser in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_ac_qtchooser="$ac_pt_ac_qtchooser" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $ac_path +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_ac_qtchooser="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_ac_qtchooser=$ac_cv_path_ac_pt_ac_qtchooser +if test -n "$ac_pt_ac_qtchooser"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_ac_qtchooser" >&5 +$as_echo "$ac_pt_ac_qtchooser" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_ac_qtchooser" = x; then + ac_qtchooser="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + ac_qtchooser=$ac_pt_ac_qtchooser + fi +else + ac_qtchooser="$ac_cv_path_ac_qtchooser" +fi + +if test -x $ac_qtchooser; then + export QT_SELECT=5 +fi + # Check for proper qmake path/version alternatives. if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}qmake", so it can be a program name with args. @@ -7321,7 +7425,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Qsynth $as_me 0.5.6, which was +This file was extended by Qsynth $as_me 0.5.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7383,7 +7487,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Qsynth config.status 0.5.6 +Qsynth config.status 0.5.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/configure.ac new/qsynth-0.5.7/configure.ac --- old/qsynth-0.5.6/configure.ac 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/configure.ac 2019-07-12 12:35:23.873356128 +0200 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsynth, 0.5.6, [email protected], qsynth) +AC_INIT(Qsynth, 0.5.7, [email protected], qsynth) AC_CONFIG_SRCDIR(src/qsynth.cpp) AC_CONFIG_HEADERS(src/config.h) @@ -202,6 +202,12 @@ # A common error message: ac_errmsg="not found in current PATH. Maybe QT development environment isn't available." +# Check for qtchooser availability. +AC_PATH_TOOL(ac_qtchooser, qtchooser, [no], $ac_path) +if test -x $ac_qtchooser; then + export QT_SELECT=5 +fi + # Check for proper qmake path/version alternatives. AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path) if test "x$ac_qmake" = "xno"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/qsynth.1 new/qsynth-0.5.7/qsynth.1 --- old/qsynth-0.5.6/qsynth.1 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/qsynth.1 2019-07-12 12:35:23.873356128 +0200 @@ -87,7 +87,7 @@ .IP Dump midi router events .HP -\fB\-v\fR, \fB\-\-verbose\fR +\fB\-V\fR, \fB\-\-verbose\fR .IP Print out verbose messages about midi events .HP @@ -95,7 +95,7 @@ .IP Show help about command line options .HP -\fB\-V\fR, \fB\-\-version\fR +\fB\-v\fR, \fB\-\-version\fR .IP Show version information .SH FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/qsynth.fr.1 new/qsynth-0.5.7/qsynth.fr.1 --- old/qsynth-0.5.6/qsynth.fr.1 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/qsynth.fr.1 2019-07-12 12:35:23.873356128 +0200 @@ -87,7 +87,7 @@ .IP Décharger les évènements de routage MIDI .HP -\fB\-v\fR, \fB\-\-verbose\fR +\fB\-V\fR, \fB\-\-verbose\fR .IP Affiche des messages verbeux à propos des évènements MIDI .HP @@ -95,7 +95,7 @@ .IP Affiche de l'aide à propos des options de ligne de commande .HP -\fB\-V\fR, \fB\-\-version\fR +\fB\-v\fR, \fB\-\-version\fR .IP Affiche des informations de version .SH FICHIERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/qsynth.spec.in new/qsynth-0.5.7/qsynth.spec.in --- old/qsynth-0.5.6/qsynth.spec.in 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/qsynth.spec.in 2019-07-12 12:35:23.873356128 +0200 @@ -1,6 +1,6 @@ %define name @PACKAGE_TARNAME@ %define version @PACKAGE_VERSION@ -%define release 17 +%define release 18 %define _prefix @ac_prefix@ @@ -20,19 +20,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -#BuildRequires: libqt4-devel >= 4.4 %if %{defined fedora} BuildRequires: pkgconfig BuildRequires: qt5-qtbase-devel >= 5.1, qt5-linguist -BuildRequires: qt5-qtx11extras-devel >= 5.1 BuildRequires: alsa-lib-devel %else BuildRequires: pkg-config BuildRequires: libqt5-qtbase-devel >= 5.1, libqt5-linguist -BuildRequires: libqt5-qtx11extras-devel >= 5.1 BuildRequires: alsa-devel %endif -BuildRequires: libfluidsynth-devel >= 1.0.8 +BuildRequires: libfluidsynth-devel BuildRequires: libjack-devel %description @@ -75,6 +72,8 @@ %{_datadir}/man/man1/%{name}*.1.gz %changelog +* Fri Jul 12 2019 Rui Nuno Capela <[email protected]> 0.5.7 +- Summer'19 release. * Thu Apr 11 2019 Rui Nuno Capela <[email protected]> 0.5.6 - Spring-Break'19 release. * Mon Mar 11 2019 Rui Nuno Capela <[email protected]> 0.5.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/CMakeLists.txt new/qsynth-0.5.7/src/CMakeLists.txt --- old/qsynth-0.5.6/src/CMakeLists.txt 2019-04-11 10:29:45.804795418 +0200 +++ new/qsynth-0.5.7/src/CMakeLists.txt 2019-07-12 12:35:23.873356128 +0200 @@ -138,6 +138,8 @@ DESTINATION share/applications ) install ( FILES images/qsynth.png DESTINATION share/pixmaps ) + install ( FILES appdata/qsynth.appdata.xml + DESTINATION share/metainfo ) endif () if (WIN32) Binary files old/qsynth-0.5.6/src/images/qsynth.icns and new/qsynth-0.5.7/src/images/qsynth.icns differ Binary files old/qsynth-0.5.6/src/images/qsynth.png and new/qsynth-0.5.7/src/images/qsynth.png differ Binary files old/qsynth-0.5.6/src/images/qsynth.xcf and new/qsynth-0.5.7/src/images/qsynth.xcf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynth.cpp new/qsynth-0.5.7/src/qsynth.cpp --- old/qsynth-0.5.6/src/qsynth.cpp 2019-04-11 10:29:45.805795418 +0200 +++ new/qsynth-0.5.7/src/qsynth.cpp 2019-07-12 12:35:23.875356128 +0200 @@ -30,7 +30,7 @@ #include <QSessionManager> -#if QT_VERSION < 0x040500 +#if QT_VERSION < QT_VERSION_CHECK(4, 5, 0) namespace Qt { const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000); } @@ -53,7 +53,7 @@ #define QSYNTH_XUNIQUE "qsynthApplication" -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_X11 #include <unistd.h> /* for gethostname() */ @@ -118,7 +118,7 @@ } } #ifdef CONFIG_XUNIQUE -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_X11 m_pDisplay = NULL; m_aUnique = 0; @@ -136,7 +136,7 @@ qsynthApplication::~qsynthApplication (void) { #ifdef CONFIG_XUNIQUE -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) if (m_pServer) { m_pServer->close(); delete m_pServer; @@ -158,7 +158,7 @@ { m_pWidget = pWidget; #ifdef CONFIG_XUNIQUE -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_X11 m_wOwner = m_pWidget->winId(); if (m_pDisplay && m_wOwner) { @@ -177,7 +177,7 @@ bool qsynthApplication::setup (void) { #ifdef CONFIG_XUNIQUE -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_X11 m_pDisplay = QX11Info::display(); if (m_pDisplay) { @@ -288,7 +288,7 @@ #ifdef CONFIG_XUNIQUE -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_X11 void qsynthApplication::x11PropertyNotify ( Window w ) @@ -452,7 +452,7 @@ #endif #endif qsynthApplication app(argc, argv); -#if QT_VERSION >= 0x050600 +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) app.setAttribute(Qt::AA_EnableHighDpiScaling); #endif // Construct default settings; override with command line arguments. @@ -471,7 +471,7 @@ // Dark themes grayed/disabled color group fix... QPalette pal(app.palette()); if (pal.base().color().value() < 0x7f) { - #if QT_VERSION >= 0x050000 + #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) const QColor& color = pal.window().color(); const int iGroups = int(QPalette::Active | QPalette::Inactive) + 1; for (int i = 0; i < iGroups; ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynth.h new/qsynth-0.5.7/src/qsynth.h --- old/qsynth-0.5.6/src/qsynth.h 2019-04-11 10:29:45.805795418 +0200 +++ new/qsynth-0.5.7/src/qsynth.h 2019-07-12 12:35:23.875356128 +0200 @@ -26,7 +26,7 @@ #include <QApplication> -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #if defined(Q_WS_X11) #define CONFIG_X11 #endif @@ -41,7 +41,7 @@ class QWidget; class QTranslator; -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_XUNIQUE #ifdef CONFIG_X11 #include <QX11Info> @@ -82,7 +82,7 @@ // and raise its proper main widget... bool setup(); -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_XUNIQUE #ifdef CONFIG_X11 void x11PropertyNotify(Window w); @@ -107,7 +107,7 @@ // Instance variables. QWidget *m_pWidget; -#if QT_VERSION < 0x050000 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #ifdef CONFIG_XUNIQUE #ifdef CONFIG_X11 Display *m_pDisplay; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthChannelsForm.cpp new/qsynth-0.5.7/src/qsynthChannelsForm.cpp --- old/qsynth-0.5.6/src/qsynthChannelsForm.cpp 2019-04-11 10:29:45.805795418 +0200 +++ new/qsynth-0.5.7/src/qsynthChannelsForm.cpp 2019-07-12 12:35:23.875356128 +0200 @@ -74,7 +74,7 @@ QHeaderView *pHeader = m_ui.ChannelsListView->header(); pHeader->setDefaultAlignment(Qt::AlignLeft); // pHeader->setDefaultSectionSize(320); -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // pHeader->setSectionResizeMode(QHeaderView::Custom); pHeader->setSectionsMovable(false); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialClassicStyle.cpp new/qsynth-0.5.7/src/qsynthDialClassicStyle.cpp --- old/qsynth-0.5.6/src/qsynthDialClassicStyle.cpp 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialClassicStyle.cpp 2019-07-12 12:35:23.876356128 +0200 @@ -7,8 +7,10 @@ and adapted for use in QSynth. Ported to Qt4 by Chris Cannam. Adapted as a QStyle by Pedro Lopez-Cabanillas. - - This file copyright 2003-2006 Chris Cannam, + + This file, + copyright 2019 rncbc aka Rui Nuno Capela, + copyright 2003-2006 Chris Cannam, copyright 2005,2008 Pedro Lopez-Cabanillas, copyright 2006 Queen Mary, University of London. @@ -98,8 +100,8 @@ p->setPen(pen); QRadialGradient gradient(size/2, size/2, size-indent, size/2-indent, size/2-indent); - gradient.setColorAt(0, knobColor.light()); - gradient.setColorAt(1, knobColor.dark()); + gradient.setColorAt(0, knobColor.lighter()); + gradient.setColorAt(1, knobColor.darker()); p->setBrush(gradient); p->drawEllipse(indent, indent, width-2*indent, width-2*indent); @@ -137,7 +139,7 @@ // Knob shadow... int shadowAngle = -720; - c = knobColor.dark(); + c = knobColor.darker(); for (int arc = 120; arc < 2880; arc += 240) { pen.setColor(c); @@ -146,7 +148,7 @@ + arc, 240); p->drawArc(indent, indent, width-2*indent, width-2*indent, shadowAngle - arc, 240); - c = c.light(110); + c = c.lighter(110); } // Scale shadow... @@ -160,12 +162,12 @@ width-scale, width-scale, shadowAngle + arc, 240); p->drawArc(scale/2, scale/2, width-scale, width-scale, shadowAngle - arc, 240); - c = c.light(108); + c = c.lighter(108); } // Undraw the bottom part... - pen.setColor(pal.background().color()); + pen.setColor(pal.window().color()); pen.setWidth(scale * 4); p->setPen(pen); p->drawArc(scale/2, scale/2, @@ -184,7 +186,7 @@ float y = hyp + len * cos(angle); c = pal.dark().color(); - pen.setColor((dial->state & State_Enabled) ? c.dark(130) : c); + pen.setColor((dial->state & State_Enabled) ? c.darker(130) : c); pen.setWidth(scale * 2); p->setPen(pen); p->drawLine(int(x0), int(y0), int(x), int(y)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialClassicStyle.h new/qsynth-0.5.7/src/qsynthDialClassicStyle.h --- old/qsynth-0.5.6/src/qsynthDialClassicStyle.h 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialClassicStyle.h 2019-07-12 12:35:23.876356128 +0200 @@ -7,9 +7,11 @@ and adapted for use in QSynth. Ported to Qt4 by Chris Cannam. Adapted as a QStyle by Pedro Lopez-Cabanillas. - - This file copyright 2003-2006 Chris Cannam, - copyright 2005,2008 Pedro Lopez-Cabanillas, + + This file, + copyright 2019 rncbc aka Rui Nuno Capela, + copyright 2003-2006 Chris Cannam, + copyright 2005,2008 Pedro Lopez-Cabanillas, copyright 2006 Queen Mary, University of London. This program is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialPeppinoStyle.cpp new/qsynth-0.5.7/src/qsynthDialPeppinoStyle.cpp --- old/qsynth-0.5.6/src/qsynthDialPeppinoStyle.cpp 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialPeppinoStyle.cpp 2019-07-12 12:35:23.876356128 +0200 @@ -4,8 +4,9 @@ adapted as a Qt style for QSynth by Pedro Lopez-Cabanillas This file, + Copyright (C) 2019 rncbc aka Rui Nuno Capela <[email protected]>, Copyright (C) 2008 Giuseppe Cigala <[email protected]>, - Copyright (C) 2008 Pedro Lopez-Cabanillas <[email protected]> + Copyright (C) 2008 Pedro Lopez-Cabanillas <[email protected]>. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -83,8 +84,8 @@ QPalette pal = dial->palette; QColor arcColor = (dial->state & QStyle::State_Enabled) ? pal.highlight().color() : pal.mid().color(); QLinearGradient linGrad(80, 100, 140, 140); - linGrad.setColorAt(0, arcColor.dark(140)); - linGrad.setColorAt(1, arcColor.light().light()); + linGrad.setColorAt(0, arcColor.darker(140)); + linGrad.setColorAt(1, arcColor.lighter().lighter()); linGrad.setSpread(QGradient::PadSpread); p->setBrush(linGrad); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialPeppinoStyle.h new/qsynth-0.5.7/src/qsynthDialPeppinoStyle.h --- old/qsynth-0.5.6/src/qsynthDialPeppinoStyle.h 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialPeppinoStyle.h 2019-07-12 12:35:23.876356128 +0200 @@ -4,8 +4,9 @@ adapted as a Qt style for QSynth by Pedro Lopez-Cabanillas This file, - Copyright (C) 2008 Giuseppe Cigala <[email protected]> - Copyright (C) 2008 Pedro Lopez-Cabanillas <[email protected]> + Copyright (C) 2019 rncbc aka Rui Nuno Capela <[email protected]>, + Copyright (C) 2008 Giuseppe Cigala <[email protected]> + Copyright (C) 2008 Pedro Lopez-Cabanillas <[email protected]>. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialSkulptureStyle.cpp new/qsynth-0.5.7/src/qsynthDialSkulptureStyle.cpp --- old/qsynth-0.5.6/src/qsynthDialSkulptureStyle.cpp 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialSkulptureStyle.cpp 2019-07-12 12:35:23.876356128 +0200 @@ -2,6 +2,7 @@ Skulpture - Classical Three-Dimensional Artwork for Qt 4 + Copyright (c) 2019 rncbc aka Rui Nuno Capela <[email protected]> Copyright (c) 2007-2009 Christoph Feck <[email protected]> This program is free software; you can redistribute it and/or @@ -39,7 +40,7 @@ { QPixmap pixmap; - if (!useCache || !QPixmapCache::find(pixmapName, pixmap)) { + if (!useCache || !QPixmapCache::find(pixmapName, &pixmap)) { pixmap = QPixmap(option->rect.size()); #if 1 pixmap.fill(Qt::transparent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialSkulptureStyle.h new/qsynth-0.5.7/src/qsynthDialSkulptureStyle.h --- old/qsynth-0.5.6/src/qsynthDialSkulptureStyle.h 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialSkulptureStyle.h 2019-07-12 12:35:23.876356128 +0200 @@ -2,6 +2,7 @@ Skulpture - Classical Three-Dimensional Artwork for Qt 4 + Copyright (c) 2019 rncbc aka Rui Nuno Capela <[email protected]> Copyright (c) 2007-2009 Christoph Feck <[email protected]> This program is free software; you can redistribute it and/or @@ -28,8 +29,8 @@ class qsynthDialSkulptureStyle : public QCommonStyle { public: - qsynthDialSkulptureStyle() {}; - virtual ~qsynthDialSkulptureStyle() {}; + qsynthDialSkulptureStyle() {} + virtual ~qsynthDialSkulptureStyle() {} virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget = 0) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialVokiStyle.cpp new/qsynth-0.5.7/src/qsynthDialVokiStyle.cpp --- old/qsynth-0.5.6/src/qsynthDialVokiStyle.cpp 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialVokiStyle.cpp 2019-07-12 12:35:23.876356128 +0200 @@ -4,7 +4,8 @@ implemented as a widget by Chris Cannam in Rosegarden, adapted for QSynth by Pedro Lopez-Cabanillas, improved for Qt4 by David Garcia Garzon, - adapted as a QStyle by Pedro Lopez-Cabanillas + adapted as a QStyle by Pedro Lopez-Cabanillas, + updated for Qt5 by rncbc aka Rui Nuno Capela. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -71,7 +72,7 @@ QPalette pal = opt->palette; QColor knobColor = pal.mid().color(); - QColor borderColor = knobColor.light(); + QColor borderColor = knobColor.lighter(); QColor meterColor = (dial->state & State_Enabled) ? pal.highlight().color() : pal.mid().color(); QColor background = pal.window().color(); @@ -82,9 +83,9 @@ // The bright metering bit... QConicalGradient meterShadow(xcenter, ycenter, -90); - meterShadow.setColorAt(0, meterColor.dark()); + meterShadow.setColorAt(0, meterColor.darker()); meterShadow.setColorAt(0.5, meterColor); - meterShadow.setColorAt(1.0, meterColor.light().light()); + meterShadow.setColorAt(1.0, meterColor.lighter().lighter()); p->setBrush(meterShadow); p->setPen(Qt::transparent); p->drawPie(xcenter - meterWidth / 2, ycenter - meterWidth / 2, @@ -111,9 +112,9 @@ QRadialGradient gradient( xcenter - shineCenter, ycenter - shineCenter, shineExtension, xcenter - shineFocus, ycenter - shineFocus); - gradient.setColorAt(0.2, knobColor.light().light()); + gradient.setColorAt(0.2, knobColor.lighter().lighter()); gradient.setColorAt(0.5, knobColor); - gradient.setColorAt(1.0, knobColor.dark(150)); + gradient.setColorAt(1.0, knobColor.darker(150)); QBrush knobBrush(gradient); p->setBrush(knobBrush); p->drawEllipse(xcenter - knobWidth / 2, ycenter - knobWidth / 2, @@ -153,8 +154,8 @@ if (knobBorderWidth > 0) { QLinearGradient inShadow(xcenter - side / 4, ycenter - side / 4, xcenter + side / 4, ycenter + side / 4); - inShadow.setColorAt(0.0, borderColor.light()); - inShadow.setColorAt(1.0, borderColor.dark()); + inShadow.setColorAt(0.0, borderColor.lighter()); + inShadow.setColorAt(1.0, borderColor.darker()); p->setPen(QPen(QBrush(inShadow), knobBorderWidth * 7 / 8)); p->drawEllipse(xcenter - side / 2 + indent, ycenter - side / 2 + indent, @@ -164,8 +165,8 @@ // Scale shadow... QLinearGradient outShadow(xcenter - side / 3, ycenter - side / 3, xcenter + side / 3, ycenter + side / 3); - outShadow.setColorAt(0.0, background.dark().dark()); - outShadow.setColorAt(1.0, background.light().light()); + outShadow.setColorAt(0.0, background.darker().darker()); + outShadow.setColorAt(1.0, background.lighter().lighter()); p->setPen(QPen(QBrush(outShadow), scaleShadowWidth)); p->drawArc(xcenter - side / 2 + scaleShadowWidth / 2, ycenter - side / 2 + scaleShadowWidth / 2, @@ -180,11 +181,11 @@ double y = ycenter + len * cos(angle); QColor pointerColor = pal.dark().color(); - pen.setColor((dial->state & State_Enabled) ? pointerColor.dark(140) : pointerColor); + pen.setColor((dial->state & State_Enabled) ? pointerColor.darker(140) : pointerColor); pen.setWidth(pointerWidth + 2); p->setPen(pen); p->drawLine(QLineF(xcenter, ycenter, x, y)); - pen.setColor((dial->state & State_Enabled) ? pointerColor.light() : pointerColor.light(140)); + pen.setColor((dial->state & State_Enabled) ? pointerColor.lighter() : pointerColor.lighter(140)); pen.setWidth(pointerWidth); p->setPen(pen); p->drawLine(QLineF(xcenter - 1, ycenter - 1, x - 1, y - 1)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthDialVokiStyle.h new/qsynth-0.5.7/src/qsynthDialVokiStyle.h --- old/qsynth-0.5.6/src/qsynthDialVokiStyle.h 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthDialVokiStyle.h 2019-07-12 12:35:23.876356128 +0200 @@ -4,7 +4,8 @@ implemented as a widget by Chris Cannam in Rosegarden, adapted for QSynth by Pedro Lopez-Cabanillas, improved for Qt4 by David Garcia Garzon, - adapted as a QStyle by Pedro Lopez-Cabanillas + adapted as a QStyle by Pedro Lopez-Cabanillas, + updated for Qt5 by rncbc aka Rui Nuno Capela. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -30,8 +31,8 @@ class qsynthDialVokiStyle : public QCommonStyle { public: - qsynthDialVokiStyle() {}; - virtual ~qsynthDialVokiStyle() {}; + qsynthDialVokiStyle() {} + virtual ~qsynthDialVokiStyle() {} virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget = 0) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthEngine.cpp new/qsynth-0.5.7/src/qsynthEngine.cpp --- old/qsynth-0.5.6/src/qsynthEngine.cpp 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthEngine.cpp 2019-07-12 12:35:23.876356128 +0200 @@ -1,7 +1,7 @@ // qsynthEngine.cpp // /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthEngine.h new/qsynth-0.5.7/src/qsynthEngine.h --- old/qsynth-0.5.6/src/qsynthEngine.h 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthEngine.h 2019-07-12 12:35:23.876356128 +0200 @@ -1,7 +1,7 @@ // qsynthEngine.h // /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -34,7 +34,7 @@ public: // Constructor. - qsynthEngine(qsynthOptions *pOptions, const QString& sName = QString::null); + qsynthEngine(qsynthOptions *pOptions, const QString& sName = QString()); // Default destructor. ~qsynthEngine(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthMainForm.cpp new/qsynth-0.5.7/src/qsynthMainForm.cpp --- old/qsynth-0.5.6/src/qsynthMainForm.cpp 2019-04-11 10:29:45.806795418 +0200 +++ new/qsynth-0.5.7/src/qsynthMainForm.cpp 2019-07-12 12:35:23.877356128 +0200 @@ -56,11 +56,11 @@ #include <QSessionManager> -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include <QMimeData> #endif -#if QT_VERSION < 0x040500 +#if QT_VERSION < QT_VERSION_CHECK(4, 5, 0) namespace Qt { const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000); } @@ -2058,7 +2058,7 @@ savePanelSettings(pEngine); // Make those settings persist over... m_pOptions->saveSetup(pSetup, pEngine->isDefault() - ? QString::null : pEngine->name()); + ? QString() : pEngine->name()); } // Flush anything that maybe pending... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthMeter.cpp new/qsynth-0.5.7/src/qsynthMeter.cpp --- old/qsynth-0.5.6/src/qsynthMeter.cpp 2019-04-11 10:29:45.807795418 +0200 +++ new/qsynth-0.5.7/src/qsynthMeter.cpp 2019-07-12 12:35:23.877356128 +0200 @@ -30,6 +30,10 @@ #include <math.h> +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +#define horizontalAdvance width +#endif + // Meter level limits (in dB). #define QSYNTH_METER_MAXDB (+3.0f) @@ -73,7 +77,7 @@ const int iMidHeight = (fm.height() >> 1); if (iCurrY < iMidHeight || iCurrY > m_iLastY + iMidHeight) { - if (fm.width(sLabel) < iWidth - 5) { + if (fm.horizontalAdvance(sLabel) < iWidth - 5) { p->drawLine(0, iCurrY, 2, iCurrY); if (m_pMeter->portCount() > 1) p->drawLine(iWidth - 3, iCurrY, iWidth - 1, iCurrY); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthOptions.cpp new/qsynth-0.5.7/src/qsynthOptions.cpp --- old/qsynth-0.5.6/src/qsynthOptions.cpp 2019-04-11 10:29:45.807795418 +0200 +++ new/qsynth-0.5.7/src/qsynthOptions.cpp 2019-07-12 12:35:23.877356128 +0200 @@ -1,7 +1,7 @@ // qsynthOptions.cpp // /**************************************************************************** - Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -39,7 +39,7 @@ // Create default setup descriptor. m_pDefaultSetup = new qsynthSetup(); // Load previous/default fluidsynth settings... - loadSetup(m_pDefaultSetup, QString::null); + loadSetup(m_pDefaultSetup, QString()); loadOptions(); } @@ -205,11 +205,11 @@ QObject::tr("Don't read commands from the shell [ignored]") + sEol; out << " -d, --dump" + sEot + QObject::tr("Dump midi router events") + sEol; - out << " -v, --verbose" + sEot + + out << " -V, --verbose" + sEot + QObject::tr("Print out verbose messages about midi events") + sEol; out << " -h, --help" + sEot + QObject::tr("Show help about command line options") + sEol; - out << " -V, --version" + sEot + + out << " -v, --version" + sEot + QObject::tr("Show version information") + sEol; } @@ -358,14 +358,14 @@ else if (sArg == "-d" || sArg == "--dump") { m_pDefaultSetup->bMidiDump = true; } - else if (sArg == "-v" || sArg == "--verbose") { + else if (sArg == "-V" || sArg == "--verbose") { m_pDefaultSetup->bVerbose = true; } else if (sArg == "-h" || sArg == "--help") { print_usage(args.at(0)); return false; } - else if (sArg == "-V" || sArg == "--version") { + else if (sArg == "-v" || sArg == "--version") { out << QString("Qt: %1\n") .arg(qVersion()); out << QString("FluidSynth: %1\n") @@ -384,7 +384,7 @@ m_pDefaultSetup->bankoffsets.clear(); } m_pDefaultSetup->soundfonts.append(name); - m_pDefaultSetup->bankoffsets.append(QString::null); + m_pDefaultSetup->bankoffsets.append(QString()); } else if (::fluid_is_midifile(name)) { m_pDefaultSetup->midifiles.append(name); @@ -481,14 +481,20 @@ m_settings.beginGroup("/Settings"); pSetup->sDisplayName = m_settings.value("/DisplayName", sDisplayName).toString(); pSetup->bMidiIn = m_settings.value("/MidiIn", true).toBool(); -#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) +#if defined(__APPLE__) + pSetup->sMidiDriver = m_settings.value("/MidiDriver", "coremidi").toString(); + pSetup->sAudioDriver = m_settings.value("/AudioDriver", "coreaudio").toString(); +#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) pSetup->sMidiDriver = m_settings.value("/MidiDriver", "winmidi").toString(); pSetup->sAudioDriver = m_settings.value("/AudioDriver", "dsound").toString(); - pSetup->iAudioBufSize = m_settings.value("/AudioBufSize", 512).toInt(); - pSetup->iAudioBufCount = m_settings.value("/AudioBufCount", 8).toInt(); #else pSetup->sMidiDriver = m_settings.value("/MidiDriver", "alsa_seq").toString(); pSetup->sAudioDriver = m_settings.value("/AudioDriver", "jack").toString(); +#endif +#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) + pSetup->iAudioBufSize = m_settings.value("/AudioBufSize", 512).toInt(); + pSetup->iAudioBufCount = m_settings.value("/AudioBufCount", 8).toInt(); +#else pSetup->iAudioBufSize = m_settings.value("/AudioBufSize", 64).toInt(); pSetup->iAudioBufCount = m_settings.value("/AudioBufCount", 2).toInt(); #endif @@ -911,7 +917,7 @@ if (pWidget) { // if (bVisible) pWidget->show(); -- force initial exposure? m_settings.beginGroup("/Geometry/" + pWidget->objectName()); - #if QT_VERSION >= 0x050000 + #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) const QByteArray& geometry = m_settings.value("/geometry").toByteArray(); if (!geometry.isEmpty()) @@ -948,7 +954,7 @@ // only save the form geometry while its up and visible) if (pWidget) { m_settings.beginGroup("/Geometry/" + pWidget->objectName()); - #if QT_VERSION >= 0x050000 + #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) m_settings.setValue("/geometry", pWidget->saveGeometry()); #else//--SAVE_OLD_GEOMETRY const QPoint& wpos = pWidget->pos(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthOptions.h new/qsynth-0.5.7/src/qsynthOptions.h --- old/qsynth-0.5.6/src/qsynthOptions.h 2019-04-11 10:29:45.807795418 +0200 +++ new/qsynth-0.5.7/src/qsynthOptions.h 2019-07-12 12:35:23.877356128 +0200 @@ -1,7 +1,7 @@ // qsynthOptions.h // /**************************************************************************** - Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthPresetForm.cpp new/qsynth-0.5.7/src/qsynthPresetForm.cpp --- old/qsynth-0.5.6/src/qsynthPresetForm.cpp 2019-04-11 10:29:45.807795418 +0200 +++ new/qsynth-0.5.7/src/qsynthPresetForm.cpp 2019-07-12 12:35:23.878356128 +0200 @@ -82,7 +82,7 @@ QHeaderView *pHeader = m_ui.ProgListView->header(); pHeader->setDefaultAlignment(Qt::AlignLeft); // pHeader->setDefaultSectionSize(200); -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // pHeader->setSectionResizeMode(QHeaderView::Custom); pHeader->setSectionsMovable(false); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthSetupForm.cpp new/qsynth-0.5.7/src/qsynthSetupForm.cpp --- old/qsynth-0.5.6/src/qsynthSetupForm.cpp 2019-04-11 10:29:45.807795418 +0200 +++ new/qsynth-0.5.7/src/qsynthSetupForm.cpp 2019-07-12 12:35:23.878356128 +0200 @@ -1,7 +1,7 @@ // qsynthSetupForm.cpp // /**************************************************************************** - Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -165,8 +165,8 @@ #endif (pData->pListItem)->setText(iCol++, pszCurrent); (pData->pListItem)->setText(iCol++, pszDefault); - (pData->pListItem)->setText(iCol++, QString::null); - (pData->pListItem)->setText(iCol++, QString::null); + (pData->pListItem)->setText(iCol++, QString()); + (pData->pListItem)->setText(iCol++, QString()); #ifdef CONFIG_FLUID_SETTINGS_DUPSTR ::free(pszCurrent); #endif @@ -218,7 +218,7 @@ QHeaderView *pHeader = m_ui.SoundFontListView->header(); pHeader->setDefaultAlignment(Qt::AlignLeft); // pHeader->setDefaultSectionSize(300); -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // pHeader->setSectionResizeMode(QHeaderView::Custom); pHeader->setSectionsMovable(false); #else @@ -235,7 +235,7 @@ pHeader = m_ui.SettingsListView->header(); pHeader->setDefaultAlignment(Qt::AlignLeft); // pHeader->setDefaultSectionSize(160); -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // pHeader->setSectionResizeMode(QHeaderView::Custom); pHeader->setSectionsMovable(false); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthSetupForm.h new/qsynth-0.5.7/src/qsynthSetupForm.h --- old/qsynth-0.5.6/src/qsynthSetupForm.h 2019-04-11 10:29:45.808795418 +0200 +++ new/qsynth-0.5.7/src/qsynthSetupForm.h 2019-07-12 12:35:23.878356128 +0200 @@ -1,7 +1,7 @@ // qsynthSetupForm.h // /**************************************************************************** - Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthSetupForm.ui new/qsynth-0.5.7/src/qsynthSetupForm.ui --- old/qsynth-0.5.6/src/qsynthSetupForm.ui 2019-04-11 10:29:45.808795418 +0200 +++ new/qsynth-0.5.7/src/qsynthSetupForm.ui 2019-07-12 12:35:23.878356128 +0200 @@ -3,7 +3,7 @@ <author>rncbc aka Rui Nuno Capela</author> <comment>qsynth - A fluidsynth Qt GUI Interface. - Copyright (C) 2003-2018, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2019, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qsynth-0.5.6/src/qsynthSystemTray.cpp new/qsynth-0.5.7/src/qsynthSystemTray.cpp --- old/qsynth-0.5.6/src/qsynthSystemTray.cpp 2019-04-11 10:29:45.808795418 +0200 +++ new/qsynth-0.5.7/src/qsynthSystemTray.cpp 2019-07-12 12:35:23.878356128 +0200 @@ -25,7 +25,7 @@ #include <QBitmap> #include <QPainter> -#if QT_VERSION < 0x040500 +#if QT_VERSION < QT_VERSION_CHECK(4, 5, 0) namespace Qt { const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000); }
