wxUSE_GSTREAMER is Unix-specific, remove it from common wx/setup_inc.h; it also requi...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 451b18c5380c2096c01a21c582d91881d2c33e4a..02fc5f2b156dbac6692ade6a2c678d99df6a4793 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -577,14 +577,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 a3471b7dc3a4890b6ae7f4f9af326b4d25770a54..bfca4f78126e9ea0b3478036d0c771538aace613 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -577,14 +577,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 300eecc4e9c2410c8902ff54931d08cb11f886b7..67a80db3cba186d094fc83f2e5bd25397dad4016 100644 (file)
--- 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
 
 // 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
 // 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 04b27f059d67650316fc174d90a190d3ec62441a..5e6fceb33bea7eb445ddf0b4a83d85f02fc5b0f4 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -577,14 +577,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 ccf753d9fd1506448dacee9c2f8e4f65c9b1d7bf..97a080f03c803c0274eb84dda97c5619c99f4215 100644 (file)
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -578,14 +578,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 04917f436f03f9f8e31863e98c8bc0a4cb3cf273..7a47a7319d0614be7433d9f91d0b00739c3449e2 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -577,14 +577,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 4f21e8a492bfe5f60c2dff6c0bd0c92b82810891..e0ecf29bef2435089d49827f9e3c31a6f32a0eca 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -573,14 +573,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 3e8f5754a2372a6357276e21c74516a95170b4a9..74b5176473431e390950c5f8044a1eff4d2991a0 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -576,14 +576,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // 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
 // 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 a6a4e64cc5154c48b8c34397d2fde9fb7e602b27..f1cff704d9965103fd4282cbc9ee6f01010074a1 100644 (file)
--- a/include/wx/unix/chkconf.h
+++ b/include/wx/unix/chkconf.h
@@ -20,3 +20,14 @@
 #       endif
 #   endif
 #endif /* wxUSE_CONSOLE_EVENTLOOP */
 #       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 d9e18f346d71d4e565ddd1e6d2912b30bb45cf0c..71782da9aeb58ab90c1154ed9a55e07abfaec806 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -567,6 +567,16 @@
 #define wxUSE_UNICODE_UTF8 0
 #define wxUSE_UTF8_LOCALE_ONLY 0
 
 #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
 /* --- start MSW options --- */
 
 #ifndef wxUSE_UNICODE_MSLU