Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
62628f80
Commit
62628f80
authored
Oct 19, 2015
by
Felix Paul Kühne
Browse files
vpc: always start and stop playback on the mainthread since setters may come from the background
parent
a493de4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Sources/VLCPlaybackController.m
View file @
62628f80
...
...
@@ -170,10 +170,10 @@ NSString *const VLCPlaybackControllerPlaybackDidFail = @"VLCPlaybackControllerPl
if
(
self
.
activePlaybackSession
)
{
self
.
sessionWillRestart
=
YES
;
[
self
stopPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
stopPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
else
{
self
.
sessionWillRestart
=
NO
;
[
self
startPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
startPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
}
...
...
@@ -185,10 +185,10 @@ NSString *const VLCPlaybackControllerPlaybackDidFail = @"VLCPlaybackControllerPl
if
(
self
.
activePlaybackSession
)
{
self
.
sessionWillRestart
=
YES
;
[
self
stopPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
stopPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
else
{
self
.
sessionWillRestart
=
NO
;
[
self
startPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
startPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
}
...
...
@@ -199,10 +199,10 @@ NSString *const VLCPlaybackControllerPlaybackDidFail = @"VLCPlaybackControllerPl
if
(
self
.
activePlaybackSession
)
{
self
.
sessionWillRestart
=
YES
;
[
self
stopPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
stopPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
else
{
self
.
sessionWillRestart
=
NO
;
[
self
startPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
startPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
}
...
...
@@ -372,7 +372,7 @@ NSString *const VLCPlaybackControllerPlaybackDidFail = @"VLCPlaybackControllerPl
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
VLCPlaybackControllerPlaybackDidStop
object
:
self
];
}
else
{
self
.
sessionWillRestart
=
NO
;
[
self
startPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
startPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
}
}
...
...
@@ -752,14 +752,14 @@ NSString *const VLCPlaybackControllerPlaybackDidFail = @"VLCPlaybackControllerPl
-
(
void
)
setUrl
:(
NSURL
*
)
url
{
[
self
stopPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
stopPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
_url
=
url
;
_playerIsSetup
=
NO
;
}
-
(
void
)
setMediaList
:(
VLCMediaList
*
)
mediaList
{
[
self
stopPlayback
];
[
self
performSelectorOnMainThread
:
@selector
(
stopPlayback
)
withObject
:
nil
waitUntilDone
:
NO
];
_mediaList
=
mediaList
;
_playerIsSetup
=
NO
;
}
...
...
Felix Paul Kühne
@fkuehne
mentioned in commit
9ff95208
·
Oct 19, 2015
mentioned in commit
9ff95208
mentioned in commit 9ff95208bd5c11f43e6fc30008d6b18d28cd25c5
Toggle commit list
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