vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Sep 23 23:51:15 2018 +0200| [a69646cfbaab3712976fdb31e0992fc6c19d43d3] | committer: Felix Paul Kühne
macosx: fix misc. compilation warnings > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a69646cfbaab3712976fdb31e0992fc6c19d43d3 --- modules/gui/macosx/VLCInputManager.m | 4 ++-- modules/gui/macosx/VLCPLModel.m | 2 +- modules/gui/macosx/applescript.h | 2 +- modules/gui/macosx/applescript.m | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m index dbe245bb73..7d6ee24d21 100644 --- a/modules/gui/macosx/VLCInputManager.m +++ b/modules/gui/macosx/VLCInputManager.m @@ -694,8 +694,8 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var, NSMutableDictionary *mutDict = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:@"recentlyPlayedMedia"]]; float relativePos = var_GetFloat(p_input_thread, "position"); - int pos = SEC_FROM_VLC_TICK(var_GetInteger(p_input_thread, "time")); - int dur = SEC_FROM_VLC_TICK(input_item_GetDuration(p_item)); + long long pos = SEC_FROM_VLC_TICK(var_GetInteger(p_input_thread, "time")); + long long dur = SEC_FROM_VLC_TICK(input_item_GetDuration(p_item)); NSMutableArray *mediaList = [[defaults objectForKey:@"recentlyPlayedMediaList"] mutableCopy]; diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m index 4a8f0a0aef..048919850b 100644 --- a/modules/gui/macosx/VLCPLModel.m +++ b/modules/gui/macosx/VLCPLModel.m @@ -524,7 +524,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var, char psz_duration[MSTRTIME_MAX_SIZE]; vlc_tick_t dur = input_item_GetDuration(p_input); if (dur != -1) { - secstotimestr(psz_duration, SEC_FROM_VLC_TICK(dur)); + secstotimestr(psz_duration, (int32_t)SEC_FROM_VLC_TICK(dur)); o_value = toNSStr(psz_duration); } else diff --git a/modules/gui/macosx/applescript.h b/modules/gui/macosx/applescript.h index 6d22fc30a3..f557198b46 100644 --- a/modules/gui/macosx/applescript.h +++ b/modules/gui/macosx/applescript.h @@ -42,7 +42,7 @@ @property (readwrite) BOOL scriptFullscreenMode; @property (readwrite) int audioVolume; -@property (readwrite) int audioDesync; +@property (readwrite) long long audioDesync; @property (readwrite) int currentTime; @property (readonly) NSInteger durationOfCurrentItem; @property (readonly) NSString *pathOfCurrentItem; diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m index e7618719b0..c9d7c75a9c 100644 --- a/modules/gui/macosx/applescript.m +++ b/modules/gui/macosx/applescript.m @@ -199,11 +199,11 @@ [[VLCCoreInteraction sharedInstance] setVolume:(int)i_audioVolume]; } -- (int) audioDesync { +- (long long) audioDesync { input_thread_t * p_input = pl_CurrentInput(getIntf()); vlc_tick_t i_delay; - if(!p_input) + if (!p_input) return -1; i_delay = var_GetInteger(p_input, "audio-delay"); @@ -212,9 +212,9 @@ return MS_FROM_VLC_TICK( i_delay ); } -- (void) setAudioDesync:(int)i_audioDesync { +- (void) setAudioDesync:(long long)i_audioDesync { input_thread_t * p_input = pl_CurrentInput(getIntf()); - if(!p_input) + if (!p_input) return; var_SetInteger(p_input, "audio-delay", VLC_TICK_FROM_MS( i_audioDesync )); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
