Skip to content

Commit a8ce78a

Browse files
pedrolclpedrolcl
committed
Merge branch 'devel'
2 parents c51bb60 + 4a89206 commit a8ce78a

18 files changed

+164
-49
lines changed

‎.github/workflows/build-linux.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
2+
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
3+
name: Build on Linux
4+
5+
on:
6+
push:
7+
branches: [ "devel", "master" ]
8+
pull_request:
9+
branches: [ "devel", "master" ]
10+
workflow_dispatch:
11+
12+
env:
13+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
14+
BUILD_TYPE: RelWithDebInfo
15+
DRUMSTICKNAME: DrumstickV2
16+
SONIVOXNAME: SonivoxV3
17+
DRUMSTICK_LOCATION: ${{github.workspace}}/DrumstickV2
18+
SONIVOX_LOCATION: ${{github.workspace}}/SonivoxV3
19+
20+
jobs:
21+
build:
22+
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
23+
# You can convert this to a matrix build if you need cross-platform coverage.
24+
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
25+
runs-on: ubuntu-latest
26+
27+
steps:
28+
- uses: actions/checkout@v4
29+
with:
30+
submodules: true
31+
32+
- uses: dawidd6/action-download-artifact@v3
33+
with:
34+
name: ${{env.SONIVOXNAME}}-linux
35+
github_token: ${{secrets.GH_PAT}}
36+
repo: pedrolcl/sonivox
37+
workflow: cmake-linux.yml
38+
39+
- name: Extract downloaded files
40+
run: tar xvf ${{env.SONIVOXNAME}}.tar
41+
42+
- uses: dawidd6/action-download-artifact@v3
43+
with:
44+
name: ${{env.DRUMSTICKNAME}}
45+
github_token: ${{secrets.GH_PAT}}
46+
repo: pedrolcl/drumstick
47+
workflow: cmake.yml
48+
49+
- name: Extract downloaded files
50+
run: tar xvf ${{env.DRUMSTICKNAME}}.tar
51+
52+
- name: Install Qt
53+
uses: jurplel/install-qt-action@v3
54+
with:
55+
version: '6.5.*'
56+
57+
- name: Dependencies
58+
run: sudo apt-get update && sudo apt-get install -yq pkg-config libasound2-dev libpulse-dev
59+
60+
- name: Configure CMake
61+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
62+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
63+
run: cmake -B ${{github.workspace}}/build
64+
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
65+
-DCMAKE_PREFIX_PATH="${{env.DRUMSTICK_LOCATION}};${{env.SONIVOX_LOCATION}}"
66+
67+
- name: Build
68+
# Build your program with the given configuration
69+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

‎.gitmodules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[submodule "sonivox"]
22
path = sonivox
33
url = git@github.com:pedrolcl/sonivox.git
4+
branch = devel

‎CMakeLists.txt‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
cmake_minimum_required(VERSION 3.9)
22
project( EASSynth
3-
VERSION 1.5.0
3+
VERSION 1.5.1
44
DESCRIPTION "Sonivox EAS for Linux and Qt" )
55

66
set(CMAKE_CXX_STANDARD 11)
77
set(CMAKE_CXX_STANDARD_REQUIRED ON)
88

9-
option(USE_QT "Choose which Qt major version (5 or 6) to prefer. By default uses whatever is found")
9+
option(USE_QT5 "Choose Qt5 instead of Qt6. By default uses Qt6")
1010

1111
include(GNUInstallDirs)
1212

13-
if (USE_QT)
14-
if (NOT (USE_QT EQUAL 5 OR USE_QT EQUAL 6))
15-
message(FATAL_ERROR "Wrong Qt major version. Only 5 and 6 are valid options")
16-
endif()
17-
endif()
18-
19-
if (USE_QT EQUAL 5)
13+
if (USE_QT5)
2014
find_package(QT NAMES Qt5)
21-
elseif (USE_QT EQUAL 6)
22-
find_package(QT NAMES Qt6)
2315
else()
24-
find_package(QT NAMES Qt5 Qt6)
16+
find_package(QT NAMES Qt6)
2517
endif()
2618

2719
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED)
28-
find_package(Drumstick 2.7 COMPONENTS ALSA REQUIRED)
20+
find_package(Drumstick 2.9 COMPONENTS ALSA REQUIRED)
2921
message(STATUS "Using Drumstick version: ${Drumstick_VERSION}")
3022
find_package(PkgConfig REQUIRED)
3123
pkg_check_modules(PULSE REQUIRED IMPORTED_TARGET libpulse-simple)
3224

33-
find_package(sonivox 3.6.12 CONFIG)
25+
find_package(sonivox 3.6.13 CONFIG)
3426
if (NOT sonivox_FOUND)
35-
add_subdirectory(sonivox)
27+
message(FATAL_ERROR "Sonivox library not found")
28+
#alternative: use sonivox as a git submodule:
29+
#add_subdirectory(sonivox)
3630
endif()
3731
message(STATUS "Using Sonivox version: ${sonivox_VERSION}")
3832
add_subdirectory(libsvoxeas)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To build, test and debug you may also find QtCreator interesting. You may also u
3333
Licenses
3434
--------
3535

36-
Copyright (C) 2016-2023 Pedro López-Cabanillas.
36+
Copyright (C) 2016-2024 Pedro López-Cabanillas.
3737

3838
This program is free software; you can redistribute it and/or modify
3939
it under the terms of the GNU General Public License as published by

‎cmdlnsynth/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Sonivox EAS Synthesizer for Qt applications
3-
Copyright (C) 2016-2023, Pedro Lopez-Cabanillas <plcl@users.sf.net>
3+
Copyright (C) 2016-2024, Pedro Lopez-Cabanillas <plcl@users.sf.net>
44
55
This library is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by

‎guisynth/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Sonivox EAS Synthesizer for Qt applications
3-
Copyright (C) 2016-2023, Pedro Lopez-Cabanillas <plcl@users.sf.net>
3+
Copyright (C) 2016-2024, Pedro Lopez-Cabanillas <plcl@users.sf.net>
44
55
This library is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by

‎guisynth/mainwindow.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Sonivox EAS Synthesizer for Qt applications
3-
Copyright (C) 2016-2023, Pedro Lopez-Cabanillas <plcl@users.sf.net>
3+
Copyright (C) 2016-2024, Pedro Lopez-Cabanillas <plcl@users.sf.net>
44
55
This library is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -44,6 +44,9 @@ MainWindow::MainWindow(QWidget *parent) :
4444
ui->combo_Chorus->addItem(QStringLiteral("None"), -1);
4545
ui->combo_Chorus->setCurrentIndex(4);
4646

47+
ui->libSonivoxVersion->setText(m_synth->renderer()->libVersion());
48+
setWindowTitle(windowTitle() + " v" + qApp->applicationVersion());
49+
4750
connect(ui->combo_Reverb, SIGNAL(currentIndexChanged(int)), SLOT(reverbTypeChanged(int)));
4851
connect(ui->combo_Chorus, SIGNAL(currentIndexChanged(int)), SLOT(chorusTypeChanged(int)));
4952
connect(ui->dial_Reverb, &QDial::valueChanged, this, &MainWindow::reverbChanged);

‎guisynth/mainwindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Sonivox EAS Synthesizer for Qt applications
3-
Copyright (C) 2016-2023, Pedro Lopez-Cabanillas <plcl@users.sf.net>
3+
Copyright (C) 2016-2024, Pedro Lopez-Cabanillas <plcl@users.sf.net>
44
55
This library is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by

‎guisynth/mainwindow.ui‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>273</width>
10-
<height>265</height>
9+
<width>280</width>
10+
<height>290</height>
1111
</rect>
1212
</property>
1313
<property name="minimumSize">
1414
<size>
15-
<width>273</width>
16-
<height>265</height>
15+
<width>280</width>
16+
<height>290</height>
1717
</size>
1818
</property>
1919
<property name="windowTitle">
@@ -25,7 +25,37 @@
2525
</property>
2626
<widget class="QWidget" name="centralWidget">
2727
<layout class="QGridLayout" name="gridLayout">
28-
<item row="3" column="0">
28+
<item row="3" column="0" colspan="3">
29+
<layout class="QHBoxLayout" name="horizontalLayout">
30+
<item>
31+
<widget class="QLabel" name="lblVersion">
32+
<property name="sizePolicy">
33+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
34+
<horstretch>0</horstretch>
35+
<verstretch>0</verstretch>
36+
</sizepolicy>
37+
</property>
38+
<property name="text">
39+
<string>Sonivox Version:</string>
40+
</property>
41+
</widget>
42+
</item>
43+
<item>
44+
<widget class="QLabel" name="libSonivoxVersion">
45+
<property name="sizePolicy">
46+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
47+
<horstretch>0</horstretch>
48+
<verstretch>0</verstretch>
49+
</sizepolicy>
50+
</property>
51+
<property name="text">
52+
<string/>
53+
</property>
54+
</widget>
55+
</item>
56+
</layout>
57+
</item>
58+
<item row="4" column="0">
2959
<widget class="QLabel" name="lblReverb">
3060
<property name="text">
3161
<string>Reverb</string>
@@ -35,7 +65,7 @@
3565
</property>
3666
</widget>
3767
</item>
38-
<item row="3" column="1">
68+
<item row="4" column="1">
3969
<spacer name="verticalSpacer">
4070
<property name="orientation">
4171
<enum>Qt::Vertical</enum>
@@ -48,7 +78,7 @@
4878
</property>
4979
</spacer>
5080
</item>
51-
<item row="3" column="2">
81+
<item row="4" column="2">
5282
<widget class="QLabel" name="lblChorus">
5383
<property name="text">
5484
<string>Chorus</string>
@@ -58,24 +88,24 @@
5888
</property>
5989
</widget>
6090
</item>
61-
<item row="4" column="0">
91+
<item row="5" column="0">
6292
<widget class="QDial" name="dial_Reverb">
6393
<property name="maximum">
6494
<number>32765</number>
6595
</property>
6696
</widget>
6797
</item>
68-
<item row="4" column="2">
98+
<item row="5" column="2">
6999
<widget class="QDial" name="dial_Chorus">
70100
<property name="maximum">
71101
<number>32765</number>
72102
</property>
73103
</widget>
74104
</item>
75-
<item row="5" column="0">
105+
<item row="6" column="0">
76106
<widget class="QComboBox" name="combo_Reverb"/>
77107
</item>
78-
<item row="5" column="2">
108+
<item row="6" column="2">
79109
<widget class="QComboBox" name="combo_Chorus"/>
80110
</item>
81111
<item row="0" column="0" colspan="3">

‎libsvoxeas/filewrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Sonivox EAS Synthesizer for Qt applications
3-
Copyright (C) 2016-2023, Pedro Lopez-Cabanillas <plcl@users.sf.net>
3+
Copyright (C) 2016-2024, Pedro Lopez-Cabanillas <plcl@users.sf.net>
44
55
This library is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)