Commit 689a05a1 authored by Felix Paul Kühne's avatar Felix Paul Kühne

osx/framework: propagate NSInteger and NSUInteger

parent 08158e03
......@@ -42,7 +42,7 @@ extern NSString * VLCMediaPlayerVolumeChanged;
- (void)setMute:(BOOL)value;
@property (setter=setMute:) BOOL isMuted;
@property (assign) int volume;
@property (assign) NSUInteger volume;
- (void)volumeDown;
- (void)volumeUp;
......
......@@ -39,12 +39,12 @@ extern NSString * VLCMediaListItemDeleted;
/**
* TODO: Documentation - [VLCMediaListDelegate mediaList:mediaAdded:atIndex:]
*/
- (void)mediaList:(VLCMediaList *)aMediaList mediaAdded:(VLCMedia *)media atIndex:(int)index;
- (void)mediaList:(VLCMediaList *)aMediaList mediaAdded:(VLCMedia *)media atIndex:(NSInteger)index;
/**
* TODO: Documentation - [VLCMediaListDelegate mediaList:mediaRemovedAtIndex:]
*/
- (void)mediaList:(VLCMediaList *)aMediaList mediaRemovedAtIndex:(int)index;
- (void)mediaList:(VLCMediaList *)aMediaList mediaRemovedAtIndex:(NSInteger)index;
@end
/**
......@@ -75,33 +75,33 @@ extern NSString * VLCMediaListItemDeleted;
/**
* TODO: Documentation - [VLCMediaList addMedia:]
*/
- (int)addMedia:(VLCMedia *)media;
- (NSInteger)addMedia:(VLCMedia *)media;
/**
* TODO: Documentation - [VLCMediaList insertMedia:atIndex:]
*/
- (void)insertMedia:(VLCMedia *)media atIndex:(int)index;
- (void)insertMedia:(VLCMedia *)media atIndex:(NSInteger)index;
/**
* TODO: Documentation - [VLCMediaList removeMediaAtIndex:]
*/
- (void)removeMediaAtIndex:(int)index;
- (void)removeMediaAtIndex:(NSInteger)index;
/**
* TODO: Documentation - [VLCMediaList mediaAtIndex:]
*/
- (VLCMedia *)mediaAtIndex:(int)index;
- (VLCMedia *)mediaAtIndex:(NSInteger)index;
/**
* TODO: Documentation - [VLCMediaList indexOfMedia:]
*/
- (int)indexOfMedia:(VLCMedia *)media;
- (NSInteger)indexOfMedia:(VLCMedia *)media;
/* Properties */
/**
* TODO: Documentation VLCMediaList.count
*/
@property (readonly) int count;
@property (readonly) NSInteger count;
/**
* TODO: Documentation VLCMediaList.delegate
......
......@@ -44,9 +44,9 @@
VLCMediaList * parentMediaList;
BOOL ownHisMediaList;
}
- (VLCMedia *)mediaAtIndex:(int)index;
- (VLCMediaListAspectNode *)nodeAtIndex:(int)index;
- (int)count;
- (VLCMedia *)mediaAtIndex:(NSInteger)index;
- (VLCMediaListAspectNode *)nodeAtIndex:(NSInteger)index;
- (NSInteger)count;
- (VLCMediaList *)parentMediaList;
@end
......@@ -35,7 +35,7 @@ enum VLCRepeatMode {
VLCRepeatCurrentItem,
VLCRepeatAllItems
};
typedef int VLCRepeatMode;
typedef NSInteger VLCRepeatMode;
@interface VLCMediaListPlayer : NSObject {
void *instance;
......
......@@ -110,8 +110,8 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
- (void)setVideoCropGeometry:(char *)value;
- (char *)videoCropGeometry;
- (void)setVideoTeleText:(int)value;
- (int)videoTeleText;
- (void)setVideoTeleText:(NSUInteger)value;
- (NSUInteger)videoTeleText;
/**
* Take a snapshot of the current video.
......@@ -155,7 +155,7 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
- (VLCTime *)time;
@property (readonly) VLCTime *remainingTime;
@property (readonly) int fps;
@property (readonly) NSUInteger fps;
/**
* Return the current video subtitle index
......@@ -219,8 +219,8 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
*/
- (NSArray *)audioTracks;
- (void)setAudioChannel:(int)value;
- (int)audioChannel;
- (void)setAudioChannel:(NSInteger)value;
- (NSInteger)audioChannel;
/* Media Options */
- (void)setMedia:(VLCMedia *)value;
......
......@@ -30,7 +30,7 @@
@interface VLCStreamSession : VLCMediaPlayer {
VLCStreamOutput * streamOutput;
VLCMedia * originalMedia;
int reattemptedConnections;
NSUInteger reattemptedConnections;
BOOL isComplete;
}
......
......@@ -33,7 +33,7 @@
/* Factories */
+ (VLCTime *)nullTime;
+ (VLCTime *)timeWithNumber:(NSNumber *)aNumber;
+ (VLCTime *)timeWithInt:(int)aInt;
+ (VLCTime *)timeWithInt:(NSInteger)aInt;
/* Initializers */
- (id)initWithNumber:(NSNumber *)aNumber;
......
......@@ -62,7 +62,7 @@ NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
return libvlc_audio_get_mute([library instance]);
}
- (void)setVolume:(int)value
- (void)setVolume:(NSUInteger)value
{
if (value < VOLUME_MIN)
value = VOLUME_MIN;
......@@ -73,7 +73,7 @@ NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
- (void)volumeUp
{
int tempVolume = [self volume] + VOLUME_STEP;
NSUInteger tempVolume = [self volume] + VOLUME_STEP;
if (tempVolume > VOLUME_MAX)
tempVolume = VOLUME_MAX;
else if (tempVolume < VOLUME_MIN)
......@@ -83,7 +83,7 @@ NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
- (void)volumeDown
{
int tempVolume = [self volume] - VOLUME_STEP;
NSUInteger tempVolume = [self volume] - VOLUME_STEP;
if (tempVolume > VOLUME_MAX)
tempVolume = VOLUME_MAX;
else if (tempVolume < VOLUME_MIN)
......@@ -91,7 +91,7 @@ NSString * VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
[self setVolume: tempVolume];
}
- (int)volume
- (NSUInteger)volume
{
return libvlc_audio_get_volume([library instance]);
}
......
......@@ -71,7 +71,7 @@ static void * EventDispatcherMainLoop(void * user_data)
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
message_t * message, * message_newer = NULL;
NSData * dataMessage;
int i;
NSInteger i;
/* Sleep a bit not to flood the interface */
usleep(300);
......
......@@ -83,7 +83,7 @@ void __catch_exception( void * e, const char * function, const char * file, int
vlcParams = defaultParams;
}
int paramNum = 0;
NSUInteger paramNum = 0;
NSUInteger count = [vlcParams count];
const char *lib_vlc_params[count];
while (paramNum < count) {
......
......@@ -141,14 +141,14 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
libvlc_media_list_unlock( p_mlist );
}
- (int)addMedia:(VLCMedia *)media
- (NSInteger)addMedia:(VLCMedia *)media
{
int index = [self count];
[self insertMedia:media atIndex:index];
return index;
}
- (void)insertMedia:(VLCMedia *)media atIndex: (int)index
- (void)insertMedia:(VLCMedia *)media atIndex: (NSInteger)index
{
[media retain];
......@@ -159,7 +159,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
catch_exception( &p_e );
}
- (void)removeMediaAtIndex:(int)index
- (void)removeMediaAtIndex:(NSInteger)index
{
[[self mediaAtIndex:index] release];
......@@ -170,33 +170,33 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
catch_exception( &p_e );
}
- (VLCMedia *)mediaAtIndex:(int)index
- (VLCMedia *)mediaAtIndex:(NSInteger)index
{
return [cachedMedia objectAtIndex:index];
}
- (int)indexOfMedia:(VLCMedia *)media
- (NSInteger)indexOfMedia:(VLCMedia *)media
{
libvlc_exception_t p_e;
libvlc_exception_init( &p_e );
int result = libvlc_media_list_index_of_item( p_mlist, [media libVLCMediaDescriptor], &p_e );
NSInteger result = libvlc_media_list_index_of_item( p_mlist, [media libVLCMediaDescriptor], &p_e );
catch_exception( &p_e );
return result;
}
/* KVC Compliance: For the @"media" key */
- (int)countOfMedia
- (NSInteger)countOfMedia
{
return [self count];
}
- (id)objectInMediaAtIndex:(int)i
- (id)objectInMediaAtIndex:(NSInteger)i
{
return [self mediaAtIndex:i];
}
- (int)count
- (NSInteger)count
{
return [cachedMedia count];
}
......@@ -264,7 +264,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
libvlc_media_list_lock( p_mlist );
cachedMedia = [[NSMutableArray alloc] initWithCapacity:libvlc_media_list_count( p_mlist, NULL )];
int i, count = libvlc_media_list_count( p_mlist, NULL );
NSUInteger i, count = libvlc_media_list_count( p_mlist, NULL );
for( i = 0; i < count; i++ )
{
libvlc_media_t * p_md = libvlc_media_list_item_at_index( p_mlist, i, NULL );
......@@ -300,14 +300,14 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
- (void)mediaListItemAdded:(NSArray *)arrayOfArgs
{
/* We hope to receive index in a nide range, that could change one day */
int start = [[[arrayOfArgs objectAtIndex: 0] objectForKey:@"index"] intValue];
int end = [[[arrayOfArgs objectAtIndex: [arrayOfArgs count]-1] objectForKey:@"index"] intValue];
NSInteger start = [[[arrayOfArgs objectAtIndex: 0] objectForKey:@"index"] intValue];
NSInteger end = [[[arrayOfArgs objectAtIndex: [arrayOfArgs count]-1] objectForKey:@"index"] intValue];
NSRange range = NSMakeRange(start, end-start);
[self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"media"];
for( NSDictionary * args in arrayOfArgs )
{
int index = [[args objectForKey:@"index"] intValue];
NSInteger index = [[args objectForKey:@"index"] intValue];
VLCMedia * media = [args objectForKey:@"media"];
/* Sanity check */
if( index && index > [cachedMedia count] )
......
......@@ -71,20 +71,20 @@
@implementation VLCMediaListAspect (KeyValueCodingCompliance)
/* For the @"media" key */
- (int) countOfMedia
- (NSInteger) countOfMedia
{
return [cachedNode count];
}
- (id) objectInMediaAtIndex:(int)i
- (id) objectInMediaAtIndex:(NSInteger)i
{
return [[cachedNode objectAtIndex:i] media];
}
/* For the @"node" key */
- (int) countOfNode
- (NSInteger) countOfNode
{
return [cachedNode count];
}
- (id) objectInNodeAtIndex:(int)i
- (id) objectInNodeAtIndex:(NSInteger)i
{
return [cachedNode objectAtIndex:i];
}
......@@ -145,7 +145,7 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
- (NSString *)description
{
NSMutableString * content = [NSMutableString string];
int i;
NSUInteger i;
for( i = 0; i < [self count]; i++)
{
[content appendFormat:@"%@\n", [self mediaAtIndex: i]];
......@@ -153,7 +153,7 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
return [NSString stringWithFormat:@"<%@ %p> {\n%@}", [self className], self, content];
}
- (VLCMedia *)mediaAtIndex:(int)index
- (VLCMedia *)mediaAtIndex:(NSInteger)index
{
libvlc_exception_t p_e;
libvlc_exception_init( &p_e );
......@@ -165,7 +165,7 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
return [VLCMedia mediaWithLibVLCMediaDescriptor:p_md];
}
- (VLCMediaListAspect *)childrenAtIndex:(int)index
- (VLCMediaListAspect *)childrenAtIndex:(NSInteger)index
{
libvlc_exception_t p_e;
libvlc_exception_init( &p_e );
......@@ -180,7 +180,7 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
return [VLCMediaListAspect mediaListAspectWithLibVLCMediaListView:p_sub_mlv];
}
- (VLCMediaListAspectNode *)nodeAtIndex:(int)index
- (VLCMediaListAspectNode *)nodeAtIndex:(NSInteger)index
{
VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
[node setMedia:[self mediaAtIndex: index]];
......@@ -193,11 +193,11 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
return node;
}
- (int)count
- (NSInteger)count
{
libvlc_exception_t p_e;
libvlc_exception_init( &p_e );
int result = libvlc_media_list_view_count( p_mlv, &p_e );
NSInteger result = libvlc_media_list_view_count( p_mlv, &p_e );
catch_exception( &p_e );
return result;
......@@ -245,7 +245,7 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
libvlc_media_list_t * p_mlist;
p_mlist = libvlc_media_list_view_parent_media_list( p_mlv, NULL );
libvlc_media_list_lock( p_mlist );
int i, count = libvlc_media_list_view_count(p_mlv, NULL);
NSUInteger i, count = libvlc_media_list_view_count(p_mlv, NULL);
for( i = 0; i < count; i++ )
{
libvlc_media_t * p_md = libvlc_media_list_view_item_at_index(p_mlv, i, NULL);
......@@ -291,15 +291,15 @@ static void HandleMediaListViewItemDeleted( const libvlc_event_t * event, void *
NSAssert([NSThread isMainThread], @"We are not on main thread");
/* We hope to receive index in a nide range, that could change one day */
int start = [[[arrayOfArgs objectAtIndex: 0] objectForKey:@"index"] intValue];
int end = [[[arrayOfArgs objectAtIndex: [arrayOfArgs count]-1] objectForKey:@"index"] intValue];
NSInteger start = [[[arrayOfArgs objectAtIndex: 0] objectForKey:@"index"] intValue];
NSInteger end = [[[arrayOfArgs objectAtIndex: [arrayOfArgs count]-1] objectForKey:@"index"] intValue];
NSRange range = NSMakeRange(start, end-start);
[self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"media"];
[self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:range] forKey:@"node"];
for( NSDictionary * args in arrayOfArgs )
{
int index = [[args objectForKey:@"index"] intValue];
NSInteger index = [[args objectForKey:@"index"] intValue];
VLCMedia * media = [args objectForKey:@"media"];
VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
[node setMedia:media];
......
......@@ -287,7 +287,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_video_get_spu_count( instance, &ex );
NSInteger count = libvlc_video_get_spu_count( instance, &ex );
catch_exception( &ex );
if (count <= 0)
return NSNotFound;
......@@ -309,7 +309,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_video_get_spu_count( instance, &ex );
NSInteger count = libvlc_video_get_spu_count( instance, &ex );
catch_exception( &ex );
libvlc_track_description_t *tracks = libvlc_video_get_spu_description( instance, &ex );
......@@ -361,7 +361,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return result;
}
- (void)setVideoTeleText:(int)value
- (void)setVideoTeleText:(NSUInteger)value
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
......@@ -369,11 +369,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
catch_exception( &ex );
}
- (int)videoTeleText
- (NSUInteger)videoTeleText
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int result = libvlc_video_get_teletext( instance, &ex );
NSInteger result = libvlc_video_get_teletext( instance, &ex );
catch_exception( &ex );
return result;
}
......@@ -466,11 +466,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return cachedRemainingTime;
}
- (int)fps
- (NSUInteger)fps
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int result = libvlc_media_player_get_fps( instance, &ex );
NSUInteger result = libvlc_media_player_get_fps( instance, &ex );
catch_exception( &ex );
return result;
}
......@@ -489,7 +489,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_media_player_get_chapter_count( instance, &ex );
NSInteger count = libvlc_media_player_get_chapter_count( instance, &ex );
catch_exception( &ex );
if (count <= 0)
return NSNotFound;
......@@ -518,7 +518,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_media_player_get_chapter_count(instance, &ex);
NSInteger count = libvlc_media_player_get_chapter_count(instance, &ex);
if (count <= 0)
return [NSArray array];
......@@ -549,7 +549,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_media_player_get_title_count( instance, &ex );
NSInteger count = libvlc_media_player_get_title_count( instance, &ex );
catch_exception( &ex );
if (count <= 0)
return NSNotFound;
......@@ -559,11 +559,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return result;
}
- (int)countOfTitles
- (NSUInteger)countOfTitles
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int result = libvlc_media_player_get_title_count( instance, &ex );
NSUInteger result = libvlc_media_player_get_title_count( instance, &ex );
catch_exception( &ex );
return result;
}
......@@ -597,7 +597,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_audio_get_track_count( instance, &ex );
NSInteger count = libvlc_audio_get_track_count( instance, &ex );
catch_exception( &ex );
if (count <= 0)
return NSNotFound;
......@@ -611,14 +611,14 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int count = libvlc_audio_get_track_count( instance, &ex );
NSInteger count = libvlc_audio_get_track_count( instance, &ex );
catch_exception( &ex );
if (count <= 0)
return [NSArray array];
libvlc_track_description_t *tracks = libvlc_audio_get_track_description( instance, &ex );
NSMutableArray *tempArray = [NSMutableArray array];
NSInteger i;
NSUInteger i;
for (i = 0; i < count ; i++)
{
[tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]];
......@@ -628,7 +628,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return [NSArray arrayWithArray: tempArray];
}
- (void)setAudioChannel:(int)value
- (void)setAudioChannel:(NSInteger)value
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
......@@ -636,11 +636,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
catch_exception( &ex );
}
- (int)audioChannel
- (NSInteger)audioChannel
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int result = libvlc_audio_get_channel( instance, &ex );
NSInteger result = libvlc_audio_get_channel( instance, &ex );
catch_exception( &ex );
return result;
}
......
......@@ -39,7 +39,7 @@
return [[[VLCTime alloc] initWithNumber:aNumber] autorelease];
}
+ (VLCTime *)timeWithInt:(int)aInt
+ (VLCTime *)timeWithInt:(NSInteger)aInt
{
return [[[VLCTime alloc] initWithInt:aInt] autorelease];
}
......
......@@ -194,7 +194,7 @@
if( [[self subviews] count] )
{
/* XXX: This is a hack until core gets fixed */
int i;
NSUInteger i;
for( i = 0; i < [[self subviews] count]; i++ )
{
[[[self subviews] objectAtIndex:i] detachFromVout];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment