Commit a488a657 authored by Jaromír Mikeš's avatar Jaromír Mikeš

Imported Upstream version 20160825

parent 101d2a40
......@@ -27,13 +27,13 @@ APPBLD = x42/
###############################################################################
LOADLIBES=-lm
LV2NAME=fat1
LV2GUI=fat1UI_gl
BUNDLE=fat1.lv2
targets=
STRIPFLAGS=-s
LOADLIBES=-lm
LV2UIREQ=
GLUICFLAGS=-I.
ifneq ($(MOD),)
......@@ -111,6 +111,7 @@ endif
LV2VERSION=$(fat1_VERSION)
include git2lv2.mk
###############################################################################
# check for build-dependencies
ifeq ($(shell pkg-config --exists lv2 || echo no), no)
$(error "LV2 SDK was not found")
......@@ -188,7 +189,7 @@ GLUILIBS+=$(LIC_LOADLIBES)
ifneq ($(LIC_CFLAGS),)
SIGNATURE=lv2:extensionData <http:\\/\\/harrisonconsoles.com\\/lv2\\/license\#interface>\\;
SIGNATURE=lv2:extensionData <http:\\/\\/harrisonconsoles.com\\/lv2\\/license\#interface>\\;
override CXXFLAGS += -I$(RW)
endif
......@@ -199,6 +200,7 @@ JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) $(LOADLIBES)
###############################################################################
# build target definitions
default: all
......
......@@ -106,7 +106,7 @@ const struct CtrlRange ctrl_range[] = {
};
static const char* tooltips[] = {
"<markup><b>Tuning.</b> This sets the frequency correponding to 'A'\n"
"<markup><b>Tuning.</b> This sets the frequency corresponding to 'A'\n"
"(440 Hz in most cases). The exact value is displayed when\n"
"this control is touched, and can be set in steps of 0.2 Hz.\n</markup>",
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-FAT1 "1" "August 2016" "x42-fat1 version 0.3.0" "User Commands"
.TH X42-FAT1 "1" "August 2016" "x42-fat1 version 0.3.1" "User Commands"
.SH NAME
x42-fat1 \- x42 JACK Auto Tune
.SH SYNOPSIS
......
......@@ -27,13 +27,13 @@ APPBLD = x42/
###############################################################################
LOADLIBES=-lm
LV2NAME=fil4
LV2GUI=fil4UI_gl
BUNDLE=fil4.lv2
targets=
STRIPFLAGS=-s
LOADLIBES=-lm
LV2UIREQ=
GLUICFLAGS=-I.
ifneq ($(MOD),)
......@@ -114,6 +114,7 @@ endif
LV2VERSION=$(fil4_VERSION)
include git2lv2.mk
###############################################################################
# check for build-dependencies
ifeq ($(shell pkg-config --exists lv2 || echo no), no)
$(error "LV2 SDK was not found")
......@@ -141,7 +142,6 @@ ifneq ($(BUILDJACKAPP), no)
JACKAPP=$(APPBLD)x42-fil4$(EXE_EXT)
endif
# check for lv2_atom_forge_object new in 1.8.1 deprecates lv2_atom_forge_blank
ifeq ($(shell pkg-config --atleast-version=1.8.1 lv2 && echo yes), yes)
override CXXFLAGS += -DHAVE_LV2_1_8
......@@ -210,9 +210,10 @@ ROBGL+= Makefile
JACKCFLAGS=-I. $(CXXFLAGS) $(LIC_CFLAGS)
JACKCFLAGS+=`pkg-config --cflags jack lv2 pango pangocairo $(PKG_GL_LIBS)`
JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES)
JACKLIBS=-lm $(GLUILIBS) $(LIC_LOADLIBES) $(LOADLIBES)
###############################################################################
# build target definitions
default: all
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-FIL4 "1" "August 2016" "x42-fil4 version 0.5.2" "User Commands"
.TH X42-FIL4 "1" "August 2016" "x42-fil4 version 0.5.3" "User Commands"
.SH NAME
x42-fil4 \- x42 JACK Parametric Equalizer
.SH SYNOPSIS
......
export balance_VERSION=0.6.5
export controlfilter_VERSION=0.3.1
export convoLV2_VERSION=0.5.2
export fat1_VERSION=0.3.0
export fil4_VERSION=0.5.2
export fat1_VERSION=0.3.1
export fil4_VERSION=0.5.3
export meters_VERSION=0.9.2
export midifilter_VERSION=0.4.5
export midigen_VERSION=0.2.2
......@@ -12,8 +12,8 @@ export nodelay_VERSION=0.2.2
export onsettrigger_VERSION=0.2.3
export robtk_VERSION=0.5.1
export sisco_VERSION=0.7.0
export stepseq_VERSION=0.3.3
export stepseq_VERSION=0.3.4
export stereoroute_VERSION=0.1.1
export testsignal_VERSION=0.3.2
export tuna_VERSION=0.4.0
export tuna_VERSION=0.4.1
export xfade_VERSION=0.2.3
balance.lv2 v0.6.5
controlfilter.lv2 v0.3.1
convoLV2 v0.5.2
fat1.lv2 v0.3.0
fil4.lv2 v0.5.2
fat1.lv2 v0.3.1
fil4.lv2 v0.5.3
meters.lv2 v0.9.2
midifilter.lv2 v0.4.5
midigen.lv2 v0.2.2
......@@ -12,8 +12,8 @@ nodelay.lv2 v0.2.2
onsettrigger.lv2 v0.2.3
robtk v0.5.1
sisco.lv2 v0.7.0
stepseq.lv2 v0.3.3
stepseq.lv2 v0.3.4
stereoroute.lv2 v0.1.1
testsignal.lv2 v0.3.2
tuna.lv2 v0.4.0
tuna.lv2 v0.4.1
xfade.lv2 v0.2.3
......@@ -11,6 +11,7 @@ Compiling stepseq requires the LV2 SDK, bash, gnu-make, and a c-compiler.
```bash
git clone git://github.com/x42/stepseq.lv2.git
cd stepseq.lv2
make submodules
make
sudo make install PREFIX=/usr
```
......
......@@ -344,6 +344,14 @@
box-shadow: 2px 2px 2px 0px #000 inset, -2px -2px 2px 1px #888 inset;
}
.x42-stepseq{{{cns}}} .buttongrid .togglebtn.on.highlight {
background-color:#f60;
}
.x42-stepseq{{{cns}}} .buttongrid .togglebtn.off.highlight {
background-color:#666;
}
.x42-stepseq{{{cns}}} .buttongrid .resetbutton {
border-radius: 5px;
background-color:#444;
......
......@@ -37,9 +37,18 @@ function (event, funcs) {
}
}
function set_current_step (step) {
/* TODO: incremental, keep track of highlighted column */
event.icon.find("[mod-role=input-control-port][grid-row]").each(function () { $(this).removeClass("highlight"); });
event.icon.find("[mod-role=input-control-port][grid-col="+step+"]").each(function () { $(this).addClass("highlight"); });
}
if (event.type == 'change') {
if (event.symbol == "drummode") {
update_drummode_display (event.value, false)
update_drummode_display (event.value, false);
}
else if (event.symbol == "pos") {
set_current_step (Math.round (event.value));
}
}
......@@ -105,9 +114,15 @@ function (event, funcs) {
var ports = event.ports;
for (var p in ports) {
if (ports[p].symbol == "drummode") {
update_drummode_display (ports[p].value, true);
break;
switch (ports[p].symbol) {
case 'drummode':
update_drummode_display (ports[p].value, true);
break;
case 'pos':
set_current_step (Math.round (event.value));
break;
default:
break;
}
}
}
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-STEPSEQ "1" "August 2016" "x42-stepseq version 0.3.3" "User Commands"
.TH X42-STEPSEQ "1" "August 2016" "x42-stepseq version 0.3.4" "User Commands"
.SH NAME
x42-stepseq \- x42 Step Sequencer
.SH SYNOPSIS
......
This diff is collapsed.
@LV2NAME@:ui_gtk
a ui:GtkUI ;
ui:binary <@LV2GTK@@LIB_EXT@> ;
rdfs:seeAlso <@LV2NAME@.ttl> .
@LV2NAME@:@INSTANCE@@URI_SUFFIX@
@LV2NAME@:@INSTANCE@
a lv2:Plugin ;
lv2:binary <@LV2NAME@@LIB_EXT@> ;
rdfs:seeAlso <@LV2NAME@.ttl> .
......
@LV2NAME@:@INSTANCE@
modgui:gui [
modgui:brand "x42" ;
modgui:label "x42-tuner" ;
] .
@prefix kx: <http://kxstudio.sf.net/ns/lv2ext/external-ui#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix modgui: <http://moddevices.com/ns/modgui#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix ui: <http://lv2plug.in/ns/extensions/ui#> .
@prefix kx: <http://kxstudio.sf.net/ns/lv2ext/external-ui#> .
@prefix ui: <http://lv2plug.in/ns/extensions/ui#> .
@prefix @LV2NAME@: <http://gareus.org/oss/lv2/@LV2NAME@#> .
@LV2NAME@:ui@UI_URI_SUFFIX@
@LV2NAME@:ui_gl
a @UI_TYPE@ ;
lv2:requiredFeature urid:map ;
@UI_REQ@
......
@LV2NAME@:@INSTANCE@@URI_SUFFIX@
@LV2NAME@:@INSTANCE@
a lv2:Plugin, doap:Project, lv2:AnalyserPlugin;
doap:license <http://usefulinc.com/doap/licenses/gpl> ;
doap:maintainer <http://gareus.org/rgareus#me> ;
doap:name "Instrument Tuner@NAME_SUFFIX@";
@VERSION@
@UITTL@
@MODBRAND@
@MODLABEL@
lv2:optionalFeature lv2:hardRTCapable ;
lv2:requiredFeature urid:map ;
ui:ui @LV2NAME@:@UI@ ;
@SIGNATURE@
lv2:port
[
a atom:AtomPort ,
......@@ -221,5 +224,5 @@
lv2:default -15.0 ;
lv2:portProperty pprop:notOnGUI ;
] ;
rdfs:comment "Musical instrument tuner with strobe characteristics" ;
rdfs:comment "Musical instrument tuner with strobe characteristics" ;
.
@prefix atom: <http://lv2plug.in/ns/ext/atom#> .
@prefix doap: <http://usefulinc.com/ns/doap#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix kx: <http://kxstudio.sf.net/ns/lv2ext/external-ui#> .
@prefix lv2: <http://lv2plug.in/ns/lv2core#> .
@prefix units: <http://lv2plug.in/ns/extensions/units#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix ui: <http://lv2plug.in/ns/extensions/ui#> .
@prefix urid: <http://lv2plug.in/ns/ext/urid#> .
@prefix mod: <http://moddevices.com/ns/mod#> .
@prefix pprop: <http://lv2plug.in/ns/ext/port-props#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix rsz: <http://lv2plug.in/ns/ext/resize-port#> .
@prefix kx: <http://kxstudio.sf.net/ns/lv2ext/external-ui#> .
@prefix ui: <http://lv2plug.in/ns/extensions/ui#> .
@prefix units: <http://lv2plug.in/ns/extensions/units#> .
@prefix urid: <http://lv2plug.in/ns/ext/urid#> .
@prefix @LV2NAME@: <http://gareus.org/oss/lv2/@LV2NAME@#> .
<http://gareus.org/rgareus#me>
......
......@@ -7,7 +7,7 @@ extern const LV2UI_Descriptor* lv2ui_descriptor(uint32_t index);
static const RtkLv2Description _plugin_tuna_two = {
&lv2_descriptor,
&lv2ui_descriptor
, 2 // uint32_t dsp_descriptor_id
, 1 // uint32_t dsp_descriptor_id
, 0 // uint32_t gui_descriptor_id
, "Instrument Tuner[Spectrum]" // const char *plugin_human_id
, (const struct LV2Port[20])
......
......@@ -244,11 +244,8 @@ instantiate(
return NULL;
}
if (!strncmp(descriptor->URI, TUNA_URI "one", 31 + 3 )) {
;
} else if (!strncmp(descriptor->URI, TUNA_URI "two", 31 + 3 )) {
;
} else {
if (strncmp(descriptor->URI, TUNA_URI, strlen (TUNA_URI))) {
free(self);
return NULL;
}
......@@ -779,9 +776,7 @@ static const LV2_Descriptor descriptor ## ID = { \
};
mkdesc_tuna(0, "one")
mkdesc_tuna(1, "one_gtk")
mkdesc_tuna(2, "two")
mkdesc_tuna(3, "two_gtk")
mkdesc_tuna(1, "two")
#undef LV2_SYMBOL_EXPORT
#ifdef _WIN32
......@@ -796,8 +791,6 @@ lv2_descriptor(uint32_t index)
switch (index) {
case 0: return &descriptor0;
case 1: return &descriptor1;
case 2: return &descriptor2;
case 3: return &descriptor3;
default: return NULL;
}
}
......
......@@ -19,7 +19,9 @@
#ifndef TUNA_H
#define TUNA_H
#ifndef TUNA_URI
#define TUNA_URI "http://gareus.org/oss/lv2/tuna#"
#endif
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-TUNA "1" "August 2016" "x42-tuna version 0.4.0" "User Commands"
.TH X42-TUNA "1" "August 2016" "x42-tuna version 0.4.1" "User Commands"
.SH NAME
x42-tuna \- JACK Music Instrument Tuner
.SH SYNOPSIS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment