Commit dbfa4ef0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Fix 64bit compilation warnings

parent 0663dc00
......@@ -44,7 +44,7 @@ extern NSString *const VLCMediaPlayerVolumeChanged;
- (void)setMute:(BOOL)value;
@property (setter=setMute:) BOOL isMuted;
@property (assign) NSUInteger volume;
@property (assign) int volume;
- (void)volumeDown;
- (void)volumeUp;
......
......@@ -159,7 +159,7 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
* \param width the snapshot's width
* \param height the snapshot's height
*/
- (void)saveVideoSnapshotAt: (NSString *)path withWidth:(NSUInteger)width andHeight:(NSUInteger)height;
- (void)saveVideoSnapshotAt: (NSString *)path withWidth:(int)width andHeight:(int)height;
/**
* Enable or disable deinterlace filter
......@@ -191,7 +191,7 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
*
* \param integer value (range: 0-360, default: 0)
*/
@property NSInteger hue;
@property int hue;
/**
* Set/Get the adjust filter's saturation value
*
......@@ -348,10 +348,10 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
*
* To disable subtitle pass NSNotFound.
*/
@property (readwrite) NSUInteger currentChapterIndex;
@property (readwrite) int currentChapterIndex;
- (void)previousChapter;
- (void)nextChapter;
- (NSArray *)chaptersForTitleIndex:(NSUInteger)titleIndex;
- (NSArray *)chaptersForTitleIndex:(int)titleIndex;
/**
* Title selection and enumeration
......@@ -394,8 +394,8 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
#pragma mark -
#pragma mark audio functionality
- (void)setAudioChannel:(NSInteger)value;
- (NSInteger)audioChannel;
- (void)setAudioChannel:(int)value;
- (int)audioChannel;
/**
* Get the current audio delay. Positive values means audio is delayed further,
......@@ -516,13 +516,13 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
* Jumps shortly backward in current stream if seeking is supported.
* \param interval to skip, in sec.
*/
- (void)jumpBackward:(NSInteger)interval;
- (void)jumpBackward:(int)interval;
/**
* Jumps shortly forward in current stream if seeking is supported.
* \param interval to skip, in sec.
*/
- (void)jumpForward:(NSInteger)interval;
- (void)jumpForward:(int)interval;
/**
* Jumps shortly backward in current stream if seeking is supported.
......
......@@ -35,7 +35,7 @@
/* Factories */
+ (VLCTime *)nullTime;
+ (VLCTime *)timeWithNumber:(NSNumber *)aNumber;
+ (VLCTime *)timeWithInt:(NSInteger)aInt;
+ (VLCTime *)timeWithInt:(int)aInt;
/* Initializers */
- (id)initWithNumber:(NSNumber *)aNumber;
......
......@@ -76,7 +76,7 @@ NSString *const VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
return libvlc_audio_get_mute([self instance]);
}
- (void)setVolume:(NSUInteger)value
- (void)setVolume:(int)value
{
if (value < VOLUME_MIN)
value = VOLUME_MIN;
......@@ -87,7 +87,7 @@ NSString *const VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
- (void)volumeUp
{
NSUInteger tempVolume = [self volume] + VOLUME_STEP;
int tempVolume = [self volume] + VOLUME_STEP;
if (tempVolume > VOLUME_MAX)
tempVolume = VOLUME_MAX;
else if (tempVolume < VOLUME_MIN)
......@@ -97,7 +97,7 @@ NSString *const VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
- (void)volumeDown
{
NSUInteger tempVolume = [self volume] - VOLUME_STEP;
int tempVolume = [self volume] - VOLUME_STEP;
if (tempVolume > VOLUME_MAX)
tempVolume = VOLUME_MAX;
else if (tempVolume < VOLUME_MIN)
......@@ -105,7 +105,7 @@ NSString *const VLCMediaPlayerVolumeChanged = @"VLCMediaPlayerVolumeChanged";
[self setVolume: tempVolume];
}
- (NSUInteger)volume
- (int)volume
{
return libvlc_audio_get_volume([self instance]);
}
......
......@@ -259,7 +259,7 @@ static void * EventDispatcherMainLoop(void * user_data)
[pendingMessagesLock lock];
NSMutableArray *queue = [self messageQueue];
for (int i = [queue count] - 1; i >= 0; i--) {
for (NSInteger i = [queue count] - 1; i >= 0; i--) {
NSData *data = queue[i];
message_t *message = (message_t *)[data bytes];
if (message->target == target)
......@@ -268,7 +268,7 @@ static void * EventDispatcherMainLoop(void * user_data)
// Remove all pending messages
NSMutableArray *messages = pendingMessagesOnMainThread;
for (int i = [messages count] - 1; i >= 0; i--) {
for (NSInteger i = [messages count] - 1; i >= 0; i--) {
NSData *data = messages[i];
message_t *message = (message_t *)[data bytes];
......
......@@ -134,7 +134,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
- (NSInteger)addMedia:(VLCMedia *)media
{
int index = [self count];
NSInteger index = [self count];
[self insertMedia:media atIndex:index];
return index;
}
......@@ -144,7 +144,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
[media retain];
// Add it to the libvlc's medialist
libvlc_media_list_insert_media(p_mlist, [media libVLCMediaDescriptor], index);
libvlc_media_list_insert_media(p_mlist, [media libVLCMediaDescriptor], (int)index);
}
- (void)removeMediaAtIndex:(NSInteger)index
......@@ -153,7 +153,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
[cachedMedia removeObjectAtIndex:index];
// Remove it from the libvlc's medialist
libvlc_media_list_remove_index(p_mlist, index);
libvlc_media_list_remove_index(p_mlist, (int)index);
}
}
......@@ -220,7 +220,7 @@ static void HandleMediaListItemDeleted( const libvlc_event_t * event, void * use
cachedMedia = [[NSMutableArray alloc] initWithCapacity:libvlc_media_list_count(p_mlist)];
NSUInteger count = libvlc_media_list_count(p_mlist);
for (NSUInteger i = 0; i < count; i++) {
for (int i = 0; i < count; i++) {
libvlc_media_t * p_md = libvlc_media_list_item_at_index(p_mlist, i);
[cachedMedia addObject:[VLCMedia mediaWithLibVLCMediaDescriptor:p_md]];
libvlc_media_release(p_md);
......
......@@ -497,7 +497,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return libvlc_video_get_scale(_playerInstance);
}
- (void)saveVideoSnapshotAt:(NSString *)path withWidth:(NSUInteger)width andHeight:(NSUInteger)height
- (void)saveVideoSnapshotAt:(NSString *)path withWidth:(int)width andHeight:(int)height
{
int failure = libvlc_video_take_snapshot(_playerInstance, 0, [path UTF8String], width, height);
if (failure)
......@@ -549,7 +549,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
libvlc_video_set_adjust_int(_playerInstance, libvlc_adjust_Enable, 1);
return libvlc_video_get_adjust_int(_playerInstance, libvlc_adjust_Hue);
}
- (void)setHue:(NSInteger)i_value
- (void)setHue:(int)i_value
{
if (i_value <= 360 && i_value >= 0) {
libvlc_video_set_adjust_int(_playerInstance, libvlc_adjust_Enable, 1);
......@@ -634,7 +634,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
#pragma mark -
#pragma mark Chapters
- (void)setCurrentChapterIndex:(NSUInteger)value;
- (void)setCurrentChapterIndex:(int)value;
{
libvlc_media_player_set_chapter(_playerInstance, value);
}
......@@ -658,7 +658,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
libvlc_media_player_previous_chapter(_playerInstance);
}
- (NSArray *)chaptersForTitleIndex:(NSUInteger)title
- (NSArray *)chaptersForTitleIndex:(int)title
{
NSInteger count = libvlc_media_player_get_chapter_count(_playerInstance);
if (count <= 0)
......@@ -777,7 +777,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return [NSArray arrayWithArray: tempArray];
}
- (void)setAudioChannel:(NSInteger)value
- (void)setAudioChannel:(int)value
{
libvlc_audio_set_channel(_playerInstance, value);
}
......@@ -973,7 +973,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
[self setRate: -rate];
}
- (void)jumpBackward:(NSInteger)interval
- (void)jumpBackward:(int)interval
{
if ([self isSeekable]) {
interval = interval * 1000;
......@@ -981,7 +981,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
}
}
- (void)jumpForward:(NSInteger)interval
- (void)jumpForward:(int)interval
{
if ([self isSeekable]) {
interval = interval * 1000;
......
......@@ -39,7 +39,7 @@
return [[[VLCTime alloc] initWithNumber:aNumber] autorelease];
}
+ (VLCTime *)timeWithInt:(NSInteger)aInt
+ (VLCTime *)timeWithInt:(int)aInt
{
return [[[VLCTime alloc] initWithInt:aInt] autorelease];
}
......
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