Correct the inspection of the JSON object in successful to look for both error and success objects, writing out an error string if neither are present. Revert error handling in readInput() for JSON.
| author |
Lucas Thompson <dev@lucas.im> |
| date |
Fri, 03 Feb 2017 11:12:27 +0000 |
| parents |
bf8e3e7dd7de |
| children |
3eb00e5c76c4 |
| 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
|
|
c@75
|
27 o/piper.capnp.o: vamp-capnp/piper.capnp.c++ vamp-capnp/piper.capnp.h
|
|
c@37
|
28 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@27
|
29
|
|
cannam@150
|
30 o/json11.o: ext/json11/json11.cpp
|
|
c@27
|
31 c++ $(CXXFLAGS) -c $< -o $@
|
|
c@27
|
32
|
|
c@75
|
33 o/convert.o: vamp-server/convert.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
|
|
c@23
|
34 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@23
|
35
|
|
c@125
|
36 o/simple-server.o: vamp-server/simple-server.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
|
|
c@31
|
37 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@31
|
38
|
|
c@8
|
39 test: all
|
|
cannam@150
|
40 vamp-server/test.sh
|
|
c@8
|
41
|
|
c@8
|
42 clean:
|
|
c@118
|
43 rm -f */*.o
|
|
c@8
|
44
|
|
c@8
|
45 distclean: clean
|
|
c@8
|
46 rm -f bin/*
|
|
c@8
|
47
|
|
c@70
|
48 # cancel implicit rule which otherwise could try to link %.capnp
|
|
c@70
|
49 %: %.o
|
