Less memleaks in Qt interface.

[vlc] / include / vlc / mediacontrol_structures.h

diff --git a/include/vlc/mediacontrol_structures.h b/include/vlc/mediacontrol_structures.h
index 90f7464d36cd7ad702a95895c254f3e64cef7e08..dbcf5aae5a6fd6f3b3df4bbbb653ae416bebda61 100644 (file)
--- a/include/vlc/mediacontrol_structures.h
+++ b/include/vlc/mediacontrol_structures.h
@@ -34,8 +34,10 @@
 extern "C" {
 # endif
 
+#include <stdint.h>
+
 /**
- * A position may have different origins: 
+ * A position may have different origins:
  *  - absolute counts from the movie start
  *  - relative counts from the current position
  *  - modulo counts from the current position and wraps at the end of the movie
@@ -60,12 +62,15 @@ typedef enum {
 
 /**
  * Possible player status
+ * Note the order of these enums must match exactly the order of
+ * libvlc_state_t and input_state_e enums.
  */
 typedef enum {
-    mediacontrol_PlayingStatus, mediacontrol_PauseStatus,
-    mediacontrol_ForwardStatus, mediacontrol_BackwardStatus,
-    mediacontrol_InitStatus,    mediacontrol_EndStatus,
-    mediacontrol_UndefinedStatus
+    mediacontrol_UndefinedStatus=0, mediacontrol_InitStatus,
+    mediacontrol_BufferingStatus, mediacontrol_PlayingStatus,
+    mediacontrol_PauseStatus,     mediacontrol_StopStatus,
+    mediacontrol_ForwardStatus,   mediacontrol_BackwardStatus,
+    mediacontrol_EndStatus,       mediacontrol_ErrorStatus,
 } mediacontrol_PlayerStatus;
 
 /**
@@ -74,7 +79,7 @@ typedef enum {
 typedef struct {
     mediacontrol_PositionOrigin origin;
     mediacontrol_PositionKey key;
-    long value;
+    int64_t value;
 } mediacontrol_Position;
 
 /**
@@ -84,8 +89,8 @@ typedef struct {
 typedef struct {
     int  width;
     int  height;
-    long type;
-    vlc_int64_t date;
+    uint32_t type;
+    int64_t date;
     int  size;
     char *data;
 } mediacontrol_RGBPicture;
@@ -120,8 +125,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;