raop: handle VLC_ADD_LIBS

[vlc] / include / vlc_vout_window.h

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index f4dddeae35c7d66c1f8b106f426430121cd3ed1c..aac70e084d9a7416b81162f2a74edec70c0fdf46 100644 (file)
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -46,6 +46,12 @@ enum {
     VOUT_WINDOW_TYPE_NSOBJECT,
 };
 
+#if defined (WIN32) || defined (__OS2__)
+# define VOUT_WINDOW_TYPE_NATIVE VOUT_WINDOW_TYPE_HWND
+#elif defined (__unix__)
+# define VOUT_WINDOW_TYPE_NATIVE VOUT_WINDOW_TYPE_XID
+#endif
+
 /**
  * Control query for vout_window_t
  */
@@ -79,11 +85,6 @@ typedef struct {
 struct vout_window_t {
     VLC_COMMON_MEMBERS
 
-    /* Initial state (reserved).
-     * Once the open function is called, it will be set to NULL
-     */
-    const vout_window_cfg_t *cfg;
-
     /* window handle (mandatory)
      *
      * It must be filled in the open function.
@@ -112,7 +113,7 @@ struct vout_window_t {
     vout_window_sys_t *sys;
 };
 
-/** 
+/**
  * Creates a new window.
  *
  * @param module plugin name (usually "$window")
@@ -120,14 +121,14 @@ struct vout_window_t {
  / vout_display_NewWindow() and vout_display_DeleteWindow() instead.
  * This enables recycling windows.
  */
-VLC_EXPORT( vout_window_t *, vout_window_New, (vlc_object_t *, const char *module, const vout_window_cfg_t *) );
+VLC_API vout_window_t * vout_window_New(vlc_object_t *, const char *module, const vout_window_cfg_t *);
 
 /**
  * Deletes a window created by vout_window_New().
  *
  * @note See vout_window_New() about window recycling.
  */
-VLC_EXPORT( void, vout_window_Delete, (vout_window_t *) );
+VLC_API void vout_window_Delete(vout_window_t *);
 
 
 /**
@@ -137,7 +138,7 @@ VLC_EXPORT( void, vout_window_Delete, (vout_window_t *) );
  *
  * @warning The caller must own the window, as vout_window_t is not thread safe.
  */
-VLC_EXPORT( int, vout_window_Control, (vout_window_t *, int query, ...) );
+VLC_API int vout_window_Control(vout_window_t *, int query, ...);
 
 /**
  * Configures the window manager state for this window.