[vlc-devel] commit: VLCKit: preparsed->parsed. (Pierre d'Herbemont )
git version control
git at videolan.org
Mon Feb 22 20:31:24 CET 2010
vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Mon Feb 22 20:31:04 2010 +0100| [d9ab1c7141514fc12776a567654ea3fd97e598fd] | committer: Pierre d'Herbemont
VLCKit: preparsed->parsed.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d9ab1c7141514fc12776a567654ea3fd97e598fd
---
.../macosx/framework/Headers/Public/VLCMedia.h | 24 ++++++++++----------
projects/macosx/framework/Sources/VLCMedia.m | 4 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/projects/macosx/framework/Headers/Public/VLCMedia.h b/projects/macosx/framework/Headers/Public/VLCMedia.h
index 5c00b18..d75503a 100644
--- a/projects/macosx/framework/Headers/Public/VLCMedia.h
+++ b/projects/macosx/framework/Headers/Public/VLCMedia.h
@@ -98,8 +98,8 @@ typedef enum VLCMediaState
@end
/**
- * Defines files and streams as a managed object. Each media object can be
- * administered seperately. VLCMediaPlayer or VLCMediaList must be used
+ * Defines files and streams as a managed object. Each media object can be
+ * administered seperately. VLCMediaPlayer or VLCMediaList must be used
* to execute the appropriate playback functions.
* \see VLCMediaPlayer
* \see VLCMediaList
@@ -112,8 +112,8 @@ typedef enum VLCMediaState
VLCTime * length; //< Cached duration of the media
NSMutableDictionary * metaDictionary; //< Meta data storage
id delegate; //< Delegate object
- BOOL isArtFetched; //< Value used to determine of the artwork has been preparsed
- BOOL areOthersMetaFetched; //< Value used to determine of the other meta has been preparsed
+ BOOL isArtFetched; //< Value used to determine of the artwork has been parsed
+ BOOL areOthersMetaFetched; //< Value used to determine of the other meta has been parsed
BOOL isArtURLFetched; //< Value used to determine of the other meta has been preparsed
VLCMediaState state; //< Current state of the media
}
@@ -146,14 +146,14 @@ typedef enum VLCMediaState
/* Initializers */
/**
- * Initializes a new VLCMedia object to use the specified URL.
+ * Initializes a new VLCMedia object to use the specified URL.
* \param aPath Path to media to be accessed.
* \return A new VLCMedia object, only if there were no errors.
*/
- (id)initWithURL:(NSURL *)anURL;
/**
- * Initializes a new VLCMedia object to use the specified path.
+ * Initializes a new VLCMedia object to use the specified path.
* \param aPath Path to media to be accessed.
* \return A new VLCMedia object, only if there were no errors.
*/
@@ -167,12 +167,12 @@ typedef enum VLCMediaState
- (id)initAsNodeWithName:(NSString *)aName;
/**
- * Returns an NSComparisonResult value that indicates the lexical ordering of
+ * Returns an NSComparisonResult value that indicates the lexical ordering of
* the receiver and a given meda.
* \param media The media with which to compare with the receiver.
- * \return NSOrderedAscending if the URL of the receiver precedes media in
- * lexical ordering, NSOrderedSame if the URL of the receiver and media are
- * equivalent in lexical value, and NSOrderedDescending if the URL of the
+ * \return NSOrderedAscending if the URL of the receiver precedes media in
+ * lexical ordering, NSOrderedSame if the URL of the receiver and media are
+ * equivalent in lexical value, and NSOrderedDescending if the URL of the
* receiver follows media. If media is nil, returns NSOrderedDescending.
*/
- (NSComparisonResult)compare:(VLCMedia *)media;
@@ -201,9 +201,9 @@ typedef enum VLCMediaState
- (VLCTime *)lengthWaitUntilDate:(NSDate *)aDate;
/**
- * Determines if the media has already been preparsed.
+ * Determines if the media has already been preparsed.
*/
- at property (readonly) BOOL isPreparsed;
+ at property (readonly) BOOL isParsed;
/**
* The URL for the receiver's media resource.
diff --git a/projects/macosx/framework/Sources/VLCMedia.m b/projects/macosx/framework/Sources/VLCMedia.m
index 5762a7b..31112d5 100644
--- a/projects/macosx/framework/Sources/VLCMedia.m
+++ b/projects/macosx/framework/Sources/VLCMedia.m
@@ -310,9 +310,9 @@ static void HandleMediaSubItemAdded(const libvlc_event_t * event, void * self)
return [[length retain] autorelease];
}
-- (BOOL)isPreparsed
+- (BOOL)isParsed
{
- return libvlc_media_is_preparsed( p_md );
+ return libvlc_media_is_parsed( p_md );
}
@synthesize url;
More information about the vlc-devel
mailing list