Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
4ea2ec4b
Commit
4ea2ec4b
authored
Jan 16, 2010
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/framework: Whitespaces cleanup.
parent
5aa0d7fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
17 deletions
+18
-17
projects/macosx/framework/Sources/VLCMedia.m
projects/macosx/framework/Sources/VLCMedia.m
+18
-17
No files found.
projects/macosx/framework/Sources/VLCMedia.m
View file @
4ea2ec4b
...
...
@@ -174,20 +174,20 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
}
-
(
id
)
initWithURL
:(
NSURL
*
)
anURL
{
{
if
(
self
=
[
super
init
])
{
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
p_md
=
libvlc_media_new
([
VLCLibrary
sharedInstance
],
[[
anURL
absoluteString
]
UTF8String
],
&
ex
);
catch_exception
(
&
ex
);
delegate
=
nil
;
metaDictionary
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
3
];
// This value is set whenever the demuxer figures out what the length is.
// TODO: Easy way to tell the length of the movie without having to instiate the demuxer. Maybe cached info?
length
=
nil
;
...
...
@@ -198,12 +198,12 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
}
-
(
id
)
initAsNodeWithName
:(
NSString
*
)
aName
{
{
if
(
self
=
[
super
init
])
{
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
p_md
=
libvlc_media_new_as_node
([
VLCLibrary
sharedInstance
],
[
aName
UTF8String
],
&
ex
);
...
...
@@ -211,11 +211,11 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
delegate
=
nil
;
metaDictionary
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
3
];
// This value is set whenever the demuxer figures out what the length is.
// TODO: Easy way to tell the length of the movie without having to instiate the demuxer. Maybe cached info?
length
=
nil
;
[
self
initInternalMediaDescriptor
];
}
return
self
;
...
...
@@ -275,11 +275,11 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
-
(
VLCTime
*
)
length
{
if
(
!
length
)
if
(
!
length
)
{
// Try figuring out what the length is
long
long
duration
=
libvlc_media_get_duration
(
p_md
,
NULL
);
if
(
duration
>
-
1
)
if
(
duration
>
-
1
)
{
[
self
setLength
:[
VLCTime
timeWithNumber
:[
NSNumber
numberWithLongLong
:
duration
]]];
return
[[
length
retain
]
autorelease
];
...
...
@@ -342,14 +342,14 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
{
libvlc_media_retain
(
md
);
p_md
=
md
;
metaDictionary
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
3
];
[
self
initInternalMediaDescriptor
];
}
return
self
;
}
-
(
void
*
)
libVLCMediaDescriptor
-
(
void
*
)
libVLCMediaDescriptor
{
return
p_md
;
}
...
...
@@ -473,7 +473,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
// Only fetch the art if needed. (ie, create the NSImage, if it was requested before)
if
(
isArtFetched
&&
[
metaType
isEqualToString
:
VLCMetaInformationArtworkURL
])
{
[
NSThread
detachNewThreadSelector
:
@selector
(
fetchMetaInformationForArtWorkWithURL
:)
[
NSThread
detachNewThreadSelector
:
@selector
(
fetchMetaInformationForArtWorkWithURL
:)
toTarget:
self
withObject:
newValue
];
}
...
...
@@ -494,7 +494,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
// Don't attempt to fetch artwork from remote. Core will do that alone
if
([
artUrl
isFileURL
])
art
=
[[[
NSImage
alloc
]
initWithContentsOfURL
:
artUrl
]
autorelease
];
art
=
[[[
NSImage
alloc
]
initWithContentsOfURL
:
artUrl
]
autorelease
];
}
// If anything was found, lets save it to the meta data dictionary
...
...
@@ -553,6 +553,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
/* Force VLCMetaInformationTitle, that will trigger preparsing
* And all the other meta will be added through the libvlc event system */
[
self
fetchMetaInformationFromLibVLCWithType
:
VLCMetaInformationTitle
];
}
else
if
(
!
isArtURLFetched
&&
[
keyPath
hasPrefix
:
@"metaDictionary.artworkURL"
])
{
...
...
@@ -561,7 +562,7 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
* And all the other meta will be added through the libvlc event system */
[
self
fetchMetaInformationFromLibVLCWithType
:
VLCMetaInformationArtworkURL
];
}
return
[
super
valueForKeyPath
:
keyPath
];
}
@end
...
...
@@ -576,8 +577,8 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
{
if
(
length
&&
value
&&
[
length
compare
:
value
]
==
NSOrderedSame
)
return
;
[
length
release
];
[
length
release
];
length
=
value
?
[
value
retain
]
:
nil
;
}
...
...
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