Commit 47edef2d authored by Jaromír Mikeš's avatar Jaromír Mikeš

New upstream version 20170428

parent 96830acb
......@@ -79,7 +79,7 @@ ifneq ($(XWIN),)
EXE_EXT=.exe
PUGL_SRC=$(RW)pugl/pugl_win.cpp
PKG_GL_LIBS=
UI_TYPE=
UI_TYPE=ui:WindowsUI
GLUILIBS=-lws2_32 -lwinmm -lopengl32 -lglu32 -lgdi32 -lcomdlg32 -lpthread
GLUICFLAGS=-I.
override LDFLAGS += -static-libgcc -static-libstdc++
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-FAT1 "1" "December 2016" "x42-fat1 version 0.3.2" "User Commands"
.TH X42-FAT1 "1" "April 2017" "x42-fat1 version 0.3.3" "User Commands"
.SH NAME
x42-fat1 \- x42 JACK Auto Tune
.SH SYNOPSIS
......
......@@ -103,13 +103,9 @@
<div mod-port-symbol="gain" mod-role="input-control-port" class="mod-knob-image"></div>
</div>
<div mod-button-type="knob" mod-role="icon-button" class="mod-toggle">
<div mod-port-symbol="enable" mod-role="input-control-port" class="mod-toggle-image"></div>
<div class="mod-toggle-image" mod-role="bypass"></div>
</div>
<div class="x42-label"><h1>Enable</h1></div>
<div class="mod-bypass-led">
<div class="mod-light on" mod-role="bypass-light" title="MOD hard bypass - not clickless"></div>
<div class="mod-footswitch" mod-role="bypass"></div>
</div>
</div>
<div class="x42-eq-tf">
<div class="x42-eq-svg" mod-role="transfer-function"/>
......
......@@ -137,6 +137,13 @@
overflow:hidden;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-toggle .mod-toggle-image.on {
background-position: 0px 0px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-toggle .mod-toggle-image.off {
background-position: -90px 0px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-led .mod-led-image {
background-image:url(/resources/x42-led.png{{{ns}}});
......@@ -158,32 +165,6 @@
width:24px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-bypass-led .mod-light {
height:24px;
width:24px;
margin:0px;
overflow:hidden;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-bypass-led .mod-light.off {
background-image: url(/resources/led-bypassed.gif{{{ns}}});
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-bypass-led .mod-light.on {
background-image: url(/resources/led-enabled.png{{{ns}}});
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-bypass-led .mod-footswitch {
display:none;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-bypass-led {
position:absolute;
right:0px;
top:0px;
width:24px;
}
.mod-pedal-boxy{{{cns}}}.mod-x42-eq .mod-control-group .mod-toggle {
display:inline-block;
width:90px;
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-FIL4 "1" "December 2016" "x42-fil4 version 0.5.4" "User Commands"
.TH X42-FIL4 "1" "April 2017" "x42-fil4 version 0.5.5" "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.3
export fat1_VERSION=0.3.2
export fil4_VERSION=0.5.4
export meters_VERSION=0.9.3
export midifilter_VERSION=0.4.6
export fat1_VERSION=0.3.3
export fil4_VERSION=0.5.5
export meters_VERSION=0.9.4
export midifilter_VERSION=0.4.7
export midigen_VERSION=0.2.2
export midimap_VERSION=0.3.0
export mixtri_VERSION=0.2.7
export mixtri_VERSION=0.2.8
export nodelay_VERSION=0.3.0
export onsettrigger_VERSION=0.2.4
export robtk_VERSION=0.5.2
export sisco_VERSION=0.7.1
export stepseq_VERSION=0.4.0
export robtk_VERSION=0.5.3
export sisco_VERSION=0.7.2
export stepseq_VERSION=0.4.1
export stereoroute_VERSION=0.1.1
export testsignal_VERSION=0.4.0
export tuna_VERSION=0.4.2
export tuna_VERSION=0.4.3
export xfade_VERSION=0.2.4
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-METER "1" "December 2016" "x42-meter version 0.9.3" "User Commands"
.TH X42-METER "1" "April 2017" "x42-meter version 0.9.4" "User Commands"
.SH NAME
x42-meter \- JACK Audio Meter Collection
.SH SYNOPSIS
......
......@@ -7,11 +7,12 @@ MFD_FILTER(notetocc)
, TTF_IPORT(0, "channelf", "Filter Channel", 0, 16, 0,
PORTENUMZ("Any")
DOC_CHANF)
, TTF_IPORT(1, "mode", "Operation Mode", 0, 3, 0,
, TTF_IPORT(1, "mode", "Operation Mode", 0, 4, 0,
lv2:portProperty lv2:integer; lv2:portProperty lv2:enumeration;
lv2:scalePoint [ rdfs:label "Fixed parameter, CC-value = velocity" ; rdf:value 0 ] ;
lv2:scalePoint [ rdfs:label "Fixed parameter, CC-value = key" ; rdf:value 1 ] ;
lv2:scalePoint [ rdfs:label "All keys, parameter = key, CC-value = velocity" ; rdf:value 2 ] ;
lv2:scalePoint [ rdfs:label "Toggle, parameter = key, CC-value = 127 note-on or 0 note-off" ; rdf:value 3 ] ;
rdfs:comment "")
, TTF_IPORT(2, "param", "CC Parameter", 0, 127, 0,
lv2:portProperty lv2:integer;
......@@ -22,7 +23,7 @@ MFD_FILTER(notetocc)
rdfs:comment "only used in 'value = velocity' mode."
)
, TTF_IPORTTOGGLE(4, "nooff", "Ignore Note Off", 1)
; rdfs:comment "Convert MIDI note-on messages to control change messages."
; rdfs:comment "Convert only MIDI note-on messages to control change messages (ignored in toggle mode)."
.
#elif defined MX_CODE
......@@ -50,7 +51,7 @@ filter_midi_notetocc(MidiFilter* self,
const uint8_t key = buffer[1] & 0x7f;
const uint8_t vel = buffer[2] & 0x7f;
const int mode = RAIL(floorf(*self->cfg[1]),0, 3);
const int mode = RAIL(floorf(*self->cfg[1]),0, 4);
const uint8_t param = midi_limit_val(floorf(*self->cfg[2]));
const uint8_t kfltr = midi_limit_val(floorf(*self->cfg[3]));
......@@ -79,8 +80,16 @@ filter_midi_notetocc(MidiFilter* self,
buf[1] = key;
buf[2] = vel;
break;
case 3: // toggle, param <- note, value <- 0 or 127
buf[1] = key;
if (mst == MIDI_NOTEOFF) {
buf[2] = 0;
} else {
buf[2] = 127;
}
//no break
}
if (mst == MIDI_NOTEON || (*(self->cfg[4])) <= 0) {
if (mst == MIDI_NOTEON || (*(self->cfg[4])) <= 0 || mode == 3) {
forge_midimessage(self, tme, buf, 3);
}
}
......
......@@ -5,3 +5,9 @@
@prefix mfltplugin: <http://gareus.org/oss/lv2/midifilter#> .
@prefix mfltpreset: <http://gareus.org/oss/lv2/midifilter/presets#> .
# Temporarily include description of lv2:MIDIPlugin for backwards compatibility
lv2:MIDIPlugin
a rdfs:Class ;
rdfs:subClassOf lv2:Plugin ;
rdfs:label "MIDI" .
......@@ -21,4 +21,3 @@
a doap:Project ;
doap:maintainer <http://gareus.org/rgareus#me> ;
doap:name "Midi Filter Plugin Set" .
......@@ -25,7 +25,7 @@
#define MIDIEXTURI <HTTPP/lv2plug.in/ns/ext/midi#MidiEvent>
#define TTF_DEF(DOAPNAME, MODNAME, INSUPPORTS) \
a lv2:Plugin, lv2:UtilityPlugin ; \
a lv2:Plugin, lv2:MIDIPlugin ; \
doap:name DOAPNAME ; \
mod:label MODNAME ; \
@MODBRAND@ \
......
......@@ -52,14 +52,14 @@ ifeq ($(UNAME),Darwin)
STRIPFLAGS=-u -r -arch all -s $(RW)lv2syms
EXTENDED_RE=-E
else
LV2LDFLAGS=-Wl,-Bstatic -Wl,-Bdynamic
LV2LDFLAGS=-Wl,-Bstatic -Wl,-Bdynamic -Wl,--as-needed -pthread
LIB_EXT=.so
EXE_EXT=
UI_TYPE=ui:X11UI
PUGL_SRC=$(RW)pugl/pugl_x11.c
PKG_GL_LIBS=glu gl
GLUILIBS=-lX11
GLUICFLAGS+=`pkg-config --cflags glu`
GLUICFLAGS+=`pkg-config --cflags glu` -pthread
STRIPFLAGS=-s
EXTENDED_RE=-r
endif
......@@ -72,6 +72,7 @@ ifneq ($(XWIN),)
EXE_EXT=.exe
PUGL_SRC=$(RW)pugl/pugl_win.cpp
PKG_GL_LIBS=
UI_TYPE=ui:WindowsUI
GLUILIBS=-lws2_32 -lwinmm -lopengl32 -lglu32 -lgdi32 -lcomdlg32 -lpthread
BUILDGTK=no
GLUICFLAGS=-I.
......@@ -290,6 +291,7 @@ uninstall: uninstall-bin uninstall-man
install-bin: all
install -d $(DESTDIR)$(LV2DIR)/$(BUNDLE)
install -m644 $(BUILDDIR)manifest.ttl $(BUILDDIR)$(LV2NAME).ttl $(DESTDIR)$(LV2DIR)/$(BUNDLE)
install -m755 $(BUILDDIR)$(LV2NAME)$(LIB_EXT) $(DESTDIR)$(LV2DIR)/$(BUNDLE)
ifneq ($(BUILDOPENGL), no)
install -m755 $(BUILDDIR)$(LV2GUI)$(LIB_EXT) $(DESTDIR)$(LV2DIR)/$(BUNDLE)
endif
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-MIXTRI "1" "August 2016" "x42-mixtri version 0.2.7" "User Commands"
.TH X42-MIXTRI "1" "April 2017" "x42-mixtri version 0.2.8" "User Commands"
.SH NAME
x42-mixtri \- JACK Mixer'n'Trigger
.SH SYNOPSIS
......
balance.lv2 v0.6.5
controlfilter.lv2 v0.3.1
convoLV2 v0.5.3
fat1.lv2 v0.3.2
fil4.lv2 v0.5.4
meters.lv2 v0.9.3
midifilter.lv2 v0.4.6
fat1.lv2 v0.3.3
fil4.lv2 v0.5.5
meters.lv2 v0.9.4
midifilter.lv2 v0.4.7
midigen.lv2 v0.2.2
midimap.lv2 v0.3.0
mixtri.lv2 v0.2.7
mixtri.lv2 v0.2.8
nodelay.lv2 v0.3.0
onsettrigger.lv2 v0.2.4
robtk v0.5.2
sisco.lv2 v0.7.1
stepseq.lv2 v0.4.0
robtk v0.5.3
sisco.lv2 v0.7.2
stepseq.lv2 v0.4.1
stereoroute.lv2 v0.1.1
testsignal.lv2 v0.4.0
tuna.lv2 v0.4.2
tuna.lv2 v0.4.3
xfade.lv2 v0.2.4
......@@ -677,7 +677,12 @@ static void jack_freewheel_cb (int onoff, void *arg) {
static int init_jack(const char *client_name) {
jack_status_t status;
j_client = jack_client_open (client_name, JackNoStartServer, &status);
char* cn = strdup (client_name);
if (strlen (cn) >= (unsigned int)jack_client_name_size () - 1) {
cn [jack_client_name_size () - 1] = '\0';
}
j_client = jack_client_open (cn, JackNoStartServer, &status);
free (cn);
if (j_client == NULL) {
fprintf (stderr, "jack_client_open() failed, status = 0x%2.0x\n", status);
if (status & JackServerFailed) {
......
......@@ -466,7 +466,10 @@ puglDestroy(PuglView* view)
PuglStatus
puglProcessEvents(PuglView* view)
{
//[view->impl->glview setNeedsDisplay: YES];
if (view->redisplay) {
view->redisplay = false;
[view->impl->glview setNeedsDisplay: YES];
}
return PUGL_SUCCESS;
}
......@@ -511,7 +514,7 @@ puglHideWindow(PuglView* view)
void
puglPostRedisplay(PuglView* view)
{
//view->redisplay = true; // unused
view->redisplay = true;
[view->impl->glview setNeedsDisplay: YES];
}
......
......@@ -47,6 +47,8 @@ struct PuglInternalsImpl {
HDC hdc;
HGLRC hglrc;
WNDCLASS wc;
bool keep_aspect;
int win_flags;
};
LRESULT CALLBACK
......@@ -74,6 +76,7 @@ puglCreate(PuglNativeWindow parent,
view->height = height;
view->ontop = ontop;
view->user_resizable = resizable && !parent;
view->impl->keep_aspect = min_width != width;
// FIXME: This is nasty, and pugl should not have static anything.
// Should class be a parameter? Does this make sense on other platforms?
......@@ -100,21 +103,26 @@ puglCreate(PuglNativeWindow parent,
return NULL;
}
if (parent) {
view->impl->win_flags = WS_CHILD;
} else {
view->impl->win_flags = WS_POPUPWINDOW | WS_CAPTION | (view->user_resizable ? WS_SIZEBOX : 0);
}
// Adjust the overall window size to accomodate our requested client size
int winFlags = WS_POPUPWINDOW | WS_CAPTION | (view->user_resizable ? WS_SIZEBOX : 0);
RECT wr = { 0, 0, width, height };
AdjustWindowRectEx(&wr, winFlags, FALSE, WS_EX_TOPMOST);
AdjustWindowRectEx(&wr, view->impl->win_flags, FALSE, WS_EX_TOPMOST);
RECT mr = { 0, 0, min_width, min_height };
AdjustWindowRectEx(&mr, winFlags, FALSE, WS_EX_TOPMOST);
view->min_width = mr.right-mr.left;
view->min_height = wr.bottom-mr.top;
AdjustWindowRectEx(&mr, view->impl->win_flags, FALSE, WS_EX_TOPMOST);
view->min_width = mr.right - mr.left;
view->min_height = mr.bottom - mr.top;
impl->hwnd = CreateWindowEx(
impl->hwnd = CreateWindowEx (
WS_EX_TOPMOST,
classNameBuf, title, (view->user_resizable ? WS_SIZEBOX : 0) |
(parent ? (WS_CHILD | WS_VISIBLE) : (WS_POPUPWINDOW | WS_CAPTION)),
0, 0, wr.right-wr.left, wr.bottom-wr.top,
0, 0, wr.right - wr.left, wr.bottom - wr.top,
(HWND)parent, NULL, NULL, NULL);
if (!impl->hwnd) {
......@@ -127,7 +135,7 @@ puglCreate(PuglNativeWindow parent,
SetWindowLongPtr(impl->hwnd, GWL_USERDATA, (LONG_PTR)view);
SetWindowPos (impl->hwnd,
ontop ? HWND_TOPMOST : HWND_NOTOPMOST,
ontop ? HWND_TOPMOST : HWND_TOP,
0, 0, 0, 0, (ontop ? 0 : SWP_NOACTIVATE) | SWP_ASYNCWINDOWPOS | SWP_NOMOVE | SWP_NOSIZE);
impl->hdc = GetDC(impl->hwnd);
......@@ -238,17 +246,24 @@ puglResize(PuglView* view)
/* ask the plugin about the new size */
view->resizeFunc(view, &view->width, &view->height, &set_hints);
int winFlags = WS_POPUPWINDOW | WS_CAPTION | (view->user_resizable ? WS_SIZEBOX : 0);
RECT wr = { 0, 0, (long)view->width, (long)view->height };
HWND parent = GetParent (view->impl->hwnd);
if (parent) {
puglReshape(view, view->width, view->height);
SetWindowPos (view->impl->hwnd, HWND_TOP,
0, 0, view->width, view->height,
SWP_NOZORDER | SWP_NOMOVE);
return;
}
AdjustWindowRectEx(&wr, winFlags, FALSE, WS_EX_TOPMOST);
RECT wr = { 0, 0, (long)view->width, (long)view->height };
AdjustWindowRectEx(&wr, view->impl->win_flags, FALSE, WS_EX_TOPMOST);
SetWindowPos (view->impl->hwnd,
view->ontop ? HWND_TOPMOST : HWND_NOTOPMOST,
0, 0, wr.right-wr.left, wr.bottom-wr.top,
SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOOWNERZORDER /*|SWP_NOZORDER*/);
UpdateWindow(view->impl->hwnd);
/* and call Reshape in GlX context */
/* and call Reshape in GL context */
puglReshape(view, view->width, view->height);
}
......@@ -290,6 +305,11 @@ static void
processMouseEvent(PuglView* view, int button, bool press, LPARAM lParam)
{
view->event_timestamp_ms = GetMessageTime();
if (GetFocus() != view->impl->hwnd) {
// focus is needed to receive mouse-wheel events
SetFocus (view->impl->hwnd);
}
if (press) {
SetCapture(view->impl->hwnd);
} else {
......@@ -325,11 +345,36 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
case WM_CREATE:
case WM_SHOWWINDOW:
case WM_SIZE:
RECT rect;
GetClientRect(view->impl->hwnd, &rect);
puglReshape(view, rect.right, rect.bottom);
view->width = rect.right;
view->height = rect.bottom;
{
RECT rect;
GetClientRect(view->impl->hwnd, &rect);
puglReshape(view, rect.right, rect.bottom);
view->width = rect.right;
view->height = rect.bottom;
}
break;
case WM_SIZING:
if (view->impl->keep_aspect) {
float aspect = view->min_width / (float)view->min_height;
RECT* rect = (RECT*)lParam;
switch ((int)wParam) {
case WMSZ_LEFT:
case WMSZ_RIGHT:
case WMSZ_BOTTOMLEFT:
case WMSZ_BOTTOMRIGHT:
rect->bottom = rect->top + (rect->right - rect->left) / aspect;
break;
case WMSZ_TOP:
case WMSZ_BOTTOM:
case WMSZ_TOPRIGHT:
rect->right = rect->left + (rect->bottom - rect->top) * aspect;
break;
case WMSZ_TOPLEFT:
rect->left = rect->right - (rect->bottom - rect->top) * aspect;
break;
}
return TRUE;
}
break;
case WM_GETMINMAXINFO:
{
......
......@@ -29,6 +29,9 @@ endif
ifeq ($(USEWEAKJACK),1)
JACKCFLAGS+=-DUSE_WEAK_JACK
JACKEXTRA+=$(RW)weakjack/weak_libjack.c
ifeq ($(XWIN),)
JACKLIBS+=-ldl
endif
else
JACKLIBS+=`pkg-config $(PKG_UI_FLAGS) --libs jack`
endif
......
......@@ -708,9 +708,6 @@ static void resize_toplevel(RobWidget *rw, int w, int h) {
resize_self(rw);
self->resize_in_progress = TRUE;
self->resize_toplevel = TRUE;
#ifdef TIMED_RESHAPE
self->queue_reshape = 1;
#endif
puglPostResize(self->view);
}
......@@ -868,7 +865,7 @@ static void myusleep(uint32_t usec) {
static void reallocate_canvas(GLrobtkLV2UI* self) {
#ifdef DEBUG_RESIZE
printf("reallocate_canvas()\n");
printf("reallocate_canvas to %d x %d\n", self->width, self->height);
#endif
self->queue_canvas_realloc = false;
if (self->cr) {
......@@ -995,7 +992,7 @@ static void onResize(PuglView* view, int *width, int *height, int *set_hints) {
GLrobtkLV2UI* self = (GLrobtkLV2UI*)puglGetHandle(view);
assert(width && height);
#ifdef DEBUG_RESIZE
printf("onResize()\n");
printf("onResize( %d x %d -> %d x %d)\n", *width, *height, self->width, self->height);
#endif
if (*width != self->width || *height != self->height) {
......
......@@ -27,15 +27,19 @@ JPFUN(1, int, set_graph_order_callback, (jack_client_t *c, JackGraphO
JPFUN(1, int, set_xrun_callback, (jack_client_t *c, JackXRunCallback g, void *a), (c,g,a), -1)
JPFUN(1, int, set_latency_callback, (jack_client_t *c, JackLatencyCallback g, void *a), (c,g,a), -1)
JVFUN(1, set_error_function, (void (*f)(const char *)), (f),)
JVFUN(1, set_info_function, (void (*f)(const char *)), (f),)
JCFUN(1, int, activate, -1)
JCFUN(1, int, deactivate, -1)
JPFUN(1, int, client_name_size, (), (), 32)
JCFUN(1, jack_nframes_t, get_sample_rate, 0)
JCFUN(1, jack_nframes_t, get_buffer_size, 0)
JPFUN(1, jack_nframes_t, frames_since_cycle_start, (const jack_client_t *c), (c), 0)
JPFUN(1, jack_nframes_t, frame_time, (const jack_client_t *c), (c), 0)
JPFUN(1, jack_nframes_t, last_frame_time, (const jack_client_t *c), (c), 0)
JPFUN(1, jack_time_t, get_time, (void), (), 0)
JCFUN(1, float, cpu_load, 0)
JCFUN(1, int, is_realtime, 0)
......@@ -53,6 +57,7 @@ JPFUN(1, int, port_ensure_monitor, (jack_port_t *p, int o), (p,o), 0)
JPFUN(1, int, port_monitoring_input, (jack_port_t *p), (p), 0)
JPFUN(1, const char*, port_name, (const jack_port_t *p), (p), NULL)
JPFUN(1, const char*, port_short_name, (const jack_port_t *p), (p), NULL)
JPFUN(1, int, port_flags, (const jack_port_t *p), (p), 0)
JPFUN(1, const char**, get_ports,(jack_client_t *c, const char *p, const char *t, unsigned long f), (c,p,t,f), NULL)
JPFUN(1, int, port_name_size, (void), (), 0)
......@@ -65,7 +70,9 @@ JPFUN(1, int, port_unregister, (jack_client_t *c, jack_port_t *p), (c
JPFUN(1, const char *, port_type, (const jack_port_t *p), (p), 0)
JPFUN(1, const char **, port_get_connections, (const jack_port_t *p), (p), 0)
JPFUN(1, const char **, port_get_all_connections, (const jack_client_t *c, const jack_port_t *p), (c,p), 0)
JPFUN(1, int, port_set_name, (jack_port_t *p, const char *n), (p,n), 0)
JPFUN(1, int, port_set_name, (jack_port_t *p, const char *n), (p,n), -1)
JXFUN(0, int, port_rename, (jack_client_t *c, jack_port_t *p, const char *n), (c,p,n), return jack_port_set_name (p,n);)
JPFUN(1, int, port_get_aliases, (const jack_port_t *port, char* const aliases[2]), (port,aliases), 0)
JPFUN(1, int, port_disconnect, (jack_client_t *c, jack_port_t *p), (c,p), 0)
JPFUN(1, int, connect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1)
JPFUN(1, int, disconnect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1)
......@@ -107,6 +114,9 @@ JPFUN(1, size_t, ringbuffer_write_space, (const jack_ringbuffer_t *rb),
JPFUN(1, size_t, ringbuffer_read, (jack_ringbuffer_t *rb, char *d, size_t c), (rb,d,c), 0)
JPFUN(1, size_t, ringbuffer_write, (jack_ringbuffer_t *rb, const char *s, size_t c), (rb,s,c), 0)
JPFUN(0, int, ringbuffer_mlock, (jack_ringbuffer_t *rb), (rb), 0)
JVFUN(0, ringbuffer_get_read_vector, (const jack_ringbuffer_t *rb, jack_ringbuffer_data_t *v), (rb,v), if (v) {v->buf=NULL; v->len=0;} )
JVFUN(0, ringbuffer_get_write_vector, (const jack_ringbuffer_t *rb, jack_ringbuffer_data_t *v), (rb,v), if (v) {v->buf=NULL; v->len=0;} )
JPFUN(0, size_t, ringbuffer_peek, (jack_ringbuffer_t *rb, char *d, size_t c), (rb,d,c), 0)
/* <jack/thread.h> */
JCFUN(0, int, client_real_time_priority, 0)
......@@ -115,9 +125,20 @@ JPFUN(0, int, acquire_real_time_scheduling, (jack_native_thread_t t,
JPFUN(0, int, drop_real_time_scheduling, (jack_native_thread_t t), (t), 0)
JPFUN(0, int, client_stop_thread, (jack_client_t* c, jack_native_thread_t t), (c,t), 0)
JPFUN(0, int, client_kill_thread, (jack_client_t* c, jack_native_thread_t t), (c,t), 0)
#ifndef _WIN32
JVFUN(0, set_thread_creator, (jack_thread_creator_t c), (c),)
#endif
JPFUN(1, int, client_create_thread, \
(jack_client_t* c, jack_native_thread_t *t, int p, int r, void *(*f)(void*), void *a), (c,t,p,r,f,a), 0)
#ifndef NO_JACK_METADATA
/* <jack/uuid.h> - TODO*/
/* <jack/jack.h> */
JPFUN(0, char *, get_uuid_for_client_name, (jack_client_t* c, const char* n), (c,n), NULL)
JPFUN(0, char *, get_client_name_by_uuid, (jack_client_t* c, const char* u), (c,u), NULL)
JPFUN(0, jack_uuid_t, port_uuid, (const jack_port_t *p), (p), 0)
/* <jack/metadata.h> */
JPFUN(0, int, set_property, (jack_client_t* c, jack_uuid_t s, const char* k, const char* v, const char* t), (c,s,k,v,t), -1)
JXFUN(0, int, get_property, (jack_uuid_t s, const char* k, char** v, char** t), (s,k,v,t), if (v) *v=NULL; if (t) *t=NULL; return -1;)
......@@ -128,5 +149,11 @@ JPFUN(0, int, remove_property, (jack_client_t* c, jack_uuid_t s, cons
JPFUN(0, int, remove_properties, (jack_client_t* c, jack_uuid_t s), (c,s), -1)
JPFUN(0, int, remove_all_properties, (jack_client_t* c), (c), -1)
JPFUN(0, int, set_property_change_callback, (jack_client_t *c, JackPropertyChangeCallback s, void *a), (c,s,a), -1)
#endif
/* <jack/statistics.h> */
JCFUN(1, float, get_max_delayed_usecs, 0.0)
JCFUN(1, float, get_xrun_delayed_usecs, 0.0)
JVFUN(0, reset_max_delayed_usecs, (jack_client_t *c), (c),)
#endif // end USE_WEAK_JACK
......@@ -55,9 +55,12 @@ int have_libjack(void);
#define jack_frames_since_cycle_start WJACK_frames_since_cycle_start
#define jack_frame_time WJACK_frame_time
#define jack_last_frame_time WJACK_last_frame_time
#define jack_get_time WJACK_get_time
#define jack_cpu_load WJACK_cpu_load
#define jack_is_realtime WJACK_is_realtime
#define jack_client_name_size WJACK_client_name_size
#define jack_set_freewheel WJACK_set_freewheel
#define jack_set_buffer_size WJACK_set_buffer_size
......@@ -73,6 +76,7 @@ int have_libjack(void);
#define jack_set_xrun_callback WJACK_set_xrun_callback
#define jack_set_latency_callback WJACK_set_latency_callback
#define jack_set_error_function WJACK_set_error_function
#define jack_set_info_function WJACK_set_info_function
#define jack_activate WJACK_activate
#define jack_deactivate WJACK_deactivate
......@@ -87,6 +91,7 @@ int have_libjack(void);
#define jack_port_monitoring_input WJACK_port_monitoring_input
#define jack_port_name WJACK_port_name
#define jack_port_short_name WJACK_port_short_name
#define jack_port_flags WJACK_port_flags
#define jack_get_ports WJACK_get_ports
#define jack_port_name_size WJACK_port_name_size
......@@ -95,6 +100,8 @@ int have_libjack(void);
#define jack_port_by_name WJACK_port_by_name
#define jack_port_by_id WJACK_port_by_id
#define jack_port_set_name WJACK_port_set_name
#define jack_port_get_aliases WJACK_port_get_aliases
#define jack_port_rename WJACK_port_rename
#define jack_port_disconnect WJACK_port_disconnect
#define jack_port_register WJACK_port_register
#define jack_port_unregister WJACK_port_unregister
......@@ -142,6 +149,9 @@ int have_libjack(void);
#define jack_ringbuffer_read WJACK_ringbuffer_read
#define jack_ringbuffer_write WJACK_ringbuffer_write
#define jack_ringbuffer_mlock WJACK_ringbuffer_mlock
#define jack_ringbuffer_get_read_vector WJACK_ringbuffer_get_read_vector
#define jack_ringbuffer_get_write_vector WJACK_ringbuffer_get_write_vector
#define jack_ringbuffer_peek WJACK_ringbuffer_peek
/* <jack/thread.h> */
#define jack_client_real_time_priority WJACK_client_real_time_priority
......@@ -151,10 +161,16 @@ int have_libjack(void);
#define jack_drop_real_time_scheduling WJACK_drop_real_time_scheduling
#define jack_client_stop_thread WJACK_client_stop_thread
#define jack_client_kill_thread WJACK_client_kill_thread
#define jack_set_thread_creator WJACK_set_thread_creator
#define jack_client_open WJACK_client_client_openXXX
#ifndef NO_JACK_METADATA
/* <jack/metadata.h> */
#define jack_get_uuid_for_client_name WJACK_get_uuid_for_client_name
#define jack_get_client_name_by_uuid WJACK_get_client_name_by_uuid
#define jack_port_uuid WJACK_port_uuid
#define jack_set_property WJACK_set_property
#define jack_get_property WJACK_get_property
#define jack_free_description WJACK_free_description
......@@ -164,6 +180,12 @@ int have_libjack(void);
#define jack_remove_properties WJACK_remove_properties
#define jack_remove_all_properties WJACK_remove_all_properties
#define jack_set_property_change_callback WJACK_set_property_change_callback
#endif
/* <jack/statistics.h> */
#define jack_get_max_delayed_usecs WJACK_get_max_delayed_usecs
#define jack_get_xrun_delayed_usecs WJACK_get_xrun_delayed_usecs
#define jack_reset_max_delayed_usecs WJACK_reset_max_delayed_usecs
#endif // end USE_WEAK_JACK
......@@ -173,7 +195,10 @@ int have_libjack(void);
#include <jack/midiport.h>
#include <jack/session.h>
#include <jack/thread.h>
#ifndef NO_JACK_METADATA
#include <jack/metadata.h>
#endif
#ifdef USE_WEAK_JACK
......
......@@ -45,14 +45,14 @@ ifeq ($(UNAME),Darwin)
STRIPFLAGS=-u -r -arch all -s $(RW)lv2syms
EXTENDED_RE=-E
else
LV2LDFLAGS=-Wl,-Bstatic -Wl,-Bdynamic -Wl,--as-needed
LV2LDFLAGS=-Wl,-Bstatic -Wl,-Bdynamic -Wl,--as-needed -pthread
LIB_EXT=.so
EXE_EXT=
UI_TYPE=ui:X11UI
PUGL_SRC=$(RW)pugl/pugl_x11.c
PKG_GL_LIBS=glu gl
GLUILIBS=-lX11
GLUICFLAGS+=`pkg-config --cflags glu`
GLUICFLAGS+=`pkg-config --cflags glu` -pthread
STRIPFLAGS=-s
EXTENDED_RE=-r
endif
......@@ -65,6 +65,7 @@ ifneq ($(XWIN),)
EXE_EXT=.exe
PUGL_SRC=$(RW)pugl/pugl_win.cpp
PKG_GL_LIBS=
UI_TYPE=ui:WindowsUI
GLUILIBS=-lws2_32 -lwinmm -lopengl32 -lglu32 -lgdi32 -lcomdlg32 -lpthread
BUILDGTK=no
GLUICFLAGS=-I.
......
......@@ -55,14 +55,14 @@ ifeq ($(UNAME),Darwin)
STRIPFLAGS=-u -r -arch all -s $(RW)lv2syms
EXTENDED_RE=-E
else
LV2LDFLAGS=-Wl,-Bstatic -Wl,-Bdynamic -Wl,--as-needed
LV2LDFLAGS=-Wl,-Bstatic -Wl,-Bdynamic -Wl,--as-needed -pthread
LIB_EXT=.so
EXE_EXT=
UI_TYPE=ui:X11UI
PUGL_SRC=$(RW)pugl/pugl_x11.c
PKG_GL_LIBS=glu gl
GLUILIBS=-lX11
GLUICFLAGS+=`pkg-config --cflags glu`
GLUICFLAGS+=`pkg-config --cflags glu` -pthread
STRIPFLAGS= -s
EXTENDED_RE=-r
endif
......@@ -76,7 +76,7 @@ ifneq ($(XWIN),)
EXE_EXT=.exe
PUGL_SRC=$(RW)pugl/pugl_win.cpp
PKG_GL_LIBS=
UI_TYPE=
UI_TYPE=ui:WindowsUI
GLUILIBS=-lws2_32 -lwinmm -lopengl32 -lglu32 -lgdi32 -lcomdlg32
GLUICFLAGS=-I.
override LDFLAGS += -static-libgcc -static-libstdc++
......@@ -331,6 +331,7 @@ clean:
rm -rf $(BUILDDIR)*.dSYM
rm -rf $(APPBLD)x42-*
rm -rf $(BUILDDIR)modgui
rm -f modgui/icon-stepseq.html modgui/style-stepseq.css modgui/box.png
-test -d $(APPBLD) && rmdir $(APPBLD) || true
-test -d $(BUILDDIR) && rmdir $(BUILDDIR) || true
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-STEPSEQ "1" "December 2016" "x42-stepseq version 0.4.0" "User Commands"
.TH X42-STEPSEQ "1" "April 2017" "x42-stepseq version 0.4.1" "User Commands"
.SH NAME
x42-stepseq \- x42 Step Sequencer
.SH SYNOPSIS
......
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH X42-TUNA "1" "December 2016" "x42-tuna version 0.4.2" "User Commands"
.TH X42-TUNA "1" "April 2017" "x42-tuna version 0.4.3" "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