Commit 5ba2255e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove vlc_int64_t. Was not even correctly defined.

parent 3dfd0c49
......@@ -100,7 +100,7 @@ typedef struct libvlc_event_t
} media_subitem_added;
struct
{
vlc_int64_t new_duration;
int64_t new_duration;
} media_duration_changed;
struct
{
......
......@@ -40,11 +40,7 @@
# define VLC_DEPRECATED_API VLC_PUBLIC_API
#endif
#if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( __MINGW32__ )
typedef signed __int64 vlc_int64_t;
# else
typedef signed long long vlc_int64_t;
#endif
#include <stdint.h>
# ifdef __cplusplus
extern "C" {
......@@ -81,7 +77,7 @@ typedef struct libvlc_exception_t
* @{
*/
typedef vlc_int64_t libvlc_time_t;
typedef int64_t libvlc_time_t;
/**@} */
......
......@@ -76,7 +76,7 @@ typedef enum {
typedef struct {
mediacontrol_PositionOrigin origin;
mediacontrol_PositionKey key;
vlc_int64_t value;
int64_t value;
} mediacontrol_Position;
/**
......@@ -87,7 +87,7 @@ typedef struct {
int width;
int height;
uint32_t type;
vlc_int64_t date;
int64_t date;
int size;
char *data;
} mediacontrol_RGBPicture;
......@@ -122,8 +122,8 @@ typedef struct {
typedef struct {
mediacontrol_PlayerStatus streamstatus;
char *url; /* The URL of the current media stream */
vlc_int64_t position; /* actual location in the stream (in ms) */
vlc_int64_t length; /* total length of the stream (in ms) */
int64_t position; /* actual location in the stream (in ms) */
int64_t length; /* total length of the stream (in ms) */
} mediacontrol_StreamInformation;
......
......@@ -513,7 +513,7 @@ libvlc_media_event_manager( libvlc_media_t * p_md,
/**************************************************************************
* Get duration of media object.
**************************************************************************/
vlc_int64_t
int64_t
libvlc_media_get_duration( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
......
......@@ -123,7 +123,7 @@ mediacontrol_get_media_position( mediacontrol_Instance *self,
{
mediacontrol_Position* retval = NULL;
libvlc_exception_t ex;
vlc_int64_t pos;
int64_t pos;
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
......@@ -163,7 +163,7 @@ mediacontrol_set_media_position( mediacontrol_Instance *self,
mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
vlc_int64_t i_pos;
int64_t i_pos;
libvlc_exception_init( &ex );
mediacontrol_exception_init( exception );
......
......@@ -41,7 +41,7 @@ struct mediacontrol_Instance {
libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_player,
mediacontrol_PositionKey from,
mediacontrol_PositionKey to,
vlc_int64_t value );
int64_t value );
libvlc_time_t private_mediacontrol_position2microsecond( libvlc_media_player_t *p_media_player,
const mediacontrol_Position *pos );
......@@ -51,7 +51,7 @@ libvlc_time_t private_mediacontrol_position2microsecond( libvlc_media_player_t *
*/
mediacontrol_RGBPicture *private_mediacontrol_RGBPicture__alloc( int datasize );
mediacontrol_RGBPicture *private_mediacontrol_createRGBPicture( int, int, long, vlc_int64_t l_date, char *, int);
mediacontrol_RGBPicture *private_mediacontrol_createRGBPicture( int, int, long, int64_t l_date, char *, int);
#define RAISE( c, m ) if( exception ) { exception->code = c; \
......
......@@ -52,7 +52,7 @@
libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_player,
mediacontrol_PositionKey from,
mediacontrol_PositionKey to,
vlc_int64_t value )
int64_t value )
{
if( to == from )
return value;
......@@ -100,12 +100,12 @@ libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_
{
/* FIXME */
/* vlc < 0.8 API */
/* return ( vlc_int64_t )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */
/* return ( int64_t )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */
return 0;
}
if( to == mediacontrol_MediaTime )
return( vlc_int64_t )( value * 1000.0 / ( double )f_fps );
return( int64_t )( value * 1000.0 / ( double )f_fps );
/* Cannot happen */
break;
......@@ -246,7 +246,7 @@ mediacontrol_exception_free( mediacontrol_Exception *exception )
}
mediacontrol_RGBPicture*
private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, vlc_int64_t l_date,
private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, int64_t l_date,
char* p_data, int i_datasize )
{
mediacontrol_RGBPicture *retval;
......
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