Browse Source

libvlc: rename outdated mtime functions to vlc_tick ones

pull/138/head
Steve Lhomme 4 years ago
parent
commit
aa70adf479
  1. 4
      lib/libvlc_internal.h
  2. 10
      lib/media.c
  3. 8
      lib/media_player.c
  4. 2
      lib/picture.c

4
lib/libvlc_internal.h

@ -98,12 +98,12 @@ void libvlc_event_send(
libvlc_event_manager_t * p_em,
libvlc_event_t * p_event );
static inline libvlc_time_t from_mtime(vlc_tick_t time)
static inline libvlc_time_t libvlc_time_from_vlc_tick(vlc_tick_t time)
{
return (time + 500ULL)/ 1000ULL;
}
static inline vlc_tick_t to_mtime(libvlc_time_t time)
static inline vlc_tick_t vlc_tick_from_libvlc_time(libvlc_time_t time)
{
return VLC_TICK_FROM_MS(time);
}

10
lib/media.c

@ -327,7 +327,7 @@ static void input_item_duration_changed( const vlc_event_t *p_event,
/* Construct the event */
event.type = libvlc_MediaDurationChanged;
event.u.media_duration_changed.new_duration =
from_mtime(p_event->u.input_item_duration_changed.new_duration);
libvlc_time_from_vlc_tick(p_event->u.input_item_duration_changed.new_duration);
/* Send the event */
libvlc_event_send( &p_md->event_manager, &event );
@ -776,7 +776,7 @@ libvlc_media_get_duration( libvlc_media_t * p_md )
if (!input_item_IsPreparsed( p_md->p_input_item ))
return -1;
return from_mtime(input_item_GetDuration( p_md->p_input_item ));
return libvlc_time_from_vlc_tick(input_item_GetDuration( p_md->p_input_item ));
}
int
@ -1013,11 +1013,11 @@ libvlc_media_thumbnail_request_by_time( libvlc_instance_t *inst,
req->crop = crop;
libvlc_media_retain( md );
req->req = vlc_thumbnailer_RequestByTime( p_priv->p_thumbnailer,
to_mtime( time ),
vlc_tick_from_libvlc_time( time ),
speed == libvlc_media_thumbnail_seek_fast ?
VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE,
md->p_input_item,
timeout > 0 ? to_mtime( timeout ) : VLC_TICK_INVALID,
timeout > 0 ? vlc_tick_from_libvlc_time( timeout ) : VLC_TICK_INVALID,
media_on_thumbnail_ready, req );
if ( req->req == NULL )
{
@ -1059,7 +1059,7 @@ libvlc_media_thumbnail_request_by_pos( libvlc_instance_t *inst,
speed == libvlc_media_thumbnail_seek_fast ?
VLC_THUMBNAILER_SEEK_FAST : VLC_THUMBNAILER_SEEK_PRECISE,
md->p_input_item,
timeout > 0 ? to_mtime( timeout ) : VLC_TICK_INVALID,
timeout > 0 ? vlc_tick_from_libvlc_time( timeout ) : VLC_TICK_INVALID,
media_on_thumbnail_ready, req );
if ( req->req == NULL )
{

8
lib/media_player.c

@ -1282,7 +1282,7 @@ libvlc_time_t libvlc_media_player_get_length(
vlc_player_Lock(player);
vlc_tick_t length = vlc_player_GetLength(player);
libvlc_time_t i_time = from_mtime(length);
libvlc_time_t i_time = libvlc_time_from_vlc_tick(length);
vlc_player_Unlock(player);
return i_time;
@ -1294,7 +1294,7 @@ libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *p_mi )
vlc_player_Lock(player);
vlc_tick_t tick = vlc_player_GetTime(player);
libvlc_time_t i_time = from_mtime(tick);
libvlc_time_t i_time = libvlc_time_from_vlc_tick(tick);
vlc_player_Unlock(player);
return i_time;
@ -1303,7 +1303,7 @@ libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *p_mi )
int libvlc_media_player_set_time( libvlc_media_player_t *p_mi,
libvlc_time_t i_time, bool b_fast )
{
vlc_tick_t tick = to_mtime(i_time);
vlc_tick_t tick = vlc_tick_from_libvlc_time(i_time);
vlc_player_t *player = p_mi->player;
vlc_player_Lock(player);
@ -1898,7 +1898,7 @@ libvlc_media_player_select_track(libvlc_media_player_t *p_mi,
const libvlc_media_trackpriv_t *trackpriv =
libvlc_media_track_to_priv(track);
// It must be a player track
assert(trackpriv->es_id);

2
lib/picture.c

@ -63,7 +63,7 @@ libvlc_picture_t* libvlc_picture_new( vlc_object_t* p_obj, picture_t* input,
return NULL;
vlc_atomic_rc_init( &pic->rc );
pic->type = type;
pic->time = from_mtime( input->date );
pic->time = libvlc_time_from_vlc_tick( input->date );
pic->attachment = NULL;
vlc_fourcc_t format;
switch ( type )

Loading…
Cancel
Save