Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
7d490b50
Commit
7d490b50
authored
Jun 01, 2015
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics
(cherry picked from commit
5c6cd73a
)
parent
04bcb884
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
25 deletions
+4
-25
Sources/VLCPlayerDisplayController.h
Sources/VLCPlayerDisplayController.h
+0
-3
Sources/VLCPlayerDisplayController.m
Sources/VLCPlayerDisplayController.m
+3
-18
Sources/VLCPlaylistViewController.m
Sources/VLCPlaylistViewController.m
+0
-3
Sources/VLCSharedLibraryListViewController.m
Sources/VLCSharedLibraryListViewController.m
+1
-1
No files found.
Sources/VLCPlayerDisplayController.h
View file @
7d490b50
...
...
@@ -10,9 +10,6 @@
* Refer to the COPYING file of the official project for license.
*****************************************************************************/
#import <Foundation/Foundation.h>
@class
VLCPlaybackController
;
typedef
NS_ENUM
(
NSUInteger
,
VLCPlayerDisplayControllerDisplayMode
)
{
...
...
Sources/VLCPlayerDisplayController.m
View file @
7d490b50
...
...
@@ -27,19 +27,9 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
+
(
void
)
initialize
{
[[
NSUserDefaults
standardUserDefaults
]
registerDefaults
:
@{
VLCPlayerDisplayControllerDisplayModeKey
:
@
(
VLCPlayerDisplayControllerDisplayModeFullscreen
),
}];
[[
NSUserDefaults
standardUserDefaults
]
registerDefaults
:@{
VLCPlayerDisplayControllerDisplayModeKey
:
@
(
VLCPlayerDisplayControllerDisplayModeFullscreen
)}];
}
-
(
instancetype
)
init
{
self
=
[
super
init
];
if
(
self
)
{
}
return
self
;
}
static
inline
void
commonSetup
(
VLCPlayerDisplayController
*
self
)
{
NSNotificationCenter
*
notificationCenter
=
[
NSNotificationCenter
defaultCenter
];
...
...
@@ -124,8 +114,6 @@ static inline void commonSetup(VLCPlayerDisplayController *self)
return
_movieViewController
;
}
#pragma mark - Notification Handling
-
(
void
)
playbackDidStart
:(
NSNotification
*
)
notification
...
...
@@ -168,12 +156,12 @@ static inline void commonSetup(VLCPlayerDisplayController *self)
}
#pragma mark - presentation handling
-
(
BOOL
)
shouldAnimate
{
return
[[
UIApplication
sharedApplication
]
applicationState
]
!=
UIApplicationStateBackground
;
}
-
(
void
)
dismissPlaybackView
{
switch
(
self
.
displayMode
)
{
...
...
@@ -205,9 +193,8 @@ static inline void commonSetup(VLCPlayerDisplayController *self)
}
}
#pragma mark - fullscreen player
-
(
void
)
_presentFullscreenPlaybackViewIfNeeded
{
if
(
!
self
.
movieViewController
.
presentingViewController
)
{
...
...
@@ -236,10 +223,8 @@ static inline void commonSetup(VLCPlayerDisplayController *self)
#pragma mark - miniplayer
-
(
void
)
_showHideMiniPlaybackView
{
VLCPlaybackController
*
playbackController
=
[
VLCPlaybackController
sharedInstance
];
VLCMiniPlaybackView
*
miniPlaybackView
=
self
.
miniPlaybackView
;
const
NSTimeInterval
animationDuration
=
0
.
25
;
...
...
Sources/VLCPlaylistViewController.m
View file @
7d490b50
...
...
@@ -1569,9 +1569,6 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData";
NSUInteger
substringCount
=
substrings
.
count
;
NSUInteger
searchStringCount
=
stringsToSearch
.
count
;
NSLog
(
@"substrings: %@"
,
substrings
);
NSLog
(
@"strings to search %@"
,
stringsToSearch
);
for
(
NSUInteger
x
=
0
;
x
<
substringCount
;
x
++
)
{
for
(
NSUInteger
y
=
0
;
y
<
searchStringCount
;
y
++
)
{
nameRange
=
[
stringsToSearch
[
y
]
rangeOfString
:
substrings
[
x
]
options
:
NSCaseInsensitiveSearch
];
...
...
Sources/VLCSharedLibraryListViewController.m
View file @
7d490b50
...
...
@@ -252,7 +252,7 @@
-
(
void
)
_downloadFileFromMediaItem
:(
NSURL
*
)
itemURL
{
NS
Log
(
@"trying to download %@"
,
[
itemURL
absoluteString
]);
AP
Log
(
@"trying to download %@"
,
[
itemURL
absoluteString
]);
if
(
!
[[
itemURL
absoluteString
]
isSupportedFormat
])
{
UIAlertView
*
alert
=
[[
UIAlertView
alloc
]
initWithTitle
:
NSLocalizedString
(
@"FILE_NOT_SUPPORTED"
,
nil
)
message
:[
NSString
stringWithFormat
:
NSLocalizedString
(
@"FILE_NOT_SUPPORTED_LONG"
,
nil
),
[
itemURL
absoluteString
]]
delegate
:
self
cancelButtonTitle
:
NSLocalizedString
(
@"BUTTON_CANCEL"
,
nil
)
otherButtonTitles
:
nil
];
[
alert
show
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment