[vlc-devel] [PATCH] core: move vlc_vout_wrapper.h in the core

[Steve Lhomme]

It doesn't export anything that is usable by modules.
---
 src/Makefile.am                                           | 2 +-
 src/video_output/display.h                                | 2 +-
 src/video_output/vout_internal.h                          | 2 +-
 src/video_output/vout_wrapper.c                           | 1 -
 .../vlc_vout_wrapper.h => src/video_output/vout_wrapper.h | 8 ++++----
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename include/vlc_vout_wrapper.h => src/video_output/vout_wrapper.h (95%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a28cdb837b..b3022d2104a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,7 +119,6 @@ noinst_HEADERS = \
 	../include/vlc_pgpkey.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
-	../include/vlc_vout_wrapper.h \
 	$(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
@@ -293,6 +292,7 @@ libvlccore_la_SOURCES = \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
 	video_output/vout_spuregion_helper.h \
+	video_output/vout_wrapper.h \
 	video_output/window.c \
 	video_output/window.h \
 	video_output/opengl.c \
diff --git a/src/video_output/display.h b/src/video_output/display.h
index 8d75df3a831..f1297b59c5e 100644
--- a/src/video_output/display.h
+++ b/src/video_output/display.h
@@ -21,7 +21,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc_vout_wrapper.h>
+#include "vout_wrapper.h"
 
 vout_display_t *vout_NewSplitter(vout_thread_t *vout,
                                  const video_format_t *source,
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 8eaac0dee93..8fb36a69db2 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -28,7 +28,7 @@
 #include <vlc_picture_fifo.h>
 #include <vlc_picture_pool.h>
 #include <vlc_vout_display.h>
-#include <vlc_vout_wrapper.h>
+#include "vout_wrapper.h"
 #include "snapshot.h"
 #include "statistic.h"
 #include "chrono.h"
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 88d22b42d79..47637c15aff 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout_wrapper.h>
 #include <vlc_vout.h>
 #include <assert.h>
 #include "vout_internal.h"
diff --git a/include/vlc_vout_wrapper.h b/src/video_output/vout_wrapper.h
similarity index 95%
rename from include/vlc_vout_wrapper.h
rename to src/video_output/vout_wrapper.h
index a394bd4d70f..552e890bbb6 100644
--- a/include/vlc_vout_wrapper.h
+++ b/src/video_output/vout_wrapper.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * vlc_vout_wrapper.h: definitions for vout wrappers (temporary)
+ * vout_wrapper.h: definitions for vout wrappers (temporary)
  *****************************************************************************
  * Copyright (C) 2009 Laurent Aimar
  * $Id$
@@ -21,8 +21,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef VLC_VOUT_WRAPPER_H
-#define VLC_VOUT_WRAPPER_H 1
+#ifndef LIBVLC_VOUT_WRAPPER_H
+#define LIBVLC_VOUT_WRAPPER_H 1
 
 #include <vlc_vout_display.h>
 
@@ -93,5 +93,5 @@ void vout_SetDisplayCrop(vout_display_t *, unsigned num, unsigned den,
                          unsigned left, unsigned top, int right, int bottom);
 void vout_SetDisplayViewpoint(vout_display_t *, const vlc_viewpoint_t *);
 
-#endif /* VLC_VOUT_WRAPPER_H */
+#endif /* LIBVLC_VOUT_WRAPPER_H */
 
-- 
2.17.1