raop: handle VLC_ADD_LIBS

[vlc] / include / vlc_vout_osd.h

diff --git a/include/vlc_vout_osd.h b/include/vlc_vout_osd.h
index a42708c656712848d3adc2380934f2c05584e9c7..d587654c72ecad6bffc36d49780a027670ba800c 100644 (file)
--- a/include/vlc_vout_osd.h
+++ b/include/vlc_vout_osd.h
@@ -35,18 +35,22 @@ extern "C" {
 /**
  * OSD menu position and picture type defines
  */
-#define OSD_HOR_SLIDER 1
-#define OSD_VERT_SLIDER 2
-
-#define OSD_PLAY_ICON 1
-#define OSD_PAUSE_ICON 2
-#define OSD_SPEAKER_ICON 3
-#define OSD_MUTE_ICON 4
+enum
+{
+    /* Icons */
+    OSD_PLAY_ICON = 1,
+    OSD_PAUSE_ICON,
+    OSD_SPEAKER_ICON,
+    OSD_MUTE_ICON,
+    /* Sliders */
+    OSD_HOR_SLIDER,
+    OSD_VERT_SLIDER,
+};
 
 /**********************************************************************
  * Vout text and widget overlays
  **********************************************************************/
-VLC_EXPORT( int, vout_OSDEpg, ( vout_thread_t *, input_item_t * ) );
+VLC_API int vout_OSDEpg( vout_thread_t *, input_item_t * );
 
 /**
  * \brief Write an informative message if the OSD option is enabled.
@@ -56,7 +60,7 @@ VLC_EXPORT( int, vout_OSDEpg, ( vout_thread_t *, input_item_t * ) );
  * \param duration Duration of the text being displayed
  * \param text Text to be displayed
  */
-VLC_EXPORT( void,  vout_OSDText, ( vout_thread_t *vout, int channel, int position, mtime_t duration, const char *text ) );
+VLC_API void vout_OSDText( vout_thread_t *vout, int channel, int position, mtime_t duration, const char *text );
 
 /**
  * \brief Write an informative message at the default location,
@@ -67,7 +71,7 @@ VLC_EXPORT( void,  vout_OSDText, ( vout_thread_t *vout, int channel, int positio
  *
  * Provided for convenience.
  */
-VLC_EXPORT( void,  vout_OSDMessage, ( vout_thread_t *, int, const char *, ... ) LIBVLC_FORMAT( 3, 4 ) );
+VLC_API void vout_OSDMessage( vout_thread_t *, int, const char *, ... ) VLC_FORMAT( 3, 4 );
 
 /**
  * Display a slider on the video output.
@@ -76,7 +80,7 @@ VLC_EXPORT( void,  vout_OSDMessage, ( vout_thread_t *, int, const char *, ... )
  * \param i_postion Current position in the slider
  * \param i_type    Types are: OSD_HOR_SLIDER and OSD_VERT_SLIDER.
  */
-VLC_EXPORT( void, vout_OSDSlider, ( vout_thread_t *, int, int , short ) );
+VLC_API void vout_OSDSlider( vout_thread_t *, int, int , short );
 
 /**
  * Display an Icon on the video output.
@@ -84,7 +88,7 @@ VLC_EXPORT( void, vout_OSDSlider, ( vout_thread_t *, int, int , short ) );
  * \param i_channel Subpicture channel
  * \param i_type    Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON, OSD_SPEAKER_ICON, OSD_MUTE_ICON
  */
-VLC_EXPORT( void, vout_OSDIcon, ( vout_thread_t *, int, short ) );
+VLC_API void vout_OSDIcon( vout_thread_t *, int, short );
 
 #ifdef __cplusplus
 }