Win32: Merge direct3d-desktop and video-wallpaper to fix usability issue

[vlc] / src / video_output / display.h

diff --git a/src/video_output/display.h b/src/video_output/display.h
index a6987f6098f08d615b613c7ccb76fbe1f33e80eb..86746fd40987b8a8a659064332fc2b7b6b56ec3f 100644 (file)
--- a/src/video_output/display.h
+++ b/src/video_output/display.h
@@ -6,25 +6,21 @@
  *
  * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
-
 #include <vlc_vout_wrapper.h>
 
 #if 0
@@ -109,8 +105,17 @@ void vout_SetDisplayCrop(vout_display_t *,
 
 #endif
 
+vout_display_t *vout_NewSplitter(vout_thread_t *vout,
+                                 const video_format_t *source,
+                                 const vout_display_state_t *state,
+                                 const char *module,
+                                 const char *splitter_module,
+                                 mtime_t double_click_timeout,
+                                 mtime_t hide_timeout);
+
 /* FIXME should not be there */
 void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *);
 vout_window_t *vout_NewDisplayWindow(vout_thread_t *, vout_display_t *, const vout_window_cfg_t *);
 void vout_DeleteDisplayWindow(vout_thread_t *, vout_display_t *, vout_window_t *);
+void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t *);