Real Time setting menu in streamView beta
This commit is contained in:
commit
6f1773d512
4 files changed
+22
-2
No files matched your search
@@ -922,6 +922,7 @@ static NSMutableSet* hostList;
|
|||||||
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
|
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
|
||||||
if ([segue.destinationViewController isKindOfClass:[StreamFrameViewController class]]) {
|
if ([segue.destinationViewController isKindOfClass:[StreamFrameViewController class]]) {
|
||||||
StreamFrameViewController* streamFrame = segue.destinationViewController;
|
StreamFrameViewController* streamFrame = segue.destinationViewController;
|
||||||
|
streamFrame.mainframeViewcontroller = self;
|
||||||
streamFrame.streamConfig = _streamConfig;
|
streamFrame.streamConfig = _streamConfig;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,6 +199,11 @@ BOOL isCustomResolution(CGSize res) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
- (void)viewDidDisappear:(BOOL)animated{
|
||||||
|
[super viewDidDisappear:animated];
|
||||||
|
[[NSNotificationCenter defaultCenter] postNotificationName:@"SettingsViewClosed" object:self]; // notify other view that settings view just closed
|
||||||
|
}
|
||||||
|
|
||||||
- (void)viewDidLoad {
|
- (void)viewDidLoad {
|
||||||
justEnteredSettingsViewDoNotOpenOscLayoutTool = true;
|
justEnteredSettingsViewDoNotOpenOscLayoutTool = true;
|
||||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
#import "StreamConfiguration.h"
|
#import "StreamConfiguration.h"
|
||||||
#import "StreamView.h"
|
#import "StreamView.h"
|
||||||
#import "LayoutOnScreenControlsViewController.h"
|
#import "LayoutOnScreenControlsViewController.h"
|
||||||
|
#import "MainFrameViewController.h"
|
||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
@@ -22,6 +23,8 @@
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
@property (nonatomic) StreamConfiguration* streamConfig;
|
@property (nonatomic) StreamConfiguration* streamConfig;
|
||||||
|
@property (nonatomic, assign) MainFrameViewController *mainframeViewcontroller;
|
||||||
|
|
||||||
|
|
||||||
-(void)updatePreferredDisplayMode:(BOOL)streamActive;
|
-(void)updatePreferredDisplayMode:(BOOL)streamActive;
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,6 @@
|
|||||||
UIScrollView *_scrollView;
|
UIScrollView *_scrollView;
|
||||||
BOOL _userIsInteracting;
|
BOOL _userIsInteracting;
|
||||||
CGSize _keyboardSize;
|
CGSize _keyboardSize;
|
||||||
|
|
||||||
#if !TARGET_OS_TV
|
#if !TARGET_OS_TV
|
||||||
CustomEdgeSwipeGestureRecognizer *_exitSwipeRecognizer;
|
CustomEdgeSwipeGestureRecognizer *_exitSwipeRecognizer;
|
||||||
CustomTapGestureRecognizer *_oscLayoutTapRecoginizer;
|
CustomTapGestureRecognizer *_oscLayoutTapRecoginizer;
|
||||||
@@ -60,12 +59,20 @@
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)reConfigStreamView{
|
||||||
|
[_streamView setupStreamView:_controllerSupport interactionDelegate:self config:self.streamConfig];
|
||||||
|
}
|
||||||
|
|
||||||
- (void)viewDidAppear:(BOOL)animated
|
- (void)viewDidAppear:(BOOL)animated
|
||||||
{
|
{
|
||||||
[super viewDidAppear:animated];
|
[super viewDidAppear:animated];
|
||||||
|
|
||||||
#if !TARGET_OS_TV
|
#if !TARGET_OS_TV
|
||||||
[[self revealViewController] setPrimaryViewController:self];
|
[[self revealViewController] setPrimaryViewController:self];
|
||||||
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||||
|
selector:@selector(reConfigStreamView) // //force expand settings view to update resolution table, and all setting includes current fullscreen resolution will be updated.
|
||||||
|
name:@"SettingsViewClosed"
|
||||||
|
object:nil];
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,7 +143,7 @@
|
|||||||
[self.view addGestureRecognizer:_playPauseTapGestureRecognizer];
|
[self.view addGestureRecognizer:_playPauseTapGestureRecognizer];
|
||||||
|
|
||||||
#else
|
#else
|
||||||
_exitSwipeRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
|
_exitSwipeRecognizer = [[CustomEdgeSwipeGestureRecognizer alloc] initWithTarget:self action:@selector(expandSettingsView)];
|
||||||
_exitSwipeRecognizer.edges = _settings.swipeExitScreenEdge.intValue;
|
_exitSwipeRecognizer.edges = _settings.swipeExitScreenEdge.intValue;
|
||||||
_exitSwipeRecognizer.normalizedThresholdDistance = _settings.swipeToExitDistance.floatValue;
|
_exitSwipeRecognizer.normalizedThresholdDistance = _settings.swipeToExitDistance.floatValue;
|
||||||
_exitSwipeRecognizer.delaysTouchesBegan = NO;
|
_exitSwipeRecognizer.delaysTouchesBegan = NO;
|
||||||
@@ -412,6 +419,10 @@
|
|||||||
[self returnToMainFrame];
|
[self returnToMainFrame];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)expandSettingsView{
|
||||||
|
[self.mainframeViewcontroller simulateSettingsButtonPress];
|
||||||
|
}
|
||||||
|
|
||||||
- (void)edgeSwiped {
|
- (void)edgeSwiped {
|
||||||
Log(LOG_I, @"User swiped to end stream");
|
Log(LOG_I, @"User swiped to end stream");
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user