Pull step & block size out into framing struct, return in config
Update the C++ code to separate out the framing parameters (step and
block size) from the configuration structure into their own structure,
as in the latest schema, and to return the accepted framing params in
the configuration response.
This also implies that the plugin stub (which adapts Piper API
back to Vamp) makes a note of the returned values,
making them available via its own getPreferredStep/BlockSize
so that the host can retry the initialise call in the case where it
failed for having the wrong values first time.
| author |
Chris Cannam <cannam@all-day-breakfast.com> |
| date |
Fri, 03 Feb 2017 16:23:21 +0000 |
| parents |
bf8e3e7dd7de |
| children |
70b0f1f9e039 |
| rev |
line source |
|
c@75
|
1
|
|
c@75
|
2 VAMPSDK_DIR := ../vamp-plugin-sdk
|
|
c@75
|
3 PIPER_DIR := ../piper
|
|
c@8
|
4
|
|
c@103
|
5 CXXFLAGS := -Wall -Wextra -Werror -g3 -std=c++11
|
|
cannam@150
|
6 INCFLAGS := -Iext -I$(VAMPSDK_DIR) -I. -I/usr/local/include
|
|
c@116
|
7
|
|
c@118
|
8 #LDFLAGS := -L$(VAMPSDK_DIR) -L/usr/local/lib -lvamp-hostsdk -lcapnp -lkj
|
|
c@118
|
9 LDFLAGS := $(VAMPSDK_DIR)/libvamp-hostsdk.a -lcapnp -lkj
|
|
c@116
|
10
|
|
c@116
|
11 LDFLAGS += -ldl
|
|
c@8
|
12
|
|
c@125
|
13 all: o bin bin/piper-convert bin/piper-vamp-simple-server
|
|
c@32
|
14
|
|
c@75
|
15 bin:
|
|
c@75
|
16 mkdir bin
|
|
c@23
|
17
|
|
c@75
|
18 o:
|
|
c@75
|
19 mkdir o
|
|
c@75
|
20
|
|
c@75
|
21 bin/piper-convert: o/convert.o o/json11.o o/piper.capnp.o
|
|
c@23
|
22 c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
|
|
c@8
|
23
|
|
c@125
|
24 bin/piper-vamp-simple-server: o/simple-server.o o/json11.o o/piper.capnp.o
|
|
c@31
|
25 c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
|
|
c@31
|
26
|
|
cannam@185
|
27 o/piper.capnp.o: vamp-capnp/piper.capnp.c++
|
|
c@37
|
28 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@27
|
29
|
|
cannam@185
|
30 vamp-capnp/piper.capnp.h: vamp-capnp/piper.capnp.c++
|
|
cannam@185
|
31
|
|
cannam@185
|
32 vamp-capnp/piper.capnp.c++: $(PIPER_DIR)/capnp/piper.capnp
|
|
cannam@185
|
33 capnpc --src-prefix=$(PIPER_DIR)/capnp -oc++:vamp-capnp $<
|
|
cannam@185
|
34
|
|
cannam@150
|
35 o/json11.o: ext/json11/json11.cpp
|
|
c@27
|
36 c++ $(CXXFLAGS) -c $< -o $@
|
|
c@27
|
37
|
|
c@75
|
38 o/convert.o: vamp-server/convert.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
|
|
c@23
|
39 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@23
|
40
|
|
c@125
|
41 o/simple-server.o: vamp-server/simple-server.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
|
|
c@31
|
42 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@31
|
43
|
|
c@8
|
44 test: all
|
|
cannam@150
|
45 vamp-server/test.sh
|
|
c@8
|
46
|
|
c@8
|
47 clean:
|
|
c@118
|
48 rm -f */*.o
|
|
c@8
|
49
|
|
c@8
|
50 distclean: clean
|
|
c@8
|
51 rm -f bin/*
|
|
c@8
|
52
|
|
c@70
|
53 # cancel implicit rule which otherwise could try to link %.capnp
|
|
c@70
|
54 %: %.o
|
