[vlc-commits] commit: Made vout_ShowText* private to the core. (Laurent Aimar )

git at videolan.org git at videolan.org
Tue May 4 22:26:14 CEST 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May  4 20:02:44 2010 +0200| [8f0d6292981f4487f106398a5bcfe497fbb7c59e] | committer: Laurent Aimar 

Made vout_ShowText* private to the core.

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

 include/vlc_osd.h                |    5 -----
 src/libvlccore.sym               |    2 --
 src/video_output/vout_internal.h |    5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index 5fc7472..78292cf 100644
--- a/include/vlc_osd.h
+++ b/include/vlc_osd.h
@@ -624,11 +624,6 @@ VLC_EXPORT( int, osd_Icon, ( vlc_object_t *, spu_t *, int, int, int, int, int, s
 /**********************************************************************
  * Vout text and widget overlays
  **********************************************************************/
-
-VLC_EXPORT( int, vout_ShowTextRelative, ( vout_thread_t *, int, char *, const text_style_t *, int, int, int, mtime_t ) );
-
-VLC_EXPORT( int, vout_ShowTextAbsolute, ( vout_thread_t *, int, const char *, const text_style_t *, int, int, int, mtime_t, mtime_t ) );
-
 VLC_EXPORT( int, vout_OSDEpg, ( vout_thread_t *, input_item_t * ) );
 
 /**
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index f2343e9..ae0b87b 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -621,8 +621,6 @@ vout_OSDMessage
 vout_OSDEpg
 vout_OSDSlider
 vout_Request
-vout_ShowTextAbsolute
-vout_ShowTextRelative
 vout_window_New
 vout_window_Control
 vout_window_Delete
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index a182e72..d6b8fe2 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -169,5 +169,10 @@ void vout_DisplayWrapper(vout_thread_t *, picture_t *);
 /* */
 int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
 
+/* */
+int vout_ShowTextRelative( vout_thread_t *, int, char *, const text_style_t *, int, int, int, mtime_t );
+int vout_ShowTextAbsolute( vout_thread_t *, int, const char *, const text_style_t *, int, int, int, mtime_t, mtime_t );
+
+
 #endif
 



More information about the vlc-commits mailing list