Skip to content
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.

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

Feature/fly and pattern feedback #255

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b623f16
Updating release process and notes
SteffeyDev Nov 15, 2021
372d226
No reason for having a 64bit big endian rather an int for the feedbac…
reno- Feb 15, 2022
f4c2e38
Add OSC receivers for usk mask
reno- Mar 1, 2022
95d89de
add Feedback for USK mask
reno- Mar 2, 2022
e6afffa
Fix on-air feedback for USK that was not including <me> instance in t…
reno- Mar 2, 2022
14593ca
add to the UpstreamKeyerMonitor::sendStatus function, for consistency
reno- Mar 10, 2022
f898669
Fix spaces, must be tab
reno- Mar 10, 2022
3d1a041
Mask Parameters are now accessible with OSC messages
reno- Mar 10, 2022
b70f465
implement Feedback for UpStream Flying Keyer
reno- Mar 21, 2022
83fc26b
Implement feedback for pattern parameters
reno- Mar 21, 2022
1f55f38
Fix, declare function that cannot be forget
reno- Mar 21, 2022
b6ee2cf
forget to commit that a few hours ago
reno- Mar 21, 2022
60f9aeb
some copy / paste that has not been corectly done
reno- Mar 21, 2022
43aa953
GetPattern is not a Keyer call
reno- Mar 22, 2022
78d6dd3
Fix build issue thanks to @SteffeyDev
reno- Mar 23, 2022
04d2b5e
Merge branch 'master' into feature/FlyAndPattern-feedback
Sep 19, 2022
8985b9f
Fix copy/paste error, for softness param of the pattern
Sep 19, 2022
d8ef527
no message
Sep 19, 2022
7905b59
Fix bad copy/paste from size to pos for Fly parameters
Sep 19, 2022
9fea1e8
Fix pos / position ortograph
Sep 19, 2022
d4f215f
add Feedback For rotation parameter of Flying Key
Sep 19, 2022
a1371ce
update Feedback Info
Sep 19, 2022
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ By default, commands will be sent to the first mix effect block (M/E). To send

Where `$i` can be 1, 2, 3, or 4 depending on the capability of your ATEM switcher

Feedback: Enabled for '/atem/usk/$i/on-air', '/atem/usk/$i/tie', '/atem/usk/$i/source/\*', '/atem/usk/$i/luma/\*', and '/atem/usk/$i/chroma/\*'
Feedback: Enabled

### Downstream Keyers

Expand Down
43 changes: 43 additions & 0 deletions atemOSC/FeedbackMonitors.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,28 @@ class UpstreamKeyerLumaParametersMonitor : public GenericMonitor<IBMDSwitcherKey
int me_;
};

class UpstreamKeyerFlyParametersMonitor : public GenericMonitor<IBMDSwitcherKeyFlyParametersCallback>, public SendStatusInterface
{
public:
UpstreamKeyerFlyParametersMonitor(Switcher *switcher, int me) : GenericMonitor(switcher), me_(me) { }
HRESULT Notify(BMDSwitcherKeyFlyParametersEventType eventType, BMDSwitcherFlyKeyFrame keyFrame);
float sendStatus() const;

protected:
virtual ~UpstreamKeyerFlyParametersMonitor() { }

private:
void updateUSKFlyedParameter() const;
void updateUSKCanFlyParameter() const;
void updateUSKFlyRateParameter() const;
void updateUSKFlySizeXParameter() const;
void updateUSKFlySizeYParameter() const;
void updateUSKFlyPositionXParameter() const;
void updateUSKFlyPositionYParameter() const;
void updateUSKFlyRotationParameter() const;
int me_;
};

class UpstreamKeyerChromaParametersMonitor : public GenericMonitor<IBMDSwitcherKeyChromaParametersCallback>, public SendStatusInterface
{
public:
Expand All @@ -165,6 +187,27 @@ class UpstreamKeyerChromaParametersMonitor : public GenericMonitor<IBMDSwitcherK
int me_;
};

class UpstreamKeyerPatternParametersMonitor : public GenericMonitor<IBMDSwitcherKeyPatternParametersCallback>, public SendStatusInterface
{
public:
UpstreamKeyerPatternParametersMonitor(Switcher *switcher, int me) : GenericMonitor(switcher), me_(me) { }
HRESULT Notify (BMDSwitcherKeyPatternParametersEventType eventType);
float sendStatus() const;

protected:
virtual ~UpstreamKeyerPatternParametersMonitor() { }

private:
void updateUSKPatternStyleParameter() const;
void updateUSKPatternSizeParameter() const;
void updateUSKPatternSymmetryParameter() const;
void updateUSKPatternInverseParameter() const;
void updateUSKPatternSoftnessParameter() const;
void updateUSKPatternHorizontalOffsetParameter() const;
void updateUSKPatternVerticalOffsetParameter() const;
int me_;
};

class TransitionParametersMonitor : public GenericMonitor<IBMDSwitcherTransitionParametersCallback>, public SendStatusInterface
{
public:
Expand Down
Loading