Skip to content

Commit

Permalink
Merge branch 'release/1.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickdowell
nickdowell committed Jun 25, 2017
2 parents ff5cf50 + 6dc446d commit c75ff5f
Show file tree
Hide file tree
Showing 103 changed files with 167,099 additions and 143,313 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Expand Up @@ -8,7 +8,7 @@ compiler:

install:
- sudo apt-get update -qq
- sudo apt-get install -qq libgtk2.0-dev libgtkmm-2.4-dev libjack-jackd2-dev libasound-dev liblash-compat-dev dssi-dev liblo-dev libsndfile-dev autopoint intltool pandoc
- sudo apt-get install -qq libgtk2.0-dev libjack-jackd2-dev libasound-dev liblash-compat-dev dssi-dev liblo-dev libsndfile-dev autopoint intltool pandoc
- pip install --user cpp-coveralls

script:
Expand Down
78 changes: 59 additions & 19 deletions CMakeLists.txt
View file
Expand Up @@ -40,16 +40,21 @@ if (JACK_FOUND)
include_directories(${JACK_INCLUDE_DIRS})
endif (JACK_FOUND)

pkg_check_modules(GTKMM gtkmm-2.4)
pkg_check_modules(GTK gtk+-2.0)
add_compile_options(-DWITH_GUI)
include_directories(${GTKMM_INCLUDE_DIRS})
include_directories(${GTK_INCLUDE_DIRS})

pkg_check_modules(LASH lash-1.0)
if (LASH_FOUND)
add_compile_options(-DWITH_LASH)
include_directories(${LASH_INCLUDE_DIRS})
endif (LASH_FOUND)

pkg_check_modules(LIBLO liblo)
if (LIBLO_FOUND)
include_directories(${LIBLO_INCLUDE_DIRS})
endif (LIBLO_FOUND)

#
#
#
Expand Down Expand Up @@ -129,22 +134,21 @@ add_executable(amsynth
src/GUI/bitmap_popup.h
src/GUI/ConfigDialog.cpp
src/GUI/ConfigDialog.h
src/GUI/controller_menu.cpp
src/GUI/controller_menu.h
src/GUI/controllers.h
src/GUI/editor_menus.cpp
src/GUI/editor_menus.h
src/GUI/editor_pane.c
src/GUI/editor_pane.h
src/GUI/GUI.cc
src/GUI/GUI.h
src/GUI/gui_main.cc
src/GUI/gui_main.h
src/GUI/MainMenu.cpp
src/GUI/MainMenu.h
src/GUI/MainWindow.cpp
src/GUI/MainWindow.h
src/GUI/MIDILearnDialog.cpp
src/GUI/MIDILearnDialog.h
src/GUI/PresetControllerView.cc
src/GUI/PresetControllerView.h
src/GUI/presets_menu.cpp
src/GUI/presets_menu.h
src/GUI/Request.h
src/AudioOutput.cc
src/AudioOutput.h
src/JackOutput.cc
Expand All @@ -160,18 +164,42 @@ target_link_libraries(amsynth
amsynth_core
${ALSA_LIBRARIES}
${JACK_LIBRARIES}
${GTKMM_LIBRARIES}
${GTK_LIBRARIES}
${LASH_LIBRARIES}
)

#
#
#

add_library(amsynth_dssi MODULE src/dssi.cpp)
add_library(amsynth_dssi MODULE src/amsynth_dssi.cpp src/amsynth_dssi.h)
set_target_properties(amsynth_dssi PROPERTIES PREFIX "")
target_link_libraries(amsynth_dssi amsynth_core)

add_executable(amsynth_dssi_gtk
src/amsynth_dssi_gtk.cpp
src/GUI/bitmap_button.c
src/GUI/bitmap_button.h
src/GUI/bitmap_knob.c
src/GUI/bitmap_knob.h
src/GUI/bitmap_popup.c
src/GUI/bitmap_popup.h
src/GUI/controllers.h
src/GUI/editor_menus.cpp
src/GUI/editor_menus.h
src/GUI/editor_pane.c
src/GUI/editor_pane.h
)

target_link_libraries(amsynth_dssi_gtk
amsynth_core
${GTK_LIBRARIES}
${LIBLO_LIBRARIES}
)

#
#
#

add_library(amsynth_lv2 MODULE src/amsynth_lv2.cpp)
set_target_properties(amsynth_lv2 PROPERTIES PREFIX "")
Expand All @@ -185,23 +213,35 @@ add_library(amsynth_lv2_gtk MODULE
src/GUI/bitmap_knob.h
src/GUI/bitmap_popup.c
src/GUI/bitmap_popup.h
src/GUI/controller_menu.cpp
src/GUI/controller_menu.h
src/GUI/controllers.h
src/GUI/editor_menus.cpp
src/GUI/editor_menus.h
src/GUI/editor_pane.c
src/GUI/editor_pane.h
src/GUI/presets_menu.cpp
src/GUI/presets_menu.h
src/amsynth_lv2_ui_gtk.c
src/amsynth_lv2_ui_gtk.cpp
)
set_target_properties(amsynth_lv2_gtk PROPERTIES PREFIX "")
target_link_libraries(amsynth_lv2_gtk amsynth_core ${GTKMM_LIBRARIES})
target_link_libraries(amsynth_lv2_gtk amsynth_core ${GTK_LIBRARIES})

add_dependencies(amsynth_lv2 amsynth_lv2_gtk)

add_library(amsynth_vst MODULE src/amsynth_vst.cpp)
add_library(amsynth_vst MODULE
src/amsynth_vst.cpp
src/GUI/bitmap_button.c
src/GUI/bitmap_button.h
src/GUI/bitmap_knob.c
src/GUI/bitmap_knob.h
src/GUI/bitmap_popup.c
src/GUI/bitmap_popup.h
src/GUI/controllers.h
src/GUI/editor_menus.cpp
src/GUI/editor_menus.h
src/GUI/editor_pane.c
src/GUI/editor_pane.h
)
target_compile_options(amsynth_vst PUBLIC -DWITH_GUI)
set_target_properties(amsynth_vst PROPERTIES PREFIX "")
target_link_libraries(amsynth_vst amsynth_core ${GTKMM_LIBRARIES})
target_link_libraries(amsynth_vst amsynth_core ${GTK_LIBRARIES})


add_executable(amsynth_tests src/tests.cpp)
Expand Down
71 changes: 39 additions & 32 deletions Makefile.am
View file
Expand Up @@ -76,13 +76,11 @@ libgui_sources = \
src/GUI/bitmap_knob.h \
src/GUI/bitmap_popup.c \
src/GUI/bitmap_popup.h \
src/GUI/controller_menu.cpp \
src/GUI/controller_menu.h \
src/GUI/controllers.h \
src/GUI/editor_menus.cpp \
src/GUI/editor_menus.h \
src/GUI/editor_pane.c \
src/GUI/editor_pane.h \
src/GUI/presets_menu.cpp \
src/GUI/presets_menu.h
src/GUI/editor_pane.h


#
Expand Down Expand Up @@ -116,24 +114,25 @@ amsynth_SOURCES = \
src/main.h \
src/main.cc

amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @SNDFILE_CFLAGS@ @GTKMM_CFLAGS@
amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @SNDFILE_CFLAGS@ @GTK_CFLAGS@

amsynth_LDADD = @ALSA_LIBS@ @JACK_LIBS@ @LASH_LIBS@ @SNDFILE_LIBS@ @LIBS@

if BUILD_GUI
amsynth_SOURCES += $(libgui_sources) \
src/GUI/ConfigDialog.cpp \
src/GUI/ConfigDialog.h \
src/GUI/GUI.cc \
src/GUI/GUI.h \
src/GUI/gui_main.cc \
src/GUI/gui_main.h \
src/GUI/MainMenu.cpp \
src/GUI/MainMenu.h \
src/GUI/MainWindow.cpp \
src/GUI/MainWindow.h \
src/GUI/MIDILearnDialog.cpp \
src/GUI/MIDILearnDialog.h \
src/GUI/PresetControllerView.cc \
src/GUI/PresetControllerView.h \
src/GUI/Request.h
amsynth_LDADD += @GTKMM_LIBS@
src/GUI/PresetControllerView.h
amsynth_LDADD += @GTK_LIBS@
endif

if DARWIN
Expand Down Expand Up @@ -162,7 +161,7 @@ if BUILD_DSSI

dssidir = $(libdir)/dssi
noinst_LTLIBRARIES += amsynth_dssi.la
amsynth_dssi_la_SOURCES = src/dssi.cpp $(libcore_sources) $(libdsp_sources)
amsynth_dssi_la_SOURCES = src/amsynth_dssi.cpp src/amsynth_dssi.h $(libcore_sources) $(libdsp_sources)
amsynth_dssi_la_CPPFLAGS = $(AM_CPPFLAGS) @DSSI_CFLAGS@
amsynth_dssi_la_LDFLAGS = -rpath $(dssidir) -avoid-version -module -export-symbols-regex "dssi_descriptor" -disable-static

Expand All @@ -171,7 +170,7 @@ endif
if BUILD_DSSI_GUI

noinst_PROGRAMS = amsynth_dssi_gtk
amsynth_dssi_gtk_SOURCES = src/amsynth_dssi_gui.c $(libcore_sources) $(libgui_sources)
amsynth_dssi_gtk_SOURCES = src/amsynth_dssi_gtk.cpp $(libcore_sources) $(libgui_sources)
amsynth_dssi_gtk_CPPFLAGS = $(AM_CPPFLAGS) @DSSI_CFLAGS@ @GTK_CFLAGS@ @LIBLO_CFLAGS@
amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++

Expand All @@ -186,35 +185,41 @@ if BUILD_LV2

amsynth_lv2dir = $(libdir)/lv2/amsynth.lv2
noinst_LTLIBRARIES += amsynth_lv2.la
amsynth_lv2_la_SOURCES = src/amsynth_lv2.cpp $(libcore_sources) $(libdsp_sources) \
amsynth_lv2_la_SOURCES = src/amsynth_lv2.cpp src/amsynth_lv2.h $(libcore_sources) $(libdsp_sources) \
include/lv2/lv2plug.in/ns/lv2core/lv2.h \
include/lv2/lv2plug.in/ns/extensions/units/units.h \
include/lv2/lv2plug.in/ns/extensions/ui/ui.h \
include/lv2/lv2plug.in/ns/ext/worker/worker.h \
include/lv2/lv2plug.in/ns/ext/data-access/data-access.h \
include/lv2/lv2plug.in/ns/ext/event/event-helpers.h \
include/lv2/lv2plug.in/ns/ext/event/event.h \
include/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h \
include/lv2/lv2plug.in/ns/lv2core/lv2_util.h \
include/lv2/lv2plug.in/ns/ext/time/time.h \
include/lv2/lv2plug.in/ns/ext/patch/patch.h \
include/lv2/lv2plug.in/ns/ext/state/state.h \
include/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h \
include/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h \
include/lv2/lv2plug.in/ns/ext/port-props/port-props.h \
include/lv2/lv2plug.in/ns/ext/log/log.h \
include/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h \
include/lv2/lv2plug.in/ns/ext/parameters/parameters.h \
include/lv2/lv2plug.in/ns/ext/midi/midi.h \
include/lv2/lv2plug.in/ns/ext/presets/presets.h \
include/lv2/lv2plug.in/ns/ext/patch/patch.h \
include/lv2/lv2plug.in/ns/ext/event/event.h \
include/lv2/lv2plug.in/ns/ext/event/event-helpers.h \
include/lv2/lv2plug.in/ns/ext/options/options.h \
include/lv2/lv2plug.in/ns/ext/atom/atom.h \
include/lv2/lv2plug.in/ns/ext/atom/util.h \
include/lv2/lv2plug.in/ns/ext/atom/forge.h \
include/lv2/lv2plug.in/ns/ext/state/state.h \
include/lv2/lv2plug.in/ns/ext/port-props/port-props.h \
include/lv2/lv2plug.in/ns/ext/log/log.h \
include/lv2/lv2plug.in/ns/ext/log/logger.h \
include/lv2/lv2plug.in/ns/ext/morph/morph.h \
include/lv2/lv2plug.in/ns/ext/worker/worker.h \
include/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h \
include/lv2/lv2plug.in/ns/ext/presets/presets.h \
include/lv2/lv2plug.in/ns/ext/urid/urid.h \
include/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h
include/lv2/lv2plug.in/ns/ext/buf-size/buf-size.h \
include/lv2/lv2plug.in/ns/ext/data-access/data-access.h \
include/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h \
include/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h \
include/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h \
include/lv2/lv2plug.in/ns/extensions/ui/ui.h \
include/lv2/lv2plug.in/ns/extensions/units/units.h
amsynth_lv2_la_CPPFLAGS = $(AM_CPPFLAGS) -I"$(top_srcdir)/include" @LV2_CFLAGS@
amsynth_lv2_la_LDFLAGS = -rpath $(amsynth_lv2dir) -avoid-version -module -export-symbols-regex "lv2_descriptor" -disable-static

noinst_LTLIBRARIES += amsynth_lv2_gtk.la
amsynth_lv2_gtk_la_SOURCES = src/amsynth_lv2_ui_gtk.c $(libcore_sources) $(libgui_sources)
amsynth_lv2_gtk_la_SOURCES = src/amsynth_lv2_ui_gtk.cpp $(libcore_sources) $(libgui_sources)
amsynth_lv2_gtk_la_CPPFLAGS = $(AM_CPPFLAGS) -I"$(top_srcdir)/include" @LV2_CFLAGS@
amsynth_lv2_gtk_la_LDFLAGS = -rpath $(amsynth_lv2dir) -avoid-version -module -export-symbols-regex "lv2ui_descriptor" -disable-static
amsynth_lv2_gtk_la_LIBADD = @LV2_LIBS@
Expand All @@ -241,7 +246,8 @@ dist_amsynth_lv2_DATA = \
data/amsynth.lv2/BriansBank16.amSynth.bank.ttl \
data/amsynth.lv2/BriansBank17.amSynth.bank.ttl \
data/amsynth.lv2/BriansBank18.amSynth.bank.ttl \
data/amsynth.lv2/BriansBank19.amSynth.bank.ttl
data/amsynth.lv2/BriansBank19.amSynth.bank.ttl \
data/amsynth.lv2/BriansBank20.amSynth.bank.ttl

endif

Expand Down Expand Up @@ -341,7 +347,8 @@ dist_banks_DATA = \
data/banks/BriansBank16.amSynth.bank \
data/banks/BriansBank17.amSynth.bank \
data/banks/BriansBank18.amSynth.bank \
data/banks/BriansBank19.amSynth.bank
data/banks/BriansBank19.amSynth.bank \
data/banks/BriansBank20.amSynth.bank


#
Expand Down
8 changes: 8 additions & 0 deletions NEWS
View file
@@ -1,3 +1,11 @@
amsynth 1.8.0 -- 2017-06-25

- controls can now be reset to their default value via a double-click
- alternate tuning scales & keyboard maps can now be loaded in plug-ins
- fixed an issue where bank switching via MIDI caused jack zombification
- removed dependency on gtkmm (gtk is still required for the UI)


amsynth 1.7.1 -- 2017-03-15

- fixed MIDI channel filtering
Expand Down
12 changes: 0 additions & 12 deletions README
View file
Expand Up @@ -41,15 +41,3 @@ Any valid preset banks that are found in these directories will be show in the
drop-down bank selector on the GUI (standalone version only.)

Plug-in versions can load presets by right-clicking on the GUI's background.


Building on Fedora 23 / latest gtkmm
------------------------------------

The latest versions of gtkmm require C++11 support, but it is not enabled by
default in current versions of GCC.

If you encounter build errors relating to C++11 support, please configure
the build like so:

./configure CXXFLAGS='-std=c++11'
9 changes: 1 addition & 8 deletions configure.ac
View file
Expand Up @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl

AC_COPYRIGHT([Copyright (C) 2001-2015 Nick Dowell])
AC_INIT([amsynth], [git], [https://github.com/amsynth/amsynth/issues], [amsynth], [https://amsynth.github.io])
AC_INIT([amsynth], [1.8.0], [https://github.com/amsynth/amsynth/issues], [amsynth], [https://amsynth.github.io])
AC_CONFIG_SRCDIR([src/main.cc])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
Expand Down Expand Up @@ -60,12 +60,6 @@ AC_CHECK_LIB(pthread, pthread_create, [], exit)

AS_IF([test "x$with_gui" != "xno"],[PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0])])

dnl ## http://www.gtkmm.org/docs/gtkmm-2.4/docs/reference/html/newin2p6s.html
dnl ## we use the following APIs only available in gtkmm 2.6 and up:
dnl ## Gtk::MessageDialog::set_secondary_text()
dnl ## Gtk::AboutDialog
AS_IF([test "x$with_gui" != "xno"],[PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.6.0])])

dnl ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dnl
dnl Optional packages
Expand Down Expand Up @@ -189,7 +183,6 @@ echo -------------------------------------------------------- $PACKAGE $VERSION
echo \|
AS_IF([test "x$with_gui" != "xno"], [
echo \| GTK version........................................... : `pkg-config --modversion gtk+-2.0`
echo \| GTK-- version......................................... : `pkg-config --modversion gtkmm-2.4`
])
echo \| Build with GUI support................................ : $with_gui
echo \|
Expand Down

0 comments on commit c75ff5f

Please sign in to comment.