mediacontrol: include vlc_common and fix ABI (= avoid bool)

diff --git a/include/vlc/mediacontrol.h b/include/vlc/mediacontrol.h
index 684aaaeb61a008d2b1c2882e849d8fe9a4a4146e..46da6173b80d1d976b3bafc6719bcf8c7f7db667 100644 (file)
--- a/include/vlc/mediacontrol.h
+++ b/include/vlc/mediacontrol.h
@@ -38,9 +38,9 @@ extern "C" {
 
 #if defined( WIN32 )
 #include <windows.h>
-#define WINDOWHANDLE HWND
+typedef HWND WINDOWHANDLE;
 #else
-#define WINDOWHANDLE int
+typedef int WINDOWHANDLE;
 #endif
 
 #include <vlc/libvlc.h>
@@ -286,7 +286,7 @@ VLC_PUBLIC_API void mediacontrol_sound_set_volume( mediacontrol_Instance *self,
  * \param visual_id the Xid or HWND, depending on the platform
  * \param exception an initialized exception pointer
  */
-VLC_PUBLIC_API bool mediacontrol_set_visual( mediacontrol_Instance *self,
+VLC_PUBLIC_API int mediacontrol_set_visual( mediacontrol_Instance *self,
                                     WINDOWHANDLE visual_id,
                                     mediacontrol_Exception *exception );
 

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index c6f506e8bdd40747dd62ef3c4b197283f0416f9b..2006c0d111f796a5812f6ccea5aac2c95f7d19d8 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -270,7 +270,7 @@ mediacontrol_sound_set_volume( mediacontrol_Instance *self,
     HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
 }
 
-bool mediacontrol_set_visual( mediacontrol_Instance *self,
+int mediacontrol_set_visual( mediacontrol_Instance *self,
                                     WINDOWHANDLE visual_id,
                                     mediacontrol_Exception *exception )
 {

diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index dbdb5cf22a96a8e6e822848d2330d719dcc458fa..4aabb453236256ce9871db59ed6c8a1f2f903ecb 100644 (file)
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -25,10 +25,10 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
 #include <vlc/mediacontrol.h>
 
 #include <vlc/libvlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index e732b2a5fdf3b6406f1b8221b8cb59b67a74b14d..9d091b818075ec98313d0ac0ea3889344ef12684 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -26,8 +26,8 @@
 #endif
 
 #include <vlc/mediacontrol.h>
-#include <vlc/libvlc.h>
 
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 #include "mediacontrol_internal.h"