From 5508feb8f77768db2cbab92f9c329e6f7db5827a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 May 2009 09:40:15 +0000 Subject: [PATCH] wxUSE_GSTREAMER is Unix-specific, remove it from common wx/setup_inc.h; it also requires wxUSE_THREADS, check for it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/setup0.h | 8 -------- include/wx/msw/setup0.h | 8 -------- include/wx/msw/wince/setup.h | 8 -------- include/wx/os2/setup0.h | 8 -------- include/wx/osx/setup0.h | 8 -------- include/wx/palmos/setup0.h | 8 -------- include/wx/setup_inc.h | 8 -------- include/wx/univ/setup0.h | 8 -------- include/wx/unix/chkconf.h | 11 +++++++++++ setup.h.in | 10 ++++++++++ 10 files changed, 21 insertions(+), 64 deletions(-) diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 451b18c538..02fc5f2b15 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -577,14 +577,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index a3471b7dc3..bfca4f7812 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -577,14 +577,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 300eecc4e9..67a80db3cb 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -577,14 +577,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 04b27f059d..5e6fceb33b 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -577,14 +577,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index ccf753d9fd..97a080f03c 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -578,14 +578,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 04917f436f..7a47a7319d 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -577,14 +577,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 4f21e8a492..e0ecf29bef 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -573,14 +573,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 3e8f5754a2..74b5176473 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -576,14 +576,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix. -// -// Default is 0 as this requires a lot of dependencies which might not be -// available. -// -// Recommended setting: 1 (wxMediaCtrl won't work by default without it) -#define wxUSE_GSTREAMER 0 - // Use wxWidget's XRC XML-based resource system. Recommended. // // Default is 1 diff --git a/include/wx/unix/chkconf.h b/include/wx/unix/chkconf.h index a6a4e64cc5..f1cff704d9 100644 --- a/include/wx/unix/chkconf.h +++ b/include/wx/unix/chkconf.h @@ -20,3 +20,14 @@ # endif # endif #endif /* wxUSE_CONSOLE_EVENTLOOP */ + +#if wxUSE_GSTREAMER +# if !wxUSE_THREADS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "GStreamer requires threads" +# else +# undef wxUSE_GSTREAMER +# define wxUSE_GSTREAMER 0 +# endif +# endif +#endif /* wxUSE_GSTREAMER */ diff --git a/setup.h.in b/setup.h.in index d9e18f346d..71782da9ae 100644 --- a/setup.h.in +++ b/setup.h.in @@ -567,6 +567,16 @@ #define wxUSE_UNICODE_UTF8 0 #define wxUSE_UTF8_LOCALE_ONLY 0 +/* + Use GStreamer for Unix. + + Default is 0 as this requires a lot of dependencies which might not be + available. + + Recommended setting: 1 (wxMediaCtrl won't work by default without it). + */ +#define wxUSE_GSTREAMER 0 + /* --- start MSW options --- */ #ifndef wxUSE_UNICODE_MSLU -- 2.45.2