add statsOverlay realtime setting config
This commit is contained in:
1 parent
56fc18c378
commit
b25f2d0916
2 files changed
+14
-2
No files matched your search
@@ -906,6 +906,7 @@ static NSMutableSet* hostList;
|
|||||||
// If we moved back to the center position, we should save the settings
|
// If we moved back to the center position, we should save the settings
|
||||||
SettingsViewController* settingsViewController = (SettingsViewController*)[revealController rearViewController];
|
SettingsViewController* settingsViewController = (SettingsViewController*)[revealController rearViewController];
|
||||||
settingsViewController.mainFrameViewController = self;
|
settingsViewController.mainFrameViewController = self;
|
||||||
|
|
||||||
// enable / disable widgets acoordingly: in streamview, disable, outside of streamview, enable.
|
// enable / disable widgets acoordingly: in streamview, disable, outside of streamview, enable.
|
||||||
[settingsViewController.resolutionSelector setEnabled:!self.settingsExpandedInStreamView];
|
[settingsViewController.resolutionSelector setEnabled:!self.settingsExpandedInStreamView];
|
||||||
[settingsViewController.framerateSelector setEnabled:!self.settingsExpandedInStreamView];
|
[settingsViewController.framerateSelector setEnabled:!self.settingsExpandedInStreamView];
|
||||||
@@ -916,7 +917,6 @@ static NSMutableSet* hostList;
|
|||||||
[settingsViewController.framePacingSelector setEnabled:!self.settingsExpandedInStreamView];
|
[settingsViewController.framePacingSelector setEnabled:!self.settingsExpandedInStreamView];
|
||||||
[settingsViewController.btMouseSelector setEnabled:!self.settingsExpandedInStreamView];
|
[settingsViewController.btMouseSelector setEnabled:!self.settingsExpandedInStreamView];
|
||||||
|
|
||||||
|
|
||||||
if (position == FrontViewPositionLeft) {
|
if (position == FrontViewPositionLeft) {
|
||||||
[settingsViewController saveSettings];
|
[settingsViewController saveSettings];
|
||||||
_settingsButton.enabled = YES; // make sure these 2 buttons are enabled after closing setting view.
|
_settingsButton.enabled = YES; // make sure these 2 buttons are enabled after closing setting view.
|
||||||
|
|||||||
@@ -107,6 +107,13 @@
|
|||||||
[_streamView setupStreamView:_controllerSupport interactionDelegate:self config:self.streamConfig]; //reinitiate setupStreamView process.
|
[_streamView setupStreamView:_controllerSupport interactionDelegate:self config:self.streamConfig]; //reinitiate setupStreamView process.
|
||||||
[self->_streamView reloadOnScreenControlsRealtimeWith:(ControllerSupport*)_controllerSupport
|
[self->_streamView reloadOnScreenControlsRealtimeWith:(ControllerSupport*)_controllerSupport
|
||||||
andConfig:(StreamConfiguration*)_streamConfig]; //reload OSC here.
|
andConfig:(StreamConfiguration*)_streamConfig]; //reload OSC here.
|
||||||
|
|
||||||
|
//reconfig statsOverlay
|
||||||
|
self->_statsUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:1.0f
|
||||||
|
target:self
|
||||||
|
selector:@selector(updateStatsOverlay)
|
||||||
|
userInfo:nil
|
||||||
|
repeats:_settings.statsOverlay];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -337,8 +344,13 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
- (void)updateStatsOverlay {
|
- (void)updateStatsOverlay {
|
||||||
NSString* overlayText = [self->_streamMan getStatsOverlayText];
|
if(!_settings.statsOverlay){
|
||||||
|
[_overlayView removeFromSuperview];
|
||||||
|
return; // add this for realtime streamview reconfig
|
||||||
|
}
|
||||||
|
else [self.view addSubview:_overlayView]; // don't know why but this is necessary for reactivating overlay.
|
||||||
|
|
||||||
|
NSString* overlayText = [self->_streamMan getStatsOverlayText];
|
||||||
dispatch_async(dispatch_get_main_queue(), ^{
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
[self updateOverlayText:overlayText];
|
[self updateOverlayText:overlayText];
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user