Commit 9fb7a743 authored by Daksh Shah's avatar Daksh Shah

Code cleanup

parent 6d898712
...@@ -218,10 +218,6 @@ static const float f_min_window_height = 307.; ...@@ -218,10 +218,6 @@ static const float f_min_window_height = 307.;
// _fspanel = [[VLCFSPanelController alloc] init]; // _fspanel = [[VLCFSPanelController alloc] init];
// [_fspanel showWindow:self]; // [_fspanel showWindow:self];
// MAYBE HAVE A LOOK
// _draggablewvpanel = [[VLCFSPanelController alloc] init];
// [_draggablewvpanel showWindow:self];
/* make sure we display the desired default appearance when VLC launches for the first time */ /* make sure we display the desired default appearance when VLC launches for the first time */
if (![defaults objectForKey:@"VLCFirstRun"]) { if (![defaults objectForKey:@"VLCFirstRun"]) {
[defaults setObject:[NSDate date] forKey:@"VLCFirstRun"]; [defaults setObject:[NSDate date] forKey:@"VLCFirstRun"];
...@@ -576,10 +572,6 @@ static const float f_min_window_height = 307.; ...@@ -576,10 +572,6 @@ static const float f_min_window_height = 307.;
- (void)updateTimeSlider - (void)updateTimeSlider
{ {
[self.controlsBar updateTimeSlider]; [self.controlsBar updateTimeSlider];
// [self.fspanel updatePositionAndTime];
// msg_Err(getIntf(), "DAX WAS HERE #5 updateTimeSlider");
// [[[[VLCMain sharedInstance] voutProvider] fspanel] updatePositionAndTime];
// [self.draggablewvpanel updatePositionAndTime];
[self.draggableVideoController updatePositionAndTime]; [self.draggableVideoController updatePositionAndTime];
[[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) { [[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) {
...@@ -636,10 +628,6 @@ static const float f_min_window_height = 307.; ...@@ -636,10 +628,6 @@ static const float f_min_window_height = 307.;
[o_window setTitle:aString]; [o_window setTitle:aString];
}]; }];
// [self.fspanel setStreamTitle: aString];
// msg_Err(getIntf(), "DAX WAS HERE #6 setStreamTitle");
// [[[[VLCMain sharedInstance] voutProvider] fspanel] setStreamTitle: aString];
// [self.draggablewvpanel setStreamTitle: aString];
[self.draggableVideoController setStreamTitle: aString]; [self.draggableVideoController setStreamTitle: aString];
} else { } else {
...@@ -673,19 +661,10 @@ static const float f_min_window_height = 307.; ...@@ -673,19 +661,10 @@ static const float f_min_window_height = 307.;
} }
[self updateTimeSlider]; [self updateTimeSlider];
// if ([self.fspanel respondsToSelector:@selector(setSeekable:)])
// [self.fspanel setSeekable: b_seekable];
// if ([self.draggablewvpanel respondsToSelector:@selector(setSeekable:)])
// [self.draggablewvpanel setSeekable: b_seekable];
if ([self.draggableVideoController respondsToSelector:@selector(setSeekable:)]) if ([self.draggableVideoController respondsToSelector:@selector(setSeekable:)])
[self.draggableVideoController setSeekable: b_seekable]; [self.draggableVideoController setSeekable: b_seekable];
// msg_Err(getIntf(), "DAX WAS HERE #7 setSeekable");
// if ([ [ [[VLCMain sharedInstance] voutProvider] fspanel] respondsToSelector:@selector(setSeekable:) ])
// [[[[VLCMain sharedInstance] voutProvider] fspanel] setSeekable: b_seekable];
PL_LOCK; PL_LOCK;
if ([[[[VLCMain sharedInstance] playlist] model] currentRootType] != ROOT_TYPE_PLAYLIST || if ([[[[VLCMain sharedInstance] playlist] model] currentRootType] != ROOT_TYPE_PLAYLIST ||
[[[[VLCMain sharedInstance] playlist] model] hasChildren]) [[[[VLCMain sharedInstance] playlist] model] hasChildren])
...@@ -701,11 +680,6 @@ static const float f_min_window_height = 307.; ...@@ -701,11 +680,6 @@ static const float f_min_window_height = 307.;
- (void)setPause - (void)setPause
{ {
[self.controlsBar setPause]; [self.controlsBar setPause];
// [self.fspanel setPause];
// msg_Err(getIntf(), "DAX WAS HERE #8");
// [[[[VLCMain sharedInstance] voutProvider] fspanel] setPause];
// [self.draggablewvpanel setPause];
[self.draggableVideoController setPause]; [self.draggableVideoController setPause];
[[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) { [[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) {
...@@ -716,15 +690,8 @@ static const float f_min_window_height = 307.; ...@@ -716,15 +690,8 @@ static const float f_min_window_height = 307.;
- (void)setPlay - (void)setPlay
{ {
[self.controlsBar setPlay]; [self.controlsBar setPlay];
// [self.draggablewvpanel setPlay];
[self.draggableVideoController setPlay]; [self.draggableVideoController setPlay];
// [self.fspanel setPlay];
// [[[[VLCMain sharedInstance] voutProvider] fspanel] setPlay];
// msg_Err(getIntf(), "DAX WAS HERE #9");
[[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) { [[[VLCMain sharedInstance] voutProvider] updateControlsBarsUsingBlock:^(VLCControlsBarCommon *controlsBar) {
[controlsBar setPlay]; [controlsBar setPlay];
}]; }];
...@@ -733,14 +700,9 @@ static const float f_min_window_height = 307.; ...@@ -733,14 +700,9 @@ static const float f_min_window_height = 307.;
- (void)updateVolumeSlider - (void)updateVolumeSlider
{ {
[(VLCMainWindowControlsBar *)[self controlsBar] updateVolumeSlider]; [(VLCMainWindowControlsBar *)[self controlsBar] updateVolumeSlider];
// [self.fspanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
// [self.draggablewvpanel setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
[self.draggableVideoController setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]]; [self.draggableVideoController setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume]];
// msg_Err(getIntf(), "DAX WAS HERE #10 updateVolumeSlider");
// [[[[VLCMain sharedInstance] voutProvider] fspanel] setVolumeLevel:[[VLCCoreInteraction sharedInstance] volume] ];
} }
#pragma mark - #pragma mark -
...@@ -811,6 +773,7 @@ static const float f_min_window_height = 307.; ...@@ -811,6 +773,7 @@ static const float f_min_window_height = 307.;
if ([[VLCMain sharedInstance] activeVideoPlayback]) if ([[VLCMain sharedInstance] activeVideoPlayback])
msg_Err(getIntf(), "Placeholder for showFullscreenController"); msg_Err(getIntf(), "Placeholder for showFullscreenController");
// if ([[VLCMain sharedInstance] activeVideoPlayback]) // if ([[VLCMain sharedInstance] activeVideoPlayback])
// [self.fspanel fadeIn]; // [self.fspanel fadeIn];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment