mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-20 19:41:34 +01:00
audio/guitarix: Updated for version 0.35.1.
This commit is contained in:
B. Watson
Willy Sudiarto Raharjo
parent
a7c73bc5c8
commit
7993b5488b
8 changed files with 92 additions and 334 deletions
|
|
@ -4,15 +4,15 @@ distortion and a diversity of crazy sounds never heard before. Guitarix
|
|||
can be used as a standalone application, as LADSPA plugins, or as LV2
|
||||
plugins.
|
||||
|
||||
On 32 bit, a cpu with SSE instructions is required.
|
||||
For 32-bit x86, a CPU with SSE instructions is required. For other
|
||||
architectures, SSE will be used if available.
|
||||
|
||||
meterbridge is an optional runtime dependency.
|
||||
|
||||
Starting with version 0.34.0, guitarix can browse and download presets
|
||||
from the web, using the 'Online' button in the preset selector. To
|
||||
enable this feature, install webkitgtk before building guitarix. To
|
||||
disable this feature (even if webkitgtk is installed), set WEBKIT=no in
|
||||
the environment.
|
||||
enable this feature, install webkitgtk before building guitarix (it will
|
||||
be autodetected).
|
||||
|
||||
This package uses POSIX filesystem capabilities to execute with
|
||||
elevated privileges (required for realtime audio processing). This
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.\" Man page generated from reStructuredText.
|
||||
.
|
||||
.TH GUITARIX 1 "2015-05-14" "0.32.3" "SlackBuilds.org"
|
||||
.TH GUITARIX 1 "2016-08-06" "0.35.1" "SlackBuilds.org"
|
||||
.SH NAME
|
||||
guitarix \- guitar amp simulator and effects processor
|
||||
.
|
||||
|
|
@ -75,7 +75,7 @@ All parameters are optional. Examples:
|
|||
.nf
|
||||
.ft C
|
||||
guitarix
|
||||
guitarix \-r gx4\-black \-i system:capture_3
|
||||
guitarix \-r Guitarix_Oak \-i system:capture_3
|
||||
guitarix \-c \-o system:playback_1 \-o system:playback_2
|
||||
.ft P
|
||||
.fi
|
||||
|
|
@ -117,42 +117,42 @@ Show GTK+ Options
|
|||
.B \-c\fP,\fB \-\-clear
|
||||
Use \(aqdefault\(aq GTK style
|
||||
.TP
|
||||
.BI \-r\fP,\fB \-\-rcset\fB= STYLE
|
||||
Style to use, \(aqgx1\-alloy\(aq, \(aqgx2\-emerald\(aq, \(aqgx3\-dezert\(aq, \(aqgx4\-black\(aq, \(aqgx5\-gree\(aq, \(aqgx6\-blue\(aq, \(aqgx7\-blues\(aq, \(aqgx8\-dark\(aq, \(aqgx9\-flat\(aq, \(aqgx9\-grass\(aq
|
||||
.BI \-r\fP,\fB \-\-rcset\fB= <STYLE>
|
||||
Style to use, case\-sensitive, one of: \(aqBurl\(aq, \(aqCamouflage\(aq, \(aqCopper\(aq, \(aqDark\(aq, \(aqGrandma\(aq, \(aqGrungy_Sun\(aq, \(aqGrungy_Sun_Dark\(aq, \(aqGuitarix\(aq, \(aqGuitarix_Oak\(aq, \(aqHippie\(aq, \(aqLavender\(aq, \(aqNebula\(aq, \(aqOak\(aq, \(aqOlive\(aq, \(aqOrange\(aq, \(aqPlain_Dark\(aq, \(aqPsycedelic\(aq, \(aqSky\(aq, \(aqWhite_Oak\(aq
|
||||
.UNINDENT
|
||||
.TP
|
||||
.B JACK configuration options
|
||||
.INDENT 7.0
|
||||
.TP
|
||||
.BI \-i\fP,\fB \-\-jack\-input\fB= PORT
|
||||
.BI \-i\fP,\fB \-\-jack\-input\fB= <PORT>
|
||||
Guitarix JACK input
|
||||
.TP
|
||||
.BI \-o\fP,\fB \-\-jack\-output\fB= PORT
|
||||
.BI \-o\fP,\fB \-\-jack\-output\fB= <PORT>
|
||||
Guitarix JACK outputs
|
||||
.TP
|
||||
.BI \-m\fP,\fB \-\-jack\-midi\fB= PORT
|
||||
.BI \-m\fP,\fB \-\-jack\-midi\fB= <PORT>
|
||||
Guitarix JACK midi control
|
||||
.TP
|
||||
.B \-J\fP,\fB \-\-jack\-no\-conect
|
||||
dissable self\-connect JACK ports
|
||||
disable self\-connect JACK ports
|
||||
.TP
|
||||
.BI \-n\fP,\fB \-\-name\fB= NAME
|
||||
.BI \-n\fP,\fB \-\-name\fB= <NAME>
|
||||
instance name (default gx_head)
|
||||
.TP
|
||||
.BI \-U\fP,\fB \-\-jack\-uuid\fB= UUID
|
||||
.BI \-U\fP,\fB \-\-jack\-uuid\fB= <UUID>
|
||||
JackSession ID
|
||||
.TP
|
||||
.BI \-A\fP,\fB \-\-jack\-uuid2\fB= UUID2
|
||||
.BI \-A\fP,\fB \-\-jack\-uuid2\fB= <UUID2>
|
||||
JackSession ID
|
||||
.TP
|
||||
.BI \-s\fP,\fB \-\-server\-name\fB= NAME
|
||||
.BI \-s\fP,\fB \-\-server\-name\fB= <NAME>
|
||||
JACK server name to connect to
|
||||
.UNINDENT
|
||||
.TP
|
||||
.B Switch to bypass mode on overload condition
|
||||
.INDENT 7.0
|
||||
.TP
|
||||
.BI \-I\fP,\fB \-\-idle\-timeout\fB= SECONDS
|
||||
.BI \-I\fP,\fB \-\-idle\-timeout\fB= <SECONDS>
|
||||
starved idle thread probe (default: disabled)
|
||||
.TP
|
||||
.B \-C\fP,\fB \-\-no\-convolver\-overload
|
||||
|
|
@ -161,17 +161,17 @@ disable overload on convolver missed deadline
|
|||
.B \-X\fP,\fB \-\-xrun\-overload
|
||||
JACK xrun (default: false)
|
||||
.TP
|
||||
.BI \-S\fP,\fB \-\-sporadic\fB= SECONDS
|
||||
.BI \-S\fP,\fB \-\-sporadic\fB= <SECONDS>
|
||||
allow single overload events per interval (default: disabled)
|
||||
.UNINDENT
|
||||
.TP
|
||||
.B File options
|
||||
.INDENT 7.0
|
||||
.TP
|
||||
.BI \-f\fP,\fB \-\-load\-file\fB= FILE
|
||||
.BI \-f\fP,\fB \-\-load\-file\fB= <FILE>
|
||||
load state file on startup
|
||||
.TP
|
||||
.BI \-P\fP,\fB \-\-plugin\-dir\fB= DIR
|
||||
.BI \-P\fP,\fB \-\-plugin\-dir\fB= <DIR>
|
||||
directory with guitarix plugins (.so files)
|
||||
.TP
|
||||
.B \-K\fP,\fB \-\-disable\-save\-on\-exit
|
||||
|
|
@ -184,10 +184,10 @@ enable auto save (only in server mode)
|
|||
.B Debug options
|
||||
.INDENT 7.0
|
||||
.TP
|
||||
.BI \-B\fP,\fB \-\-builder\-dir\fB= DIR
|
||||
.BI \-B\fP,\fB \-\-builder\-dir\fB= <DIR>
|
||||
directory from which .glade files are loaded
|
||||
.TP
|
||||
.BI \-\-style\-dir\fB= DIR
|
||||
.BI \-\-style\-dir\fB= <DIR>
|
||||
directory with skin style definitions (.rc files)
|
||||
.TP
|
||||
.B \-t\fP,\fB \-\-log\-terminal
|
||||
|
|
@ -200,19 +200,19 @@ dump parameter table in json format
|
|||
.B GTK+ Options
|
||||
.INDENT 7.0
|
||||
.TP
|
||||
.BI \-\-class\fB= CLASS
|
||||
.BI \-\-class\fB= <CLASS>
|
||||
Program class as used by the window manager
|
||||
.TP
|
||||
.BI \-\-gtk\-name\fB= NAME
|
||||
.BI \-\-gtk\-name\fB= <NAME>
|
||||
Program name as used by the window manager
|
||||
.TP
|
||||
.BI \-\-screen\fB= SCREEN
|
||||
.BI \-\-screen\fB= <SCREEN>
|
||||
X screen to use
|
||||
.TP
|
||||
.B \-\-sync
|
||||
Make X calls synchronous
|
||||
.TP
|
||||
.BI \-\-gtk\-module\fB= MODULES
|
||||
.BI \-\-gtk\-module\fB= <MODULES>
|
||||
Load additional GTK+ modules
|
||||
.TP
|
||||
.B \-\-g\-fatal\-warnings
|
||||
|
|
@ -228,10 +228,10 @@ Print version string and exit
|
|||
.B \-N\fP,\fB \-\-nogui
|
||||
start without GUI
|
||||
.TP
|
||||
.BI \-p\fP,\fB \-\-rpcport\fB= PORT
|
||||
.BI \-p\fP,\fB \-\-rpcport\fB= <PORT>
|
||||
start a JSON\-RPC server listening on port PORT
|
||||
.TP
|
||||
.BI \-H\fP,\fB \-\-rpchost\fB= HOSTNAME
|
||||
.BI \-H\fP,\fB \-\-rpchost\fB= <HOSTNAME>
|
||||
set hostname to connect to
|
||||
.TP
|
||||
.B \-G\fP,\fB \-\-onlygui
|
||||
|
|
@ -243,7 +243,16 @@ start with Live Play GUI
|
|||
.B \-M\fP,\fB \-\-mute
|
||||
start with engine muted
|
||||
.TP
|
||||
.BI \-\-display\fB= DISPLAY
|
||||
.BI \-b\fP,\fB \-\-bank\fB= <BANK:PRESET>
|
||||
set bank and preset to load at startup (A:0\-Z:9)
|
||||
.TP
|
||||
.BI \-t\fP,\fB \-\-tuner_tet\fB= <TEMP>
|
||||
set tuner temperament at startup (12, 19, 24, 31, 53)
|
||||
.TP
|
||||
.BI \-F\fP,\fB \-\-reference_pitch\fB= <HZ>
|
||||
set tuner reference pitch at startup (225 \- 453)
|
||||
.TP
|
||||
.BI \-\-display\fB= <DISPLAY>
|
||||
X display to use
|
||||
.UNINDENT
|
||||
.UNINDENT
|
||||
|
|
|
|||
|
|
@ -45,17 +45,34 @@
|
|||
# Patch 0003-fix-build-even-for-gcc4.8.patch doesn't fix it, and there
|
||||
# are no further fixes upstream at this time.
|
||||
|
||||
# 20160806 bkw:
|
||||
# - Updated for 0.35.1
|
||||
# - removed WEBKIT=no option from README (it was removed from the
|
||||
# script in March, should have been removed from README then).
|
||||
# - removed webkitgtk from REQUIRES, as it's now optional (and
|
||||
# autodetected, no way to force-disable it).
|
||||
# - removed patches, since they're already included in the new release.
|
||||
# - remove unimplemented SSE=no option. Note that SSE support is still
|
||||
# autodetected, so if someone's trying this on e.g. ARCH=arm, it should
|
||||
# automatically build without SSE (I have no idea if the build will
|
||||
# actually complete, in that case).
|
||||
# - remove .desktop sed stuff, upstream fixed it.
|
||||
# - update man page.
|
||||
# - note: zita-convolver and zita-resampler are not requirements. they
|
||||
# will be linked if installed, otherwise guitarix's bundled copies will
|
||||
# be used. I only mention this here so I won't forget again...
|
||||
|
||||
# Modified version released under the WTFPL, for details see
|
||||
# http://www.wtfpl.net/txt/copying/
|
||||
|
||||
PRGNAM=guitarix
|
||||
VERSION=${VERSION:-0.34.0}
|
||||
VERSION=${VERSION:-0.35.1}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
case "$( uname -m )" in
|
||||
i?86) ARCH=i486 ;;
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) ARCH=arm ;;
|
||||
*) ARCH=$( uname -m ) ;;
|
||||
esac
|
||||
|
|
@ -66,8 +83,8 @@ TMP=${TMP:-/tmp/SBo}
|
|||
PKG=$TMP/package-$PRGNAM
|
||||
OUTPUT=${OUTPUT:-/tmp}
|
||||
|
||||
if [ "$ARCH" = "i486" ]; then
|
||||
SLKCFLAGS="-O2 -march=i486 -mtune=i686 -msse"
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686 -msse"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686 -mtune=i686 -msse"
|
||||
|
|
@ -90,7 +107,7 @@ rm -rf $PKG
|
|||
mkdir -p $TMP $PKG $OUTPUT
|
||||
cd $TMP
|
||||
rm -rf $PRGNAM-$VERSION
|
||||
tar xvf $CWD/$TARNAME-$VERSION.tar.bz2
|
||||
tar xvf $CWD/$TARNAME-$VERSION.tar.xz
|
||||
cd $PRGNAM-$VERSION
|
||||
chown -R root:root .
|
||||
find -L . \
|
||||
|
|
@ -99,27 +116,11 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# Confusing freedesktop.org standard is confusing.
|
||||
# To pass desktop-file-validate, we need both Audio and AudioVideo, even
|
||||
# though the wording of the error message is 'requires another category to
|
||||
# be present among', implying we should only need Audio *or* AudioVideo.
|
||||
sed -i '/^Categories/s,$,Audio;,;' $PRGNAM.desktop.in
|
||||
|
||||
# this is no longer documented in README, but still here for debugging.
|
||||
if [ "${LV2:-yes}" = "no" ]; then
|
||||
LV2OPT=--no-lv2
|
||||
fi
|
||||
|
||||
# patches are optional (undocumented in README, on purpose)
|
||||
if [ "${PATCH:-no}" = "yes" ]; then
|
||||
for patch in $CWD/patches/*.patch; do
|
||||
patch -p2 < "$patch"
|
||||
done
|
||||
fi
|
||||
|
||||
# Disallow building non-SSE package
|
||||
[ "${SSE:-yes}" = "no" ] && echo "Building a non-SSE package is not supported." && exit 1
|
||||
|
||||
LIBDIR="/usr/lib${LIBDIRSUFFIX}"
|
||||
./waf configure \
|
||||
--prefix=/usr \
|
||||
|
|
@ -139,8 +140,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
|
|||
# Shared libraries are supposed to be +x.
|
||||
chmod 755 $PKG/$LIBDIR/libgx*.so.?.?
|
||||
|
||||
# Man page written for this SlackBuild. It's for guitarix-0.32.3, but
|
||||
# the command line options haven't changed since then.
|
||||
# Man page written for this SlackBuild, see guitarix.rst.
|
||||
mkdir -p $PKG/usr/man/man1
|
||||
gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
PRGNAM="guitarix"
|
||||
VERSION="0.34.0"
|
||||
VERSION="0.35.1"
|
||||
HOMEPAGE="http://guitarix.sourceforge.net/"
|
||||
DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.34.0.tar.bz2"
|
||||
MD5SUM="0ac5f18ee738d535b1551ea68ac2fce9"
|
||||
DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.35.1.tar.xz"
|
||||
MD5SUM="fb7269fe6fdde4c493be65f974819bb4"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="jack-audio-connection-kit liblrdf lilv webkitgtk"
|
||||
REQUIRES="jack-audio-connection-kit liblrdf lilv"
|
||||
MAINTAINER="B. Watson"
|
||||
EMAIL="yalhcru@gmail.com"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
.. rst2man.py guitarix.rst > guitarix.1
|
||||
.. rst2man.py comes from the SBo development/docutils package.
|
||||
|
||||
.. |version| replace:: 0.32.3
|
||||
.. |version| replace:: 0.35.1
|
||||
.. |date| date::
|
||||
|
||||
.. converting from pod:
|
||||
|
|
@ -56,7 +56,7 @@ OPTIONS
|
|||
All parameters are optional. Examples::
|
||||
|
||||
guitarix
|
||||
guitarix -r gx4-black -i system:capture_3
|
||||
guitarix -r Guitarix_Oak -i system:capture_3
|
||||
guitarix -c -o system:playback_1 -o system:playback_2
|
||||
|
||||
Help Options:
|
||||
|
|
@ -71,51 +71,53 @@ Help Options:
|
|||
|
||||
GTK style configuration options
|
||||
-c, --clear Use 'default' GTK style
|
||||
-r, --rcset=STYLE Style to use, 'gx1-alloy', 'gx2-emerald', 'gx3-dezert', 'gx4-black', 'gx5-gree', 'gx6-blue', 'gx7-blues', 'gx8-dark', 'gx9-flat', 'gx9-grass'
|
||||
-r, --rcset=<STYLE> Style to use, case-sensitive, one of: 'Burl', 'Camouflage', 'Copper', 'Dark', 'Grandma', 'Grungy_Sun', 'Grungy_Sun_Dark', 'Guitarix', 'Guitarix_Oak', 'Hippie', 'Lavender', 'Nebula', 'Oak', 'Olive', 'Orange', 'Plain_Dark', 'Psycedelic', 'Sky', 'White_Oak'
|
||||
|
||||
JACK configuration options
|
||||
-i, --jack-input=PORT Guitarix JACK input
|
||||
-o, --jack-output=PORT Guitarix JACK outputs
|
||||
-m, --jack-midi=PORT Guitarix JACK midi control
|
||||
-J, --jack-no-conect dissable self-connect JACK ports
|
||||
-n, --name=NAME instance name (default gx_head)
|
||||
-U, --jack-uuid=UUID JackSession ID
|
||||
-A, --jack-uuid2=UUID2 JackSession ID
|
||||
-s, --server-name=NAME JACK server name to connect to
|
||||
-i, --jack-input=<PORT> Guitarix JACK input
|
||||
-o, --jack-output=<PORT> Guitarix JACK outputs
|
||||
-m, --jack-midi=<PORT> Guitarix JACK midi control
|
||||
-J, --jack-no-conect disable self-connect JACK ports
|
||||
-n, --name=<NAME> instance name (default gx_head)
|
||||
-U, --jack-uuid=<UUID> JackSession ID
|
||||
-A, --jack-uuid2=<UUID2> JackSession ID
|
||||
-s, --server-name=<NAME> JACK server name to connect to
|
||||
|
||||
Switch to bypass mode on overload condition
|
||||
-I, --idle-timeout=SECONDS starved idle thread probe (default: disabled)
|
||||
-I, --idle-timeout=<SECONDS> starved idle thread probe (default: disabled)
|
||||
-C, --no-convolver-overload disable overload on convolver missed deadline
|
||||
-X, --xrun-overload JACK xrun (default: false)
|
||||
-S, --sporadic=SECONDS allow single overload events per interval (default: disabled)
|
||||
-S, --sporadic=<SECONDS> allow single overload events per interval (default: disabled)
|
||||
|
||||
File options
|
||||
-f, --load-file=FILE load state file on startup
|
||||
-P, --plugin-dir=DIR directory with guitarix plugins (.so files)
|
||||
-f, --load-file=<FILE> load state file on startup
|
||||
-P, --plugin-dir=<DIR> directory with guitarix plugins (.so files)
|
||||
-K, --disable-save-on-exit disable auto save to state file when quit
|
||||
-a, --auto-save enable auto save (only in server mode)
|
||||
|
||||
Debug options
|
||||
-B, --builder-dir=DIR directory from which .glade files are loaded
|
||||
--style-dir=DIR directory with skin style definitions (.rc files)
|
||||
-B, --builder-dir=<DIR> directory from which .glade files are loaded
|
||||
--style-dir=<DIR> directory with skin style definitions (.rc files)
|
||||
-t, --log-terminal print log on terminal
|
||||
-d, --dump-parameter dump parameter table in json format
|
||||
|
||||
GTK+ Options
|
||||
--class=CLASS Program class as used by the window manager
|
||||
--gtk-name=NAME Program name as used by the window manager
|
||||
--screen=SCREEN X screen to use
|
||||
--class=<CLASS> Program class as used by the window manager
|
||||
--gtk-name=<NAME> Program name as used by the window manager
|
||||
--screen=<SCREEN> X screen to use
|
||||
--sync Make X calls synchronous
|
||||
--gtk-module=MODULES Load additional GTK+ modules
|
||||
--gtk-module=<MODULES> Load additional GTK+ modules
|
||||
--g-fatal-warnings Make all warnings fatal
|
||||
|
||||
Application Options:
|
||||
-v, --version Print version string and exit
|
||||
-N, --nogui start without GUI
|
||||
-p, --rpcport=PORT start a JSON-RPC server listening on port PORT
|
||||
-H, --rpchost=HOSTNAME set hostname to connect to
|
||||
-p, --rpcport=<PORT> start a JSON-RPC server listening on port PORT
|
||||
-H, --rpchost=<HOSTNAME> set hostname to connect to
|
||||
-G, --onlygui start only GUI
|
||||
-L, --liveplaygui start with Live Play GUI
|
||||
-M, --mute start with engine muted
|
||||
--display=DISPLAY X display to use
|
||||
|
||||
-b, --bank=<BANK:PRESET> set bank and preset to load at startup (A:0-Z:9)
|
||||
-t, --tuner_tet=<TEMP> set tuner temperament at startup (12, 19, 24, 31, 53)
|
||||
-F, --reference_pitch=<HZ> set tuner reference pitch at startup (225 - 453)
|
||||
--display=<DISPLAY> X display to use
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From c929d5872b81214e7aef3fc82bc178b427dc30f8 Mon Sep 17 00:00:00 2001
|
||||
From: Hermann Meyer <brummer-@web.de>
|
||||
Date: Mon, 9 Nov 2015 06:57:27 +0100
|
||||
Subject: [PATCH 1/3] * fix Issue switching presets with midi messages
|
||||
reported by eduardomezencio
|
||||
|
||||
---
|
||||
trunk/src/gx_head/engine/gx_paramtable.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/trunk/src/gx_head/engine/gx_paramtable.cpp b/trunk/src/gx_head/engine/gx_paramtable.cpp
|
||||
index b82fe93..4ef2851 100644
|
||||
--- a/trunk/src/gx_head/engine/gx_paramtable.cpp
|
||||
+++ b/trunk/src/gx_head/engine/gx_paramtable.cpp
|
||||
@@ -505,7 +505,7 @@ void MidiControllerList::on_pgm_chg() {
|
||||
do {
|
||||
pgm = gx_system::atomic_get(program_change);
|
||||
} while (!gx_system::atomic_compare_and_exchange(&program_change, pgm, -1));
|
||||
- new_program(pgm);
|
||||
+ if (pgm>=0) new_program(pgm);
|
||||
}
|
||||
|
||||
void MidiControllerList::on_mute_chg() {
|
||||
@@ -521,7 +521,7 @@ void MidiControllerList::on_bank_chg() {
|
||||
do {
|
||||
bk = gx_system::atomic_get(bank_change);
|
||||
} while (!gx_system::atomic_compare_and_exchange(&bank_change, bk, -1));
|
||||
- new_bank(bk);
|
||||
+ if (bk>=0) new_bank(bk);
|
||||
}
|
||||
|
||||
void MidiControllerList::set_config_mode(bool mode, int ctl) {
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
From 6b161fa314ee5948a7ebde5d4320d669041e831e Mon Sep 17 00:00:00 2001
|
||||
From: Hermann Meyer <brummer-@web.de>
|
||||
Date: Mon, 9 Nov 2015 09:46:54 +0100
|
||||
Subject: [PATCH 2/3] * set wscript to versio 0.34.0git * make webkit
|
||||
optional * add filebrowser for upload preset banks
|
||||
|
||||
---
|
||||
trunk/src/gx_head/gui/gx_preset_window.cpp | 34 +++++++++++++++++++++++++++++-
|
||||
trunk/src/headers/gx_preset_window.h | 8 ++++++-
|
||||
trunk/wscript | 5 +++--
|
||||
3 files changed, 43 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/trunk/src/gx_head/gui/gx_preset_window.cpp b/trunk/src/gx_head/gui/gx_preset_window.cpp
|
||||
index ead8c93..1050a9d 100644
|
||||
--- a/trunk/src/gx_head/gui/gx_preset_window.cpp
|
||||
+++ b/trunk/src/gx_head/gui/gx_preset_window.cpp
|
||||
@@ -81,10 +81,13 @@ PresetWindow::PresetWindow(Glib::RefPtr<gx_gui::GxBuilder> bld, gx_engine::GxMac
|
||||
//actiongroup->add(act, sigc::mem_fun(*this, &PresetWindow::on_presets_close));
|
||||
//gtk_activatable_set_related_action(GTK_ACTIVATABLE(close_preset->gobj()), act->gobj());
|
||||
close_preset->hide(); // disable (maybe remove later)
|
||||
+#ifdef HAVE_WEBKIT
|
||||
actions.online_preset_bank = Gtk::Action::create("OnlineBank");
|
||||
actions.group->add(actions.online_preset_bank, sigc::mem_fun(*this, &PresetWindow::on_online_preset));
|
||||
gtk_activatable_set_related_action(GTK_ACTIVATABLE(online_preset->gobj()), actions.online_preset_bank->gobj());
|
||||
-
|
||||
+#else
|
||||
+ online_preset->set_sensitive(false);
|
||||
+#endif
|
||||
bank_treeview->set_model(Gtk::ListStore::create(bank_col));
|
||||
bank_treeview->set_name("PresetView");
|
||||
bank_treeview->get_selection()->set_select_function(
|
||||
@@ -686,6 +689,7 @@ void PresetWindow::on_new_bank() {
|
||||
start_edit(m->get_path(edit_iter), *bank_treeview->get_column(1), *bank_cellrenderer);
|
||||
}
|
||||
|
||||
+#ifdef HAVE_WEBKIT
|
||||
|
||||
bool PresetWindow::insertRequested(const char *ur, gpointer data)
|
||||
{
|
||||
@@ -748,6 +752,31 @@ bool PresetWindow::downloadRequested(WebKitWebView* webView, WebKitDownload *dow
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+bool PresetWindow::uploadRequested(WebKitWebView* webView, WebKitFileChooserRequest *request,gpointer data )
|
||||
+{
|
||||
+ Gtk::FileChooserDialog d( "Select upload file");
|
||||
+ d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
|
||||
+ d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
|
||||
+ d.add_shortcut_folder(string(getenv("HOME")) + string("/.config/guitarix/bamks"));
|
||||
+ Gtk::FileFilter banks;
|
||||
+ banks.set_name("Bank Files");
|
||||
+ banks.add_pattern("*.gx");
|
||||
+ d.add_filter(banks);
|
||||
+ Gtk::FileFilter all;
|
||||
+ all.add_pattern("*");
|
||||
+ all.set_name("All Files");
|
||||
+ d.add_filter(all);
|
||||
+ d.set_current_folder(string(getenv("HOME")) + string("/.config/guitarix/banks"));
|
||||
+
|
||||
+ if (d.run() != Gtk::RESPONSE_OK) {
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ Glib::ustring filename = d.get_filename();
|
||||
+ const gchar* f[2] = {filename.c_str(),0};
|
||||
+ webkit_file_chooser_request_select_files (request, f);
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
void PresetWindow::show_online_preset() {
|
||||
|
||||
Gtk::Window *window = new Gtk::Window();
|
||||
@@ -760,6 +789,7 @@ void PresetWindow::show_online_preset() {
|
||||
window->add(*Gtk::manage(scrollbox));
|
||||
webkit_web_view_load_uri(web_view, "https://musical-artifacts.com/?apps=guitarix");
|
||||
g_signal_connect(G_OBJECT (web_view), "download-requested", G_CALLBACK(downloadRequested), this);
|
||||
+ g_signal_connect(G_OBJECT (web_view), "run-file-chooser", G_CALLBACK(uploadRequested), this);
|
||||
window->show_all();
|
||||
}
|
||||
|
||||
@@ -767,6 +797,8 @@ void PresetWindow::on_online_preset() {
|
||||
Glib::signal_idle().connect_once(sigc::mem_fun(*this, &PresetWindow::show_online_preset));
|
||||
}
|
||||
|
||||
+#endif
|
||||
+
|
||||
bool PresetWindow::on_bank_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint timestamp) {
|
||||
Gtk::Widget *source_widget = Gtk::Widget::drag_get_source_widget(context);
|
||||
if (!source_widget) {
|
||||
diff --git a/trunk/src/headers/gx_preset_window.h b/trunk/src/headers/gx_preset_window.h
|
||||
index a009670..48a9801 100644
|
||||
--- a/trunk/src/headers/gx_preset_window.h
|
||||
+++ b/trunk/src/headers/gx_preset_window.h
|
||||
@@ -24,7 +24,10 @@
|
||||
/****************************************************************
|
||||
** class PresetWindow
|
||||
*/
|
||||
+
|
||||
+#ifdef HAVE_WEBKIT
|
||||
#include <webkit/webkit.h>
|
||||
+#endif
|
||||
|
||||
class PresetStore: public Gtk::ListStore {
|
||||
public:
|
||||
@@ -141,12 +144,15 @@ private:
|
||||
bool is_row_separator(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);
|
||||
void on_new_bank();
|
||||
void on_preset_save();
|
||||
+ const std::string pdir() { return options.get_preset_dir();}
|
||||
+#ifdef HAVE_WEBKIT
|
||||
void on_online_preset();
|
||||
void show_online_preset();
|
||||
- const std::string pdir() { return options.get_preset_dir();}
|
||||
static bool downloadRequested(WebKitWebView* webView, WebKitDownload *download,gpointer data );
|
||||
+ static bool uploadRequested(WebKitWebView* webView, WebKitFileChooserRequest *request,gpointer data );
|
||||
static bool insertRequested(const char* uri, gpointer data );
|
||||
static void download_status(GObject* object, GParamSpec* pspec, gpointer data);
|
||||
+#endif
|
||||
bool on_bank_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint timestamp);
|
||||
void on_bank_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint timestamp);
|
||||
void on_bank_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, Gtk::SelectionData& selection, int info, int timestamp);
|
||||
diff --git a/trunk/wscript b/trunk/wscript
|
||||
index 9c0e41b..99cab29 100644
|
||||
--- a/trunk/wscript
|
||||
+++ b/trunk/wscript
|
||||
@@ -24,7 +24,7 @@ blddir = 'build'
|
||||
use_2to3 = True
|
||||
|
||||
# used by waf dist and waf build
|
||||
-VERSION='0.34.0'
|
||||
+VERSION='0.34.0git'
|
||||
APPNAME='guitarix'
|
||||
|
||||
good_faust_versions = ['0.9.58','0.9.65']
|
||||
@@ -649,7 +649,7 @@ def configure(conf):
|
||||
conf.check_cfg(package='lrdf', args='--cflags --libs', uselib_store='LRDF', mandatory=1)
|
||||
conf.check(header_name='ladspa.h', mandatory=1)
|
||||
conf.check_cfg(package='lilv-0', args='--cflags --libs', uselib_store='LILV', mandatory=1)
|
||||
- conf.check_cfg(package='webkit-1.0', args='--cflags --libs', uselib_store='WEBKIT', mandatory=1)
|
||||
+ conf.check_cfg(package='webkit-1.0', args='--cflags --libs', uselib_store='WEBKIT', mandatory=0, define_name='HAVE_WEBKIT')
|
||||
check_boost(conf)
|
||||
conf.check_cfg(package='lv2', atleast_version='1.2.0',args='--cflags --libs', uselib_store='LV2CORE', mandatory=1)
|
||||
|
||||
@@ -811,6 +811,7 @@ def configure(conf):
|
||||
display_feature("Use prebuild gperf files", not conf.env["HAVE_GPERF"])
|
||||
display_feature("Avahi service discovery", conf.env["HAVE_AVAHI"])
|
||||
display_feature("Bluetooth rfcomm", conf.env["HAVE_BLUEZ"])
|
||||
+ display_feature("Use Webkit", conf.env["HAVE_WEBKIT"])
|
||||
display_feature("Use internal zita-resampler", not conf.env['ZITA_RESAMPLER'])
|
||||
if conf.env['CONVOLVER_FFMPEG']:
|
||||
display_feature("Use zita-convolver-ffmpeg", True)
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
From 995a692e807a5812a356d08d4d4adb1d72e67a7d Mon Sep 17 00:00:00 2001
|
||||
From: Hermann Meyer <brummer-@web.de>
|
||||
Date: Mon, 9 Nov 2015 13:06:45 +0100
|
||||
Subject: [PATCH 3/3] * fix build even for gcc4.8
|
||||
|
||||
---
|
||||
trunk/src/LV2/DSP/gx_common.h | 4 ++--
|
||||
trunk/src/headers/gx_system.h | 6 +++---
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/trunk/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h
|
||||
index 0a3e44b..282c765 100644
|
||||
--- a/trunk/src/LV2/DSP/gx_common.h
|
||||
+++ b/trunk/src/LV2/DSP/gx_common.h
|
||||
@@ -35,7 +35,7 @@
|
||||
/* On Intel set FZ (Flush to Zero) and DAZ (Denormals Are Zero)
|
||||
flags to avoid costly denormals */
|
||||
#ifdef __SSE3__
|
||||
-#ifndef _X86INTRIN_H_INCLUDED
|
||||
+#ifndef _PMMINTRIN_H_INCLUDED
|
||||
#include <pmmintrin.h>
|
||||
#endif //ndef
|
||||
inline void AVOIDDENORMALS()
|
||||
@@ -44,7 +44,7 @@ inline void AVOIDDENORMALS()
|
||||
_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
|
||||
}
|
||||
#else
|
||||
-#ifndef _X86INTRIN_H_INCLUDED
|
||||
+#ifndef _XMMINTRIN_H_INCLUDED
|
||||
#include <xmmintrin.h>
|
||||
#endif //ndef
|
||||
inline void AVOIDDENORMALS()
|
||||
diff --git a/trunk/src/headers/gx_system.h b/trunk/src/headers/gx_system.h
|
||||
index 7bf35f8..abf1e06 100644
|
||||
--- a/trunk/src/headers/gx_system.h
|
||||
+++ b/trunk/src/headers/gx_system.h
|
||||
@@ -51,7 +51,7 @@ inline unsigned int get_fpu_status_bits() {
|
||||
/* On Intel set FZ (Flush to Zero) and DAZ (Denormals Are Zero)
|
||||
flags to avoid costly denormals */
|
||||
#ifdef __SSE3__
|
||||
-#ifndef _X86INTRIN_H_INCLUDED
|
||||
+#ifndef _PMMINTRIN_H_INCLUDED
|
||||
#include <pmmintrin.h>
|
||||
#endif //ndef
|
||||
inline void AVOIDDENORMALS() {
|
||||
@@ -59,14 +59,14 @@ inline void AVOIDDENORMALS() {
|
||||
_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
|
||||
}
|
||||
#else
|
||||
-#ifndef _X86INTRIN_H_INCLUDED
|
||||
+#ifndef _XMMINTRIN_H_INCLUDED
|
||||
#include <xmmintrin.h>
|
||||
#endif //ndef
|
||||
inline void AVOIDDENORMALS() { _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); }
|
||||
#endif //__SSE3__
|
||||
|
||||
#else
|
||||
-#ifndef _X86INTRIN_H_INCLUDED
|
||||
+#ifndef _XMMINTRIN_H_INCLUDED
|
||||
inline void _MM_SET_EXCEPTION_STATE(unsigned int __mask) {}
|
||||
inline unsigned int _MM_GET_EXCEPTION_STATE(void) { return 0; }
|
||||
#endif //ndef
|
||||
--
|
||||
1.8.4
|
||||
|
||||
Loading…
Reference in a new issue