Aux refactor, #194 sending aux feedback

SteffeyDev · Mar 6, 2021 · de6b4fe · de6b4fe
1 parent a1e817b
commit de6b4fe
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 14 deletions.
diff --git a/atemOSC/FeedbackMonitors.h b/atemOSC/FeedbackMonitors.h
@@ -76,6 +76,21 @@ class InputMonitor : public GenericMonitor<IBMDSwitcherInputCallback>, public Se
 	BMDSwitcherInputId  inputId_;
 };
 
+class InputAuxMonitor : public GenericMonitor<IBMDSwitcherInputAuxCallback>, public SendStatusInterface
+{
+public:
+	InputAuxMonitor(Switcher *switcher, BMDSwitcherInputId inputId) : GenericMonitor(switcher), inputId_(inputId) { }
+	HRESULT Notify(BMDSwitcherInputAuxEventType eventType);
+	float sendStatus() const;
+
+protected:
+	virtual ~InputAuxMonitor() { }
+
+private:
+	void updateInputSource() const;
+	BMDSwitcherInputId  inputId_;
+};
+
 class DownstreamKeyerMonitor : public GenericMonitor<IBMDSwitcherDownstreamKeyCallback>, public SendStatusInterface
 {
 public:

diff --git a/atemOSC/FeedbackMonitors.mm b/atemOSC/FeedbackMonitors.mm
@@ -224,6 +224,37 @@
 	return 0.1;
 }
 
+HRESULT InputAuxMonitor::Notify(BMDSwitcherInputAuxEventType eventType)
+{
+	switch (eventType)
+	{
+		case bmdSwitcherInputAuxEventTypeInputSourceChanged:
+			updateInputSource();
+			break;
+		default:
+			// ignore other property changes not used for this app
+			break;
+	}
+	return S_OK;
+}
+
+void InputAuxMonitor::updateInputSource() const
+{
+	if (switcher.mAuxInputs.count(inputId_) > 0)
+	{
+		BMDSwitcherInputId source;
+		switcher.mAuxInputs[inputId_]->GetInputSource(&source);
+		sendFeedbackMessage(switcher, [NSString stringWithFormat:@"/aux/%lld", inputId_], [OSCValue createWithLongLong:source]);
+	}
+}
+
+float InputAuxMonitor::sendStatus() const
+{
+	updateInputSource();
+
+	return 0.02;
+}
+
 // Send OSC messages out when DSK Tie is changed on switcher
 void DownstreamKeyerMonitor::updateDSKTie() const
 {

diff --git a/atemOSC/OSCAddressView.mm b/atemOSC/OSCAddressView.mm
@@ -236,11 +236,13 @@ - (void)loadFromSwitcher:(Switcher *)switcher
 	}
 
 	[self addHeader:@"Aux Outputs" toString:helpString];
-	for (int i = 0; i<[switcher mSwitcherInputAuxList].size();i++)
+	for (auto const& it : [switcher mAuxInputs])
+	{
 		[self
-		 addEntry:[NSString stringWithFormat:@"Set Aux %d to Source",i+1]
-		 forAddress:[NSString stringWithFormat:@"/aux/%d\t<valid_program_source>",i+1]
+		 addEntry:[NSString stringWithFormat:@"Set Aux %lld to Source",it.first]
+		 forAddress:[NSString stringWithFormat:@"/aux/%lld\t<valid_program_source>",it.first]
 		 toString:helpString];
+	}		
 
 	if ([switcher mMediaPlayers].size() > 0)
 	{

diff --git a/atemOSC/OSCReceiver.mm b/atemOSC/OSCReceiver.mm
@@ -127,8 +127,8 @@ - (instancetype) initWithDelegate:(AppDelegate *) delegate
 	} copy] forKey:@"/supersource"];
 
 	[validators setObject:[^bool(Switcher *s, NSDictionary *d, OSCValue *v) {
-		int auxToChange = [[d objectForKey:@"<key>"] intValue];
-		if (auxToChange > 0 && auxToChange-1 < [s mSwitcherInputAuxList].size())
+		int auxToChange = [[d objectForKey:@"<number>"] intValue];
+		if ([s mAuxInputs].count(auxToChange) > 0)
 			return true;
 		[weakAppDel logMessage:[NSString stringWithFormat:@"Aux number %d not available on your switcher", auxToChange]];
 		return false;
@@ -663,10 +663,10 @@ - (instancetype) initWithDelegate:(AppDelegate *) delegate
 		[[s outPort] sendThisMessage:newMsg];
 	}];
 
-	[self addEndpoint:@"/aux/<key>" valueType:OSCValInt handler:^void(Switcher *s, NSDictionary *d, OSCValue *v) {
-		int auxToChange = [[d objectForKey:@"<key>"] intValue];
+	[self addEndpoint:@"/aux/<number>" valueType:OSCValInt handler:^void(Switcher *s, NSDictionary *d, OSCValue *v) {
+		int auxToChange = [[d objectForKey:@"<number>"] intValue];
 		BMDSwitcherInputId inputId = [v intValue];
-		[s mSwitcherInputAuxList][auxToChange-1]->SetInputSource(inputId);
+		[s mAuxInputs][auxToChange]->SetInputSource(inputId);
 	}];
 
 	[self addEndpoint:@"/audio/input/<number>/gain" valueType:OSCValFloat handler:^void(Switcher *s, NSDictionary *d, OSCValue *v) {

diff --git a/atemOSC/Switcher.h b/atemOSC/Switcher.h
@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface Switcher : NSObject<NSCoding>
 {
 	std::map<BMDSwitcherInputId, InputMonitor*>			mInputMonitors;
+	std::map<BMDSwitcherInputId, InputAuxMonitor*>			mAuxInputMonitors;
 	SwitcherMonitor*			        				mSwitcherMonitor;
 	std::map<BMDSwitcherHyperDeckId, HyperDeckMonitor*> mHyperdeckMonitors;
 	DownstreamKeyerMonitor*             				mDownstreamKeyerMonitor;
@@ -61,8 +62,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly)       std::map<int, std::vector<IBMDSwitcherKey*> > keyers;
 @property (readonly)       std::vector<IBMDSwitcherSuperSourceBox*> mSuperSourceBoxes;
 @property (readonly)       std::map<BMDSwitcherInputId, IBMDSwitcherInput*> mInputs;
+@property (readonly)       std::map<BMDSwitcherInputId, IBMDSwitcherInputAux*> mAuxInputs;
 @property (readonly)       std::map<BMDSwitcherHyperDeckId, IBMDSwitcherHyperDeck*> mHyperdecks;
-@property (readonly)       std::vector<IBMDSwitcherInputAux*>       mSwitcherInputAuxList;
 @property (readonly)       IBMDSwitcherInputSuperSource*            mSuperSource;
 @property (readonly)       IBMDSwitcherMacroPool*                   mMacroPool;
 @property (readonly)       IBMDSwitcherMacroControl*                mMacroControl;

diff --git a/atemOSC/Switcher.mm b/atemOSC/Switcher.mm
@@ -38,7 +38,7 @@ @implementation Switcher
 @synthesize mMacroControl;
 @synthesize mSuperSourceBoxes;
 @synthesize mInputs;
-@synthesize mSwitcherInputAuxList;
+@synthesize mAuxInputs;
 
 @synthesize mAudioInputs;
 @synthesize mAudioMixer;
@@ -341,7 +341,12 @@ - (void)switcherConnected
 				result = auxObj->GetInputSource(&auxId);
 				if (SUCCEEDED(result))
 				{
-					mSwitcherInputAuxList.push_back(auxObj);
+					unsigned long index = mAuxInputs.size()+1;
+					mAuxInputs.insert(std::make_pair(index, auxObj));
+					InputAuxMonitor *monitor = new InputAuxMonitor(self, index);
+					auxObj->AddCallback(monitor);
+					mMonitors.push_back(monitor);
+					mAuxInputMonitors.insert(std::make_pair(index, monitor));
 				}
 			}
 
@@ -688,11 +693,13 @@ - (void)cleanUpConnection
 	mInputs.clear();
 	mInputMonitors.clear();
 
-	while (mSwitcherInputAuxList.size())
+	for (auto const& it : mAuxInputs)
 	{
-		mSwitcherInputAuxList.back()->Release();
-		mSwitcherInputAuxList.pop_back();
+		it.second->RemoveCallback(mAuxInputMonitors.at(it.first));
+		it.second->Release();
 	}
+	mAuxInputs.clear();
+	mAuxInputMonitors.clear();
 
 
 	while (dsk.size())