diff options
author | Vincent Torri <vtorri@univ-evry.fr> | 2007-01-03 19:54:33 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2007-01-03 19:54:33 +0000 |
commit | e163953b0e1c80aab8622cc0ec5ed567da8097c1 (patch) | |
tree | 44aab9ef7ea0673e97cb433f4853b910da9b9025 /sys | |
parent | 9b1bffb45607c0cdfc80d1c856d331789789cd34 (diff) | |
download | gst-plugins-bad-e163953b0e1c80aab8622cc0ec5ed567da8097c1.tar.gz gst-plugins-bad-e163953b0e1c80aab8622cc0ec5ed567da8097c1.tar.bz2 gst-plugins-bad-e163953b0e1c80aab8622cc0ec5ed567da8097c1.zip |
Add directdrawsink to build and dist it, so it gets built when compiling with MingW on win32 and the required headers...
Original commit message from CVS:
Patch by: Vincent Torri <vtorri at univ-evry fr>
* configure.ac:
* sys/Makefile.am:
* sys/directdraw/Makefile.am:
Add directdrawsink to build and dist it, so it gets built when
compiling with MingW on win32 and the required headers and libraries
are available (fixes: #392313).
* sys/directdraw/gstdirectdrawsink.c:
(gst_directdrawsink_center_rect), (gst_directdrawsink_show_frame),
(gst_directdrawsink_setup_ddraw),
(gst_directdrawsink_surface_create):
Comment out some unused things and fix some printf format issues in
order to avoid warnings when buildling with MingW (#392313).
Diffstat (limited to 'sys')
-rw-r--r-- | sys/Makefile.am | 10 | ||||
-rw-r--r-- | sys/directdraw/Makefile.am | 9 | ||||
-rw-r--r-- | sys/directdraw/gstdirectdrawsink.c | 17 |
3 files changed, 27 insertions, 9 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 3866499c..66c97a31 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -34,6 +34,12 @@ else DVB_DIR= endif -SUBDIRS = $(GL_DIR) $(DVB_DIR) +if USE_DIRECTDRAW +DIRECTDRAW_DIR=directdraw +else +DIRECTDRAW_DIR= +endif + +SUBDIRS = $(GL_DIR) $(DVB_DIR) $(DIRECTDRAW_DIR) -DIST_SUBDIRS = glsink dvb +DIST_SUBDIRS = glsink dvb directdraw diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am new file mode 100644 index 00000000..999f026e --- /dev/null +++ b/sys/directdraw/Makefile.am @@ -0,0 +1,9 @@ +plugin_LTLIBRARIES = libgstdirectdrawsink.la
+
+libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c
+libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
+libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \
+ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+ -lgstinterfaces-$(GST_MAJORMINOR)
+libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c index ec449c7d..ff1d8de4 100644 --- a/sys/directdraw/gstdirectdrawsink.c +++ b/sys/directdraw/gstdirectdrawsink.c @@ -168,6 +168,7 @@ gst_ddrawvideosink_get_format_from_caps (GstCaps * caps, return ret; } +/* static GstCaps * gst_ddrawvideosink_get_caps_from_format (DDPIXELFORMAT pixel_format) { @@ -201,6 +202,7 @@ gst_ddrawvideosink_get_caps_from_format (DDPIXELFORMAT pixel_format) return caps; } +*/ static void gst_directdrawsink_center_rect (RECT src, RECT dst, RECT * result) @@ -241,7 +243,7 @@ gst_directdrawsink_center_rect (RECT src, RECT dst, RECT * result) } GST_CAT_INFO (directdrawsink_debug, - "source is %dx%d dest is %dx%d, result is %dx%d with x,y %dx%d", + "source is %ldx%ld dest is %ldx%ld, result is %ldx%ld with x,y %ldx%ld", src_width, src_height, dst_width, dst_heigth, result->right - result->left, result->bottom - result->top, result->left, result->right); @@ -1189,8 +1191,7 @@ gst_directdrawsink_show_frame (GstBaseSink * bsink, GstBuffer * buf) "IDirectDrawSurface_Blt returned %s", DDErrorString (hRes)); else GST_CAT_INFO (directdrawsink_debug, - "allocated surface was blit to our primary", - DDErrorString (hRes)); + "allocated surface was blit to our primary"); } } } @@ -1212,7 +1213,7 @@ gst_directdrawsink_setup_ddraw (GstDirectDrawSink * ddrawsink) /*UUID IDirectDraw7_ID; //IDirectDraw_QueryInterface() - /*create an instance of the ddraw object + create an instance of the ddraw object hRes = DirectDrawCreateEx (DDCREATE_EMULATIONONLY, (void**)&ddrawsink->ddraw_object, (REFIID)IID_IDirectDraw7, NULL); */ @@ -1679,7 +1680,7 @@ gst_directdrawsink_surface_create (GstDirectDrawSink * ddrawsink, if (surf_lock_desc.lPitch != pitch) { GST_CAT_INFO (directdrawsink_debug, - "DDraw stride/pitch %d isn't as expected value %d, let's continue allocating buffer.", + "DDraw stride/pitch %ld isn't as expected value %d, let's continue allocating buffer.", surf_lock_desc.lPitch, pitch); /*Unlock the surface as we will change it to use system memory with a GStreamer compatible pitch */ @@ -1688,7 +1689,7 @@ gst_directdrawsink_surface_create (GstDirectDrawSink * ddrawsink, } GST_CAT_INFO (directdrawsink_debug, - "allocating a surface of %d bytes (stride=%d)\n", size, + "allocating a surface of %d bytes (stride=%ld)\n", size, surf_lock_desc.lPitch); GST_BUFFER_DATA (surface) = surf_lock_desc.lpSurface; GST_BUFFER_SIZE (surface) = surf_lock_desc.lPitch * surface->height; @@ -1718,7 +1719,9 @@ gst_directdrawsink_surface_create (GstDirectDrawSink * ddrawsink, /* Keep a ref to our sink */ surface->ddrawsink = gst_object_ref (ddrawsink); -beach: + /* + beach: + */ return surface; } |