Fix menu removal of accelerators. This has yet to be more FIXMEd (jpeg :D)

[vlc] / src / control / mediacontrol_util.c

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index b651bc77bd64d4a89ca097701af52acaee48b9cb..eb0fcffe1c4f209cfd54afa4f52191ad68b93f2d 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -25,12 +25,12 @@
 # include "config.h"
 #endif
 
+#include "mediacontrol_internal.h"
 #include <vlc/mediacontrol.h>
-#include <vlc/libvlc.h>
 
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
-#include "mediacontrol_internal.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
@@ -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;