diff options
| -rw-r--r-- | include/xine.h.in | 34 | ||||
| -rwxr-xr-x | src/video_out/video_out_directx.c | 3 | ||||
| -rw-r--r-- | win32/source/xineint.h | 1 |
3 files changed, 34 insertions, 4 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 622016346..72939d0f0 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.h.in,v 1.113 2003/12/31 23:29:06 jcdutton Exp $ + * $Id: xine.h.in,v 1.114 2004/01/03 20:23:19 valtri Exp $ * * public xine-lib (libxine) interface and documentation * @@ -53,6 +53,11 @@ extern "C" { #include <sys/time.h> #include <time.h> +#ifdef WIN32 +# include <windows.h> +# include <windowsx.h> +#endif + /* This enables some experimental features. These are not part of the * official libxine API, so use them only, if you absolutely need them. * Although we make efforts to keep even this part of the API as stable @@ -1092,6 +1097,33 @@ typedef struct { } fb_visual_t; +#ifdef WIN32 +/* + * this is the visual data struct any win32 gui should supply + * (pass this to init_video_out_plugin or the xine_load_video_output_plugin + * utility function) + */ + +typedef struct { + + HWND WndHnd; /* handle of window associated with primary surface */ + HINSTANCE HInst; /* handle of windows application instance */ + RECT WndRect; /* rect of window client points translated to screen + * cooridnates */ + int FullScreen; /* is window fullscreen */ + HBRUSH Brush; /* window brush for background color */ + COLORREF ColorKey; /* window brush color key */ + +} win32_visual_t; + +/* + * constants for gui_data_exchange's data_type parameter + */ + +#define GUI_WIN32_MOVED_OR_RESIZED 0 + +#endif /* WIN32 */ + /* * "type" constants for xine_port_send_gui_data(...) */ diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 4237ca56e..2a2e9395b 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -20,7 +20,7 @@ * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> * - * $Id: video_out_directx.c,v 1.15 2004/01/01 18:14:51 valtri Exp $ + * $Id: video_out_directx.c,v 1.16 2004/01/03 20:23:19 valtri Exp $ */ typedef unsigned char boolean; @@ -30,7 +30,6 @@ typedef unsigned char boolean; #include "xine.h" #include "video_out.h" -#include "video_out_win32.h" #include "alphablend.h" #define LOG_MODULE "video_out_directx" diff --git a/win32/source/xineint.h b/win32/source/xineint.h index b2071cf78..9077db37f 100644 --- a/win32/source/xineint.h +++ b/win32/source/xineint.h @@ -21,7 +21,6 @@ * by Matthew Grooms <elon@altavista.com>
*/
-#include "video_out_win32.h"
#ifdef XINE_COMPILE
# include "configfile.h"
# include "xine.h"
|