#include <vlc/aout.h>
#include <vlc_demux.h>
-#include <osd.h>
+#include <vlc_osd.h>
#define HAS_SNAPSHOT 1
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#define RAISE( c, m ) exception->code = c; \
exception->message = strdup(m);
-long long mediacontrol_unit_convert( input_thread_t *p_input,
- mediacontrol_PositionKey from,
- mediacontrol_PositionKey to,
- long long value )
+vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
+ mediacontrol_PositionKey from,
+ mediacontrol_PositionKey to,
+ vlc_int64_t value )
{
if( to == from )
return value;
{
/* FIXME */
/* vlc < 0.8 API */
-/* return ( long long )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */
+/* return ( vlc_int64_t )( value * 50 * p_input->stream.i_mux_rate / f_fps ); */
return 0;
}
if( to == mediacontrol_MediaTime )
- return( long long )( value * 1000.0 / ( double )f_fps );
+ return( vlc_int64_t )( value * 1000.0 / ( double )f_fps );
/* Cannot happen */
break;
// i_mux_rate : the rate we read the stream (in units of 50 bytes/s) ;
// 0 if undef */
// if( to == mediacontrol_MediaTime )
-// return ( long long )( 1000 * value / 50 / p_input->stream.i_mux_rate );
+// return ( vlc_int64_t )( 1000 * value / 50 / p_input->stream.i_mux_rate );
//
// if( to == mediacontrol_SampleCount )
// {
// if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
// return 0;
// else
-// return ( long long )( value * f_fps / 50 / p_input->stream.i_mux_rate );
+// return ( vlc_int64_t )( value * f_fps / 50 / p_input->stream.i_mux_rate );
// }
/* Cannot happen */
break;
/* Converts a mediacontrol_Position into a time in microseconds in
movie clock time */
-long long
+vlc_int64_t
mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_Position * pos )
{
switch( pos->origin )
break;
case mediacontrol_RelativePosition:
{
- long long l_pos;
+ vlc_int64_t l_pos;
vlc_value_t val;
val.i_time = 0;
}
case mediacontrol_ModuloPosition:
{
- long long l_pos;
+ vlc_int64_t l_pos;
vlc_value_t val;
val.i_time = 0;
}
mediacontrol_RGBPicture*
-_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, long long l_date,
+_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, vlc_int64_t l_date,
char* p_data, int i_datasize )
{
mediacontrol_RGBPicture *retval;