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
8cef6a55
Commit
8cef6a55
authored
Dec 20, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
library: fix artwork display when using a non-computed thumbnail
parent
815b4557
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
Sources/VLCPlaylistCollectionViewCell.m
Sources/VLCPlaylistCollectionViewCell.m
+11
-3
Sources/VLCPlaylistTableViewCell.m
Sources/VLCPlaylistTableViewCell.m
+11
-4
No files found.
Sources/VLCPlaylistCollectionViewCell.m
View file @
8cef6a55
...
...
@@ -75,22 +75,30 @@
MLFile
*
mediaObject
=
self
.
mediaObject
;
[
self
_configureForMLFile
:
mediaObject
];
if
(([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
&&
!
mediaObject
.
isAlbumTrack
)
{
if
(([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
])
)
{
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
mediaObject
];
}
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLAlbum
class
]])
{
MLAlbum
*
mediaObject
=
(
MLAlbum
*
)
self
.
mediaObject
;
[
self
_configureForAlbum
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
]))
{
MLFile
*
anyFileFromAnyTrack
=
[
mediaObject
.
tracks
.
anyObject
files
].
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromAnyTrack
];
}
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLAlbumTrack
class
]])
{
MLAlbumTrack
*
mediaObject
=
(
MLAlbumTrack
*
)
self
.
mediaObject
;
[
self
_configureForAlbumTrack
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
]))
{
MLFile
*
anyFileFromTrack
=
mediaObject
.
files
.
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromTrack
];
}
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLShow
class
]])
{
MLShow
*
mediaObject
=
(
MLShow
*
)
self
.
mediaObject
;
[
self
_configureForShow
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
{
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
])
)
{
MLFile
*
anyFileFromAnyEpisode
=
[
mediaObject
.
episodes
.
anyObject
files
].
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromAnyEpisode
];
}
...
...
@@ -98,7 +106,7 @@
MLShowEpisode
*
mediaObject
=
(
MLShowEpisode
*
)
self
.
mediaObject
;
[
self
_configureForShowEpisode
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
{
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
])
)
{
MLFile
*
anyFileFromEpisode
=
mediaObject
.
files
.
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromEpisode
];
}
...
...
Sources/VLCPlaylistTableViewCell.m
View file @
8cef6a55
...
...
@@ -89,31 +89,38 @@
MLFile
*
mediaObject
=
(
MLFile
*
)
self
.
mediaObject
;
[
self
_configureForMLFile
:
mediaObject
];
if
(([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
&&
!
mediaObject
.
isAlbumTrack
)
if
(([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
]))
)
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
mediaObject
];
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLAlbum
class
]])
{
MLAlbum
*
mediaObject
=
(
MLAlbum
*
)
self
.
mediaObject
;
[
self
_configureForAlbum
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
]))
{
MLFile
*
anyFileFromAnyTrack
=
[
mediaObject
.
tracks
.
anyObject
files
].
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromAnyTrack
];
}
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLAlbumTrack
class
]])
{
MLAlbumTrack
*
mediaObject
=
(
MLAlbumTrack
*
)
self
.
mediaObject
;
[
self
_configureForAlbumTrack
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
]))
{
MLFile
*
anyFileFromTrack
=
mediaObject
.
files
.
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromTrack
];
}
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLShow
class
]])
{
MLShow
*
mediaObject
=
(
MLShow
*
)
self
.
mediaObject
;
[
self
_configureForShow
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
{
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
])
)
{
MLFile
*
anyFileFromAnyEpisode
=
[
mediaObject
.
episodes
.
anyObject
files
].
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromAnyEpisode
];
}
}
else
if
([
self
.
mediaObject
isKindOfClass
:[
MLShowEpisode
class
]])
{
MLShowEpisode
*
mediaObject
=
(
MLShowEpisode
*
)
self
.
mediaObject
;
[
self
_configureForShowEpisode
:
mediaObject
];
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
)
{
if
([
keyPath
isEqualToString
:
@"computedThumbnail"
]
||
!
keyPath
||
(
!
self
.
thumbnailView
.
image
&&
[
keyPath
isEqualToString
:
@"editing"
])
)
{
MLFile
*
anyFileFromEpisode
=
mediaObject
.
files
.
anyObject
;
self
.
thumbnailView
.
image
=
[
VLCThumbnailsCache
thumbnailForMediaFile
:
anyFileFromEpisode
];
}
...
...
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