[vlc-devel] commit: mediacontrol: include vlc_common and fix ABI (= avoid bool) ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jun  1 10:12:28 2008 +0300| [cf249e3a425ed77f6cd37c3247001c744603bbf2]

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cf249e3a425ed77f6cd37c3247001c744603bbf2
---

 include/vlc/mediacontrol.h             |    6 +++---
 src/control/mediacontrol_audio_video.c |    2 +-
 src/control/mediacontrol_core.c        |    2 +-
 src/control/mediacontrol_util.c        |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vlc/mediacontrol.h b/include/vlc/mediacontrol.h
index 684aaae..46da617 100644
--- 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 c6f506e..2006c0d 100644
--- 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 dbdb5cf..4aabb45 100644
--- 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 e732b2a..9d091b8 100644
--- 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"