Skip to content

Adding getters and setters in VideoCaptureWrap #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Adding getters and setters in VideoCaptureWrap #559

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f800a09
Adding GetPosition, GetPositionMS, GetFPS, GetFourCC and renaming Get…
fakob Sep 10, 2017
215cf90
changing comment
fakob Sep 12, 2017
892e29f
Added GetFrameAt back in
fakob Oct 15, 2017
4fdedbf
added comment and getframe at in .h file
fakob Oct 15, 2017
aa51e08
Merge branch 'master' into adding-getters
fakob Oct 15, 2017
6855c81
removed duplicate method - getFPS
fakob Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
removed duplicate method - getFPS
  • Loading branch information
@fakob
fakob committed Oct 30, 2017
commit 6855c818f550a4905c2badb9eb2912865665cf07
12 changes: 1 addition & 11 deletions src/VideoCaptureWrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ void VideoCaptureWrap::Init(Local<Object> target) {
Nan::SetPrototypeMethod(ctor, "setPosition", SetPosition);
Nan::SetPrototypeMethod(ctor, "getFrameAt", GetFrameAt);
Nan::SetPrototypeMethod(ctor, "setPositionMS", SetPositionMS);
Nan::SetPrototypeMethod(ctor, "getFPS", GetFPS);
Nan::SetPrototypeMethod(ctor, "getFourCC", GetFourCC);
Nan::SetPrototypeMethod(ctor, "getFrameCount", GetFrameCount);
Nan::SetPrototypeMethod(ctor, "getFPS", GetFPS);
Expand Down Expand Up @@ -67,15 +66,6 @@ NAN_METHOD(VideoCaptureWrap::GetPositionMS) {
info.GetReturnValue().Set(Nan::New<Number>(cnt));
}

NAN_METHOD(VideoCaptureWrap::GetFPS) {
Nan::HandleScope scope;
VideoCaptureWrap *v = Nan::ObjectWrap::Unwrap<VideoCaptureWrap>(info.This());

int cnt = int(v->cap.get(CV_CAP_PROP_FPS));

info.GetReturnValue().Set(Nan::New<Number>(cnt));
}

NAN_METHOD(VideoCaptureWrap::GetFourCC) {
Nan::HandleScope scope;
VideoCaptureWrap *v = Nan::ObjectWrap::Unwrap<VideoCaptureWrap>(info.This());
Expand Down Expand Up @@ -163,7 +153,7 @@ NAN_METHOD(VideoCaptureWrap::GetFPS) {

int fps = int(v->cap.get(CV_CAP_PROP_FPS));

info.GetReturnValue().Set(Nan::New<Number>(fps));
info.GetReturnValue().Set(Nan::New<Number>(fps));
}


Expand Down