Skip to content

Add last failed mask in settings as an option #149

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
glaba13 wants to merge 3 commits into
base: staging
Choose a base branch
from
Open

Add last failed mask in settings as an option #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66b223a
Add option to failed mask in settings
glaba13 May 28, 2019
0feb554
Add failed mask set
glaba13 May 28, 2019
b02c2f1
Remove empty loaded mask and hide option from preventing missing update
glaba13 May 29, 2019
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
13 changes: 9 additions & 4 deletions plugin/face-mask-filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Plugin::FaceMaskFilter::Instance::Instance(obs_data_t *data, obs_source_t *sourc
: source(source), canvasWidth(0), canvasHeight(0), baseWidth(640), baseHeight(480),
demoModeRecord(false), recordTriggered(false),
isActive(true), isVisible(true), videoTicked(true),
taskHandle(NULL),
taskHandle(NULL), failedMask(""),
introFilename(nullptr), outroFilename(nullptr), alertActivate(true), alertDoIntro(false),
alertDoOutro(false), alertDuration(10.0f),
alertElapsedTime(BIG_FLOAT), alertTriggered(false), alertShown(false), alertsLoaded(false),
Expand Down Expand Up @@ -394,6 +394,8 @@ void Plugin::FaceMaskFilter::Instance::get_defaults(obs_data_t *data) {

obs_data_set_default_string(data, P_BEFORE_TEXT, kDefaultBeforeText);
obs_data_set_default_string(data, P_AFTER_TEXT, kDefaultAfterText);
obs_data_set_default_string(data, P_FAILED_MASK, "");

#if !defined(PUBLIC_RELEASE)
// default advanced params
smll::Config::singleton().set_defaults(data);
Expand Down Expand Up @@ -558,7 +560,7 @@ void Plugin::FaceMaskFilter::Instance::get_properties(obs_properties_t *props) {
#if !defined(PUBLIC_RELEASE)
// mask
add_json_file_property(props, P_MASK_BROWSE, NULL);

//add_text_property(props, P_FAILED_MASK);
// ALERT PROPERTIES
add_bool_property(props, P_ALERT_ACTIVATE);
add_float_slider(props, P_ALERT_DURATION, 10.0f, 60.0f, 0.1f);
Expand Down Expand Up @@ -765,6 +767,8 @@ void Plugin::FaceMaskFilter::Instance::update(obs_data_t *data) {
beforeFile = (char*)obs_data_get_string(data, P_BEFORE);
afterText = (char*)obs_data_get_string(data, P_AFTER_TEXT);
afterFile = (char*)obs_data_get_string(data, P_AFTER);
// set last failed mask
obs_data_set_string(data, P_FAILED_MASK, failedMask.c_str());
}

void Plugin::FaceMaskFilter::Instance::activate(void *ptr) {
Expand Down Expand Up @@ -1772,7 +1776,7 @@ int32_t Plugin::FaceMaskFilter::Instance::LocalMaskDataThreadMain() {
}

// time to load intro?
if ((introData == nullptr) &&
/*if ((introData == nullptr) &&
introFilename && introFilename[0]) {
// save current
currentIntroFilename = introFilename;
Expand All @@ -1797,7 +1801,7 @@ int32_t Plugin::FaceMaskFilter::Instance::LocalMaskDataThreadMain() {
SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_BEGIN);
outroData = std::unique_ptr<Mask::MaskData>(LoadMask(maskFn));
SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_END);
}
}*/


// demo mode
Expand Down Expand Up @@ -1884,6 +1888,7 @@ Plugin::FaceMaskFilter::Instance::LoadMask(std::string filename) {
}
catch (...) {
PLOG_ERROR("Failed to load mask %s.", filename.c_str());
failedMask = filename;
}

return mdat;
Expand Down
1 change: 1 addition & 0 deletions plugin/face-mask-filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ namespace Plugin {
std::string maskFilePath;
std::string maskInternal;
std::string currentMaskFilename;
std::string failedMask;
const char* introFilename;
std::string currentIntroFilename;
const char* outroFilename;
Expand Down
1 change: 1 addition & 0 deletions plugin/strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

// Properties
#define P_MASK "Mask"
#define P_FAILED_MASK "failedMask"
#define P_MASK_BROWSE "Browse to mask"
#define P_BEFORE "Before Video"
#define P_AFTER "After Video"
Expand Down