提交 db51b479 authored 作者: bruce.lu's avatar bruce.lu

init

上级 8b84f720
...@@ -39,8 +39,9 @@ evmlmotion: evmlmotion.cpp inc/common.hpp inc/avcvhelpers.hpp inc/database.h inc ...@@ -39,8 +39,9 @@ evmlmotion: evmlmotion.cpp inc/common.hpp inc/avcvhelpers.hpp inc/database.h inc
evdaemon: evdaemon.cpp inc/common.hpp inc/database.h inc/zmqhelper.hpp inc/tinythread.hpp database.cpp evdaemon: evdaemon.cpp inc/common.hpp inc/database.h inc/zmqhelper.hpp inc/tinythread.hpp database.cpp
$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evdaemon evdaemon.cpp database.cpp $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS) $(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evdaemon evdaemon.cpp database.cpp $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS)
evcloudsvc: evcloudsvc.cpp inc/utils.hpp inc/database.h inc/zmqhelper.hpp inc/tinythread.hpp database.cpp evcloudsvc: evcloudsvc.cpp inc/utils.hpp inc/database.h inc/zmqhelper.hpp inc/tinythread.hpp database.cpp
$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evcloudsvc evcloudsvc.cpp inc/utils.hpp database.cpp $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS) $(CPP) $(CPPFLAGS) $(LD_FLAGS) -o evcloudsvc evcloudsvc.cpp database.cpp $(SQLITE) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS)
rtspr: rtsp-relay.cpp rtspr: rtsp-relay.cpp
$(CPP) $(CPPFLAGS) $(LD_FLAGS) -o rtspr rtsp-relay.cpp $(LIBFFMPEG) $(LD_FLAGS) $(CPP) $(CPPFLAGS) $(LD_FLAGS) -o rtspr rtsp-relay.cpp $(LIBFFMPEG) $(LD_FLAGS)
...@@ -53,7 +54,7 @@ mux: demuxing_decoding.c ...@@ -53,7 +54,7 @@ mux: demuxing_decoding.c
.PHONY: clean .PHONY: clean
clean: clean:
rm -fr evmgr evpuller evpusher evslicer evmlmotion evdaemon *.dSYM *.out *.o rm -fr evmgr evpuller evpusher evslicer evmlmotion evdaemon evcloudsvc *.dSYM *.out *.o
.PHONY: zmq .PHONY: zmq
zmq: zmq:
......
...@@ -300,7 +300,7 @@ togo_end: ...@@ -300,7 +300,7 @@ togo_end:
return 0; return 0;
} }
int setValue(json &value, string key, string fileName, cb_verify_json cb) { int setValue(const json &value, string key, string fileName, cb_verify_json cb) {
int ret = 0; int ret = 0;
if(cb != NULL) { if(cb != NULL) {
ret = cb(value); ret = cb(value);
......
...@@ -138,7 +138,6 @@ class HttpSrv{ ...@@ -138,7 +138,6 @@ class HttpSrv{
LVDB::setValue(this->configMap, "configmap"); LVDB::setValue(this->configMap, "configmap");
} }
// TODO: restart other components // TODO: restart other components
// //
}catch(exception &e) { }catch(exception &e) {
...@@ -153,7 +152,7 @@ class HttpSrv{ ...@@ -153,7 +152,7 @@ class HttpSrv{
}); });
svr.listen("0.0.0.0", 8088); svr.listen("0.0.0.0", 8089);
} }
HttpSrv(){ HttpSrv(){
...@@ -163,5 +162,6 @@ class HttpSrv{ ...@@ -163,5 +162,6 @@ class HttpSrv{
}; };
int main() { int main() {
HttpSrv srv;
srv.run();
} }
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论