[beast/wip/soundfont: 832/832] Merge branch 'master' of github.com/tim-janik/beast into soundfont
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/wip/soundfont: 832/832] Merge branch 'master' of github.com/tim-janik/beast into soundfont
- Date: Sun, 6 Nov 2016 11:52:38 +0000 (UTC)
commit 52359e8c8ba47d925d4f34a83da150b78b41f6fb
Merge: cce2530 0ca67ca
Author: Tim Janik <timj gnu org>
Date: Sun Nov 6 11:22:15 2016 +0100
Merge branch 'master' of github.com/tim-janik/beast into soundfont
Synchronize with beast master so that patches against the newer codebase can be applied.
Signed-off-by: Tim Janik <timj gnu org>
.gitignore | 2 -
.travis.docker | 91 ------
.travis.yml | 40 +--
Makefile.am | 12 +-
acbeast.m4 | 39 ++-
autogen.sh | 4 +-
autotools/.gitignore | 12 -
beast-gtk/Makefile.am | 1 +
beast-gtk/bstapp.hh | 4 -
beast-gtk/bstasciipixbuf.hh | 8 -
beast-gtk/bstauxdialogs.hh | 4 -
beast-gtk/bstbseutils.hh | 3 -
beast-gtk/bstbuseditor.hh | 4 -
beast-gtk/bstbusmixer.hh | 4 -
beast-gtk/bstbusview.hh | 4 -
beast-gtk/bstcanvaslink.hh | 8 -
beast-gtk/bstcanvassource.hh | 4 -
beast-gtk/bstcluehunter.hh | 8 -
beast-gtk/bstdbmeter.hh | 4 -
beast-gtk/bstdefs.hh | 4 -
beast-gtk/bstdial.hh | 8 -
beast-gtk/bsteventroll.hh | 4 -
beast-gtk/bsteventrollctrl.cc | 2 +-
beast-gtk/bsteventrollctrl.hh | 4 -
beast-gtk/bstfiledialog.hh | 4 -
beast-gtk/bstgconfig.hh | 5 -
beast-gtk/bstgrowbar.hh | 4 -
beast-gtk/bstitemseqdialog.hh | 4 -
beast-gtk/bstitemview.hh | 4 -
beast-gtk/bstkeybindings.hh | 4 -
beast-gtk/bstknob.hh | 4 -
beast-gtk/bstlogadjustment.hh | 4 -
beast-gtk/bstmain.cc | 32 +-
beast-gtk/bstmenus.cc | 8 +-
beast-gtk/bstmenus.hh | 6 +-
beast-gtk/bstmsgabsorb.hh | 4 -
beast-gtk/bstparam.hh | 4 -
beast-gtk/bstparamview.hh | 4 -
beast-gtk/bstpartdialog.hh | 4 -
beast-gtk/bstpartview.hh | 4 -
beast-gtk/bstpatterncolumns.hh | 4 -
beast-gtk/bstpatternctrl.hh | 4 -
beast-gtk/bstpatternview.hh | 4 -
beast-gtk/bstpianoroll.hh | 4 -
beast-gtk/bstpianorollctrl.cc | 2 +-
beast-gtk/bstpianorollctrl.hh | 4 -
beast-gtk/bstplayback.hh | 8 -
beast-gtk/bstpreferences.hh | 4 -
beast-gtk/bstprocedure.hh | 4 -
beast-gtk/bstprofiler.hh | 4 -
beast-gtk/bstprojectctrl.hh | 4 -
beast-gtk/bstqsampler.hh | 4 -
beast-gtk/bstsampleeditor.hh | 8 -
beast-gtk/bstscrollgraph.hh | 4 -
beast-gtk/bstsegment.hh | 4 -
beast-gtk/bstsequence.hh | 8 -
beast-gtk/bstservermonitor.hh | 8 -
beast-gtk/bstskinconfig.hh | 4 -
beast-gtk/bstsnetrouter.hh | 4 -
beast-gtk/bstsnifferscope.hh | 4 -
beast-gtk/bstsplash.hh | 4 -
beast-gtk/bstsupershell.hh | 4 -
beast-gtk/bsttrackroll.hh | 4 -
beast-gtk/bsttrackrollctrl.cc | 2 +-
beast-gtk/bsttrackrollctrl.hh | 4 -
beast-gtk/bsttracksynthdialog.hh | 4 -
beast-gtk/bsttrackview.hh | 4 -
beast-gtk/bsttreestores.hh | 4 -
beast-gtk/bstusermessage.hh | 4 -
beast-gtk/bstutils.hh | 6 +-
beast-gtk/bstwaveeditor.cc | 4 +-
beast-gtk/bstwaveeditor.hh | 8 -
beast-gtk/bstwaveview.hh | 4 -
beast-gtk/bstxframe.hh | 8 -
beast-gtk/bstxkb.hh | 8 -
beast-gtk/bstzoomedwindow.hh | 8 -
beast-gtk/gxk/gxkaction.hh | 4 -
beast-gtk/gxk/gxkassortment.hh | 4 -
beast-gtk/gxk/gxkauxwidgets.hh | 4 -
beast-gtk/gxk/gxkcanvas.hh | 4 -
beast-gtk/gxk/gxkcellrendererpopup.hh | 4 -
beast-gtk/gxk/gxkdialog.hh | 4 -
beast-gtk/gxk/gxkglobals.hh | 4 -
beast-gtk/gxk/gxkimagecache.hh | 4 -
beast-gtk/gxk/gxkled.hh | 4 -
beast-gtk/gxk/gxklistwrapper.hh | 4 -
beast-gtk/gxk/gxklogadjustment.hh | 4 -
beast-gtk/gxk/gxkmenubutton.hh | 4 -
beast-gtk/gxk/gxknotebook.hh | 4 -
beast-gtk/gxk/gxkparam.hh | 4 -
beast-gtk/gxk/gxkpolygon.hh | 4 -
beast-gtk/gxk/gxkrackeditor.hh | 4 -
beast-gtk/gxk/gxkrackitem.hh | 4 -
beast-gtk/gxk/gxkracktable.hh | 4 -
beast-gtk/gxk/gxkradget.hh | 4 -
beast-gtk/gxk/gxkradgetfactory.hh | 4 -
beast-gtk/gxk/gxkscrollcanvas.hh | 4 -
beast-gtk/gxk/gxksimplelabel.hh | 4 -
beast-gtk/gxk/gxkspline.hh | 4 -
beast-gtk/gxk/gxkstatusbar.hh | 4 -
beast-gtk/gxk/gxkstock.hh | 4 -
beast-gtk/gxk/gxktexttools.hh | 4 -
beast-gtk/gxk/gxkutils.hh | 4 -
beast-gtk/testgui.cc | 2 +-
bse/Makefile.am | 23 +-
bse/bseapi.idl | 3 +
bse/bsebiquadfilter.hh | 8 -
bse/bseblockutils.cc | 18 +-
bse/bseblockutils.hh | 7 -
bse/bsebus.hh | 4 -
bse/bsecategories.hh | 4 -
bse/bsecompat.hh | 4 -
bse/bseconstant.hh | 7 -
bse/bseconstvalues.hh | 4 -
bse/bsecontainer.hh | 4 -
bse/bsecontextmerger.hh | 4 -
bse/bsecsynth.hh | 4 -
bse/bsecxxmodule.hh | 12 +-
bse/bsecxxplugin.hh | 3 -
bse/bsecxxutils.cc | 3 +-
bse/bsecxxutils.hh | 8 +-
bse/bsedatahandle-fir.cc | 6 +-
bse/bsedatahandle-resample.cc | 4 +-
bse/bsedefs.hh | 4 -
bse/bsedevice.hh | 4 -
bse/bseeditablesample.hh | 8 -
bse/bseengine.hh | 3 -
bse/bseenginemaster.hh | 3 -
bse/bseenginenode.hh | 4 -
bse/bseengineschedule.hh | 4 -
bse/bseengineutils.hh | 4 -
bse/bseenums.hh | 4 -
bse/bseexports.hh | 4 -
bse/bsefilter.cc | 4 -
bse/bsefilter.hh | 4 -
bse/bsegconfig.cc | 1 -
bse/bsegconfig.hh | 4 -
bse/bseglobals.hh | 4 -
bse/bseglue.hh | 4 -
bse/bseieee754.hh | 4 -
bse/bseinstrument.hh | 8 -
bse/bseinstrumentinput.hh | 3 -
bse/bseinstrumentoutput.hh | 4 -
bse/bseitem.hh | 4 -
bse/bsejanitor.hh | 4 -
bse/bseladspa.cc | 10 +-
bse/bseladspa.hh | 4 -
bse/bseladspamodule.hh | 4 -
bse/bseloader-flac.cc | 2 +-
bse/bseloader-guspatch.cc | 2 +-
bse/bseloader-mad.cc | 2 +-
bse/bseloader.hh | 4 -
bse/bsemain.hh | 4 -
bse/bsemath.hh | 4 -
bse/bsemathsignal.hh | 4 -
bse/bsemidicontroller.hh | 4 -
bse/bsemididecoder.hh | 4 -
bse/bsemididevice-null.hh | 3 -
bse/bsemididevice-oss.cc | 2 +-
bse/bsemididevice-oss.hh | 3 -
bse/bsemididevice.hh | 3 -
bse/bsemidievent.hh | 4 -
bse/bsemidifile.hh | 4 -
bse/bsemidiinput.hh | 4 -
bse/bsemidinotifier.hh | 4 -
bse/bsemidireceiver.cc | 5 +-
bse/bsemidireceiver.hh | 4 -
bse/bsemidisynth.hh | 4 -
bse/bsemidivoice.hh | 4 -
bse/bsenote.hh | 4 -
bse/bseobject.cc | 42 ++--
bse/bseobject.hh | 9 -
bse/bseparam.hh | 8 -
bse/bsepart.hh | 4 -
bse/bsepattern.hh | 8 -
bse/bsepcmdevice-null.hh | 3 -
bse/bsepcmdevice-oss.cc | 2 +-
bse/bsepcmdevice-oss.hh | 3 -
bse/bsepcmdevice.hh | 4 -
bse/bsepcminput.hh | 4 -
bse/bsepcmoutput.hh | 8 -
bse/bsepcmwriter.hh | 7 -
bse/bseplugin.cc | 90 ++----
bse/bseplugin.hh | 5 +-
bse/bseprobe.cc | 3 -
bse/bseprocedure.hh | 4 -
bse/bseproject.hh | 4 -
bse/bseresampler.hh | 3 -
bse/bsescripthelper.cc | 1 -
bse/bsescripthelper.hh | 8 -
bse/bseserver.cc | 6 +
bse/bseserver.hh | 9 +-
bse/bsesnet.hh | 4 -
bse/bsesnooper.hh | 3 -
bse/bsesong.hh | 4 -
bse/bsesource.hh | 4 -
bse/bsestandardosc.hh | 4 -
bse/bsestandardsynths.hh | 4 -
bse/bsestartup.cc | 2 +-
bse/bsestartup.hh | 1 +
bse/bsestorage.cc | 7 -
bse/bsestorage.hh | 6 -
bse/bsesubiport.hh | 4 -
bse/bsesuboport.hh | 4 -
bse/bsesubsynth.hh | 4 -
bse/bsesuper.hh | 4 -
bse/bsetrack.hh | 4 -
bse/bsetype.hh | 10 +-
bse/bseundostack.hh | 4 -
bse/bseutils.hh | 4 -
bse/bsewave.hh | 4 -
bse/bsewaveosc.hh | 4 -
bse/bsewaverepo.hh | 4 -
bse/gslcommon.cc | 5 +-
bse/gslcommon.hh | 6 +-
bse/gsldatacache.hh | 4 -
bse/gsldatahandle-mad.cc | 2 +-
bse/gsldatahandle-mad.hh | 4 -
bse/gsldatahandle-vorbis.cc | 2 +-
bse/gsldatahandle-vorbis.hh | 4 -
bse/gsldatahandle.hh | 4 -
bse/gsldatautils.hh | 4 -
bse/gsldefs.hh | 4 -
bse/gslfft.hh | 8 -
bse/gslfilehash.hh | 8 -
bse/gslfilter.hh | 8 -
bse/gslmagic.hh | 8 -
bse/gsloscillator.hh | 8 -
bse/gslosctable.hh | 4 -
bse/gslvorbis-cutter.hh | 4 -
bse/gslvorbis-enc.hh | 4 -
bse/gslwavechunk.hh | 4 -
bse/gslwaveosc.hh | 8 -
bse/ldscript.map | 9 +-
bse/mkcproc.pl | 4 +-
bse/mktypes.pl | 2 +-
bse/tests/Makefile.am | 2 +-
config/.gitignore | 18 +
{autotools => config}/glib-gettext.m4 | 0
{autotools => config}/intlfix-las.awk | 0
{autotools => config}/intlfix-scm.sed | 0
{autotools => config}/intlfix-xml.awk | 0
{autotools => config}/intltool-merge | 0
configure.ac | 390 +++++++++++------------
debian/patches/10-skip-update-mime.patch | 20 +-
drivers/Makefile.am | 2 +-
drivers/bse-portaudio/bsepcmdevice-portaudio.hh | 4 -
drivers/bsemididevice-alsa.cc | 1 -
drivers/bsemididevice-alsa.hh | 4 -
drivers/bsepcmdevice-alsa.cc | 1 -
drivers/bsepcmdevice-alsa.hh | 4 -
launchers/.gitignore | 1 -
launchers/Makefile.am | 1 -
launchers/beaststart.c | 2 +-
launchers/bseshstart.c | 39 ---
launchers/suidmain.c | 2 +-
misc/Dockerfile-apt.in | 139 ++++++++
misc/applyenv.sh | 20 ++
misc/bintrayup.sh | 46 +++
misc/dockerbuild.sh | 44 +++
misc/mkbuildid.sh | 56 ++++
plugins/Makefile.am | 145 +++++----
plugins/bseadder.hh | 8 -
plugins/bseatandistort.hh | 8 -
plugins/bsefirfilter.hh | 8 -
plugins/bseiirfilter.hh | 7 -
plugins/bsemixer.hh | 7 -
plugins/bsemult.hh | 8 -
plugins/bsesequencer.hh | 8 -
plugins/bsesimpleadsr.hh | 4 -
plugins/davcanyondelay.hh | 4 -
plugins/davguitar.hh | 7 -
plugins/davsyndrum.hh | 4 -
plugins/davxtalstrings.hh | 8 -
plugins/freeverb/Makefile.am | 2 +-
plugins/freeverb/bsefreeverb.hh | 4 -
plugins/freeverb/bsefreeverbcpp.cpp | 4 -
plugins/freeverb/bsefreeverbcpp.hh | 4 -
sfi/Makefile.am | 18 +-
sfi/glib-extra.cc | 2 +-
sfi/glib-extra.hh | 4 -
sfi/sficomport.hh | 4 -
sfi/sficomwire.hh | 8 -
sfi/sfifilecrawler.cc | 6 +-
sfi/sfifilecrawler.hh | 4 -
sfi/sfiglue.hh | 4 -
sfi/sfigluecodec.hh | 8 -
sfi/sfiglueproxy.hh | 4 -
sfi/sfimemory.hh | 3 -
sfi/sfinote.hh | 4 -
sfi/sfiparams.hh | 4 -
sfi/sfiprimitives.hh | 4 -
sfi/sfiring.hh | 4 -
sfi/sfiserial.hh | 4 -
sfi/sfistore.hh | 4 -
sfi/sfitime.hh | 4 -
sfi/sfitypes.hh | 4 -
sfi/sfiustore.hh | 4 -
sfi/sfivalues.hh | 4 -
sfi/sfivmarshal.hh | 4 -
sfi/sfiwrapper.cc | 14 -
sfi/sfiwrapper.hh | 9 -
sfi/tests/Makefile.am | 4 +-
shell/Makefile.am | 2 +-
shell/bsescm.cc | 4 +-
shell/bsescminterp.hh | 4 -
tests/Makefile.am | 2 +-
tests/bse/Makefile.am | 4 +-
tests/latency/Makefile.am | 2 +-
tests/latency/bselatencytest.cc | 2 +-
tools/Makefile.am | 6 +-
tools/bseloopfuncs.hh | 4 -
tools/bsewavetool.cc | 8 +-
tools/sfiutils.hh | 4 -
topbuildid.hh | 3 +
315 files changed, 829 insertions(+), 1807 deletions(-)
---
diff --cc beast-gtk/Makefile.am
index b95653f,546c010..4c5e380
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@@ -59,7 -58,7 +59,8 @@@ bst_cc_sources = $(strip
bstusermessage.cc bstdial.cc bsttracksynthdialog.cc bstwaveeditor.cc \
bstzoomedwindow.cc bstskinconfig.cc bstmsgabsorb.cc bstsampleeditor.cc \
bsttreestores.cc bstbseutils.cc bstutils.cc \
+ bstsoundfontview.cc bstsoundfontpresetview.cc \
+ ../topbuildid.cc \
)
# BEAST sources that get included (don't have own .lo rules)
beast_extra_files = $(strip \
diff --cc beast-gtk/bsttracksynthdialog.hh
index 655756e,8247e05..bba8cdb
--- a/beast-gtk/bsttracksynthdialog.hh
+++ b/beast-gtk/bsttracksynthdialog.hh
@@@ -4,10 -4,7 +4,8 @@@
#include "bstutils.hh"
#include "bstwaveview.hh"
+#include "bstsoundfontview.hh"
- G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_TRACK_SYNTH_DIALOG (bst_track_synth_dialog_get_type ())
@@@ -64,10 -57,8 +62,8 @@@ GtkWidget* bst_track_synth_dialog_popu
GxkFreeFunc selected_cleanup);
void bst_track_synth_dialog_set (BstTrackSynthDialog *self,
BseIt3mSeq *iseq,
- SfiProxy wrepo);
-
+ SfiProxy wrepo,
+ SfiProxy sfrepo);
- G_END_DECLS
-
#endif /* __BST_TRACK_SYNTH_DIALOG_H__ */
diff --cc configure.ac
index 9347ade,e25d8fc..358096a
--- a/configure.ac
+++ b/configure.ac
@@@ -264,18 -214,79 +214,80 @@@ AC_C_CONS
AC_C_INLINE
AC_HEADER_STDC
- # Checks for programs
- AC_PROG_INSTALL
- AC_PROG_LN_S
+ # == Linker flags ==
+ AM_LDFLAGS="$AM_LDFLAGS -lrt -pthread"
+ ld_help_text=`${LD-ld} --help 2>&1 | tr '\n' ' '`
+ check_ld_flags="-export-dynamic -O1 -Bsymbolic-functions --as-needed --no-undefined"
+ for flag in $check_ld_flags ; do
+ echo " $ld_help_text" | grep -q -e "$flag" && AM_LDFLAGS="$AM_LDFLAGS -Wl,$flag"
+ done
+ echo " $ld_help_text" | grep -q -e "--hash-style" && AM_LDFLAGS="$AM_LDFLAGS -Wl,--hash-style=both"
+ AC_SUBST(AM_LDFLAGS)
- # require pkg-config
- MC_ASSERT_PROG(PKG_CONFIG, pkg-config, [pkg-config can be found at
http://www.freedesktop.org/software/pkgconfig/])
+ # == ENABLE_DEVEL_MODE ==
+ # check for development build rules, which require acess to .git/
+ enable_devel_mode=0
+ if echo " $PACKAGE_VERSION" | grep -q '~wip' ; then
+ enable_devel_mode=1
+ fi
+ AC_DEFINE_UNQUOTED(ENABLE_DEVEL_MODE, $enable_devel_mode, [Add development aids to the build])
+ AM_CONDITIONAL(ENABLE_DEVEL_MODE, test x"$enable_devel_mode" = x1)
+ DEFINE__FILE_DIR__=
+ AC_SUBST(DEFINE__FILE_DIR__)
- # == Libraries ==
- # libz
- AC_CHECK_LIB(z, gzsetparams, [AC_CHECK_HEADER(zlib.h, LIBZ_LIBS='-lz', LIBZ='')], LIBZ='')
+ # == Utilities and build tools ==
+ AC_PROG_MAKE_SET()
+ AM_SILENT_RULES([yes])
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
+ MC_ASSERT_PROG(PKG_CONFIG, pkg-config)
+ MC_ASSERT_PROG(PANDOC, pandoc)
+ MC_ASSERT_PROG(DOXYGEN, doxygen)
+ MC_ASSERT_PROG(DOT, dot)
+ MC_ASSERT_PROG(PYTHON2, python-2.7 python2.7 python2)
+ MC_ASSERT_VERSION($PYTHON --version, 2.7)
+ MC_ASSERT_PROG(CYTHON, cython)
+ MC_ASSERT_VERSION($CYTHON --version, 0.20.1)
+ MC_ASSERT_PROG(XMLLINT, xmllint)
+ MC_ASSERT_VERSION($XMLLINT --version, 20901)
+
+ # == Headers ==
+ AC_CHECK_HEADERS_ONCE( zlib.h mad.h alsa/asoundlib.h sys/soundcard.h soundcard.h X11/XKBlib.h
X11/extensions/XKBgeom.h guile/gh.h libguile/properties.h )
+
+ # == pkg-config Libraries ==
+ # librapicorn dependencies
+ LIBBSE_REQUIRES="
+ glib-2.0 >= 2.32.3
+ gobject-2.0 >= 2.32.3
+ gthread-2.0 >= 2.32.3
+ gmodule-no-export-2.0 >= 2.32.3
+ rapicorn >= 16.0.1
+ ogg >= 1.2.2
+ vorbis >= 1.3.2
+ vorbisfile >= 1.3.2
+ vorbisenc >= 1.3.2
+ mad >= 0.14.2
+ flac >= 1.2.1
++ fluidsynth >= 1.0.6
+ alsa >= 1.0.5
+ pangoft2 >= 1.30.0
+ gtk+-2.0 >= 2.12.12
+ libart-2.0 >= 2.3.8
+ libgnomecanvas-2.0 >= 2.4.0
+ "
+ LIBBSE_REQUIRES=`echo $LIBBSE_REQUIRES` # strip whitespaces
+ AC_SUBST(LIBBSE_REQUIRES)
+ # define LIBBSE_CFLAGS and LIBBSE_LIBS
+ PKG_CHECK_MODULES(LIBBSE, [ $LIBBSE_REQUIRES ])
+ # for calling pthread_ functions, '-lpthread' is needed in addition to '-pthread'
+ LIBBSE_LIBS=`printf %s "$LIBBSE_LIBS" | sed 's/\(-pthread\b\)/\1 -lpthread/' `
+
+ # == libz ==
+ AC_CHECK_LIB(z, gzsetparams, [ LIBZ_LIBS='' ; test "$ac_cv_header_zlib_h" = yes && LIBZ_LIBS='-lz' ])
if test -z "$LIBZ_LIBS"; then
AC_MSG_ERROR([Compression library libz is missing, but required])
+ else
+ LIBBSE_LIBS="$LIBBSE_LIBS $LIBZ_LIBS"
fi
AC_SUBST(LIBZ_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
