From ce756cb06a93facb4faa35a1d57c7038fc26e8e1 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Sat, 12 Feb 2005 01:30:39 +0000 Subject: [PATCH] properly detect gstreamer and libxml headers and libs, reflect that wxMediaCtrl now on unix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 438 ++++++++++++++++++++++++++++-------- configure.in | 181 ++++++++++++--- docs/latex/wx/mediactrl.tex | 4 +- include/wx/mediactrl.h | 1 + setup.h.in | 2 + 5 files changed, 509 insertions(+), 117 deletions(-) diff --git a/configure b/configure index 57f284bf29..44b083fcc2 100755 --- a/configure +++ b/configure @@ -20801,6 +20801,11 @@ SEARCH_INCLUDE="\ /usr/include/wine \ /usr/local/include/wine \ \ + /usr/include/gstreamer-0.8 \ + /usr/local/include/gstreamer-0.8 \ + /usr/include/libxml2 \ + /usr/local/include/libxml2 \ + \ /usr/unsupported/include \ /usr/athena/include \ /usr/local/x11r5/include \ @@ -27892,94 +27897,6 @@ done fi -if test "$wxUSE_MEDIACTRL" = "yes"; then - if test "$wxUSE_MSW" = 1; then - wxUSE_DIRECTSHOW="yes" - -for ac_header in dshow.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -else - - wxUSE_DIRECTSHOW="no" - { echo "$as_me:$LINENO: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&5 -echo "$as_me: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&2;} - -fi - -done - - - if test "$wxUSE_DIRECTSHOW" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DIRECTSHOW 1 -_ACEOF - - LIBS="$LIBS -lstrmiids" - fi - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" - cat >>confdefs.h <<\_ACEOF -#define wxUSE_MEDIACTRL 1 -_ACEOF - -fi - - USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then @@ -38595,6 +38512,351 @@ _ACEOF fi +if test "$wxUSE_MEDIACTRL" = "yes"; then + if test "$wxUSE_MSW" = 1; then + wxUSE_DIRECTSHOW="yes" + +for ac_header in dshow.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + + wxUSE_DIRECTSHOW="no" + { echo "$as_me:$LINENO: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&5 +echo "$as_me: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&2;} + +fi + +done + + + if test "$wxUSE_DIRECTSHOW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DIRECTSHOW 1 +_ACEOF + + LIBS="$LIBS -lstrmiids" + fi + fi + + if test "$wxUSE_GTK" = 1; then + wxUSE_GSTREAMER="yes" + + echo "$as_me:$LINENO: checking for libxml2" >&5 +echo $ECHO_N "checking for libxml2... $ECHO_C" >&6 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB /usr/lib; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libxml2.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking for libxml2 headers" >&5 +echo $ECHO_N "checking for libxml2 headers... $ECHO_C" >&6 + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE /usr/include; + do + if test -f "$ac_dir/libxml/xmlstring.h"; then + ac_find_includes=$ac_dir + break + fi + done + + if test "$ac_find_includes" != "" ; then + echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5 +echo "${ECHO_T}found in $ac_find_includes" >&6 + + if test "x$ac_find_includes" = "x/usr/include"; then + ac_path_to_include="" + else + echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include=" -I$ac_find_includes" + fi + fi + + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" + else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: found in default search path" >&5 +echo "${ECHO_T}found in default search path" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wxUSE_GSTREAMER="no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + else + wxUSE_GSTREAMER="no" + fi + + if test "$wxUSE_GSTREAMER" = "yes"; then + echo "$as_me:$LINENO: checking for gstreamer 0.8" >&5 +echo $ECHO_N "checking for gstreamer 0.8... $ECHO_C" >&6 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB /usr/lib; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libgstreamer-0.8.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking for gstplay 0.8" >&5 +echo $ECHO_N "checking for gstplay 0.8... $ECHO_C" >&6 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB /usr/lib; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libgstplay-0.8.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking for gstinterfaces 0.8" >&5 +echo $ECHO_N "checking for gstinterfaces 0.8... $ECHO_C" >&6 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB /usr/lib; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libgstinterfaces-0.8.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking for GStreamer headers" >&5 +echo $ECHO_N "checking for GStreamer headers... $ECHO_C" >&6 + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE /usr/include; + do + if test -f "$ac_dir/gst/gst.h"; then + ac_find_includes=$ac_dir + break + fi + done + + if test "$ac_find_includes" != "" ; then + echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5 +echo "${ECHO_T}found in $ac_find_includes" >&6 + + if test "x$ac_find_includes" = "x/usr/include"; then + ac_path_to_include="" + else + echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include=" -I$ac_find_includes" + fi + fi + + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" + else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: found in default search path" >&5 +echo "${ECHO_T}found in default search path" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wxUSE_GSTREAMER="no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + else + wxUSE_GSTREAMER="no" + fi + else + wxUSE_GSTREAMER="no" + fi + else + wxUSE_GSTREAMER="no" + fi + + if test "$wxUSE_GSTREAMER" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GSTREAMER 1 +_ACEOF + + LIBS="$LIBS -lgstreamer-0.8 -lgstplay-0.8" + LIBS="$LIBS -lgstinterfaces-0.8 -lxml2" + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + fi + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MEDIACTRL 1 +_ACEOF + +fi + + if test "$cross_compiling" = "yes"; then OSINFO="\"$host\"" else diff --git a/configure.in b/configure.in index 0a50283ed3..f02789d457 100644 --- a/configure.in +++ b/configure.in @@ -1982,6 +1982,11 @@ SEARCH_INCLUDE="\ /usr/include/wine \ /usr/local/include/wine \ \ + /usr/include/gstreamer-0.8 \ + /usr/local/include/gstreamer-0.8 \ + /usr/include/libxml2 \ + /usr/local/include/libxml2 \ + \ /usr/unsupported/include \ /usr/athena/include \ /usr/local/x11r5/include \ @@ -3230,33 +3235,6 @@ dnl --------------------------------------------------------------------------- fi fi -dnl --------------------------------------------------------------------------- -dnl wxMediaCtrl -dnl --------------------------------------------------------------------------- - -if test "$wxUSE_MEDIACTRL" = "yes"; then - if test "$wxUSE_MSW" = 1; then -dnl --------------------------------------------------------------------------- -dnl DirectShow MSW -dnl --------------------------------------------------------------------------- - wxUSE_DIRECTSHOW="yes" - AC_CHECK_HEADERS([dshow.h], [], - [ - wxUSE_DIRECTSHOW="no" - AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher]) - ], - [#include ]) - - if test "$wxUSE_DIRECTSHOW" = "yes"; then - AC_DEFINE(wxUSE_DIRECTSHOW) - LIBS="$LIBS -lstrmiids" - fi - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" - AC_DEFINE(wxUSE_MEDIACTRL) -fi - dnl --------------------------------------------------------------------------- dnl OpenGL libraries dnl --------------------------------------------------------------------------- @@ -5997,6 +5975,155 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" fi +dnl --------------------------------------------------------------------------- +dnl wxMediaCtrl +dnl --------------------------------------------------------------------------- + +if test "$wxUSE_MEDIACTRL" = "yes"; then + if test "$wxUSE_MSW" = 1; then + dnl ----------------------------------------------------------------------- + dnl DirectShow MSW + dnl ----------------------------------------------------------------------- + wxUSE_DIRECTSHOW="yes" + AC_CHECK_HEADERS([dshow.h], [], + [ + wxUSE_DIRECTSHOW="no" + AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher]) + ], + [#include ]) + + if test "$wxUSE_DIRECTSHOW" = "yes"; then + AC_DEFINE(wxUSE_DIRECTSHOW) + LIBS="$LIBS -lstrmiids" + fi + fi + + dnl ----------------------------------------------------------------------- + dnl GStreamer + dnl ----------------------------------------------------------------------- + if test "$wxUSE_GTK" = 1; then + wxUSE_GSTREAMER="yes" + + dnl --------------------------------------------------------------- + dnl check for libxml2 lib + dnl --------------------------------------------------------------- + AC_MSG_CHECKING([for libxml2]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],xml2) + if test "$ac_find_libraries" != "" ; then + dnl ----------------------------------------------------------- + dnl Check for libxml2's xmlstring.h header + dnl Break out if not found + dnl ----------------------------------------------------------- + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING(for libxml2 headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, libxml/xmlstring.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found in $ac_find_includes) + WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" + else + AC_TRY_COMPILE( + [ + #include + ], + [], + [AC_MSG_RESULT(found in default search path)], + [wxUSE_GSTREAMER="no"]) + fi + else + dnl ----------------------------------------------------------- + dnl libxml2 lib not found - break out + dnl ----------------------------------------------------------- + wxUSE_GSTREAMER="no" + fi + + if test "$wxUSE_GSTREAMER" = "yes"; then + dnl ----------------------------------------------------------- + dnl test for gstreamer main lib + dnl ----------------------------------------------------------- + AC_MSG_CHECKING([for gstreamer 0.8]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],gstreamer-0.8) + if test "$ac_find_libraries" != "" ; then + dnl ------------------------------------------------------- + dnl Check for GStreamer gstplay lib + dnl ------------------------------------------------------- + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([for gstplay 0.8]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],gstplay-0.8) + if test "$ac_find_libraries" != "" ; then + dnl --------------------------------------------------- + dnl gstplay lib found - check for gstinterfaces lib + dnl --------------------------------------------------- + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([for gstinterfaces 0.8]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],gstinterfaces-0.8) + if test "$ac_find_libraries" != "" ; then + dnl ----------------------------------------------- + dnl GStreamer libs found - check for gstreamer + dnl include path and header + dnl ----------------------------------------------- + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING(for GStreamer headers) + WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, gst/gst.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found in $ac_find_includes) + WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" + else + AC_TRY_COMPILE( + [ + #include + ], + [], + [AC_MSG_RESULT(found in default search path)], + [wxUSE_GSTREAMER="no"]) + fi + else + dnl ----------------------------------------------- + dnl gstinterfaces lib not found - break out + dnl ----------------------------------------------- + wxUSE_GSTREAMER="no" + fi + else + dnl --------------------------------------------------- + dnl gstplay lib not found - break out + dnl --------------------------------------------------- + wxUSE_GSTREAMER="no" + fi + else + dnl ------------------------------------------------------- + dnl Main GStreamer lib not found - break out + dnl ------------------------------------------------------- + wxUSE_GSTREAMER="no" + fi + + dnl ----------------------------------------------------------- + dnl Check if everything went ok - if not then print no + dnl and break out + dnl ----------------------------------------------------------- + if test "$wxUSE_GSTREAMER" = "yes"; then + dnl ------------------------------------------------------- + dnl Success! Define wxUSE_GSTREAMER to 1 so that + dnl src/unix/mediactrl.cpp will build with GStreamer + dnl enabled, and add the 3 gstreamer libs and the libxml2 + dnl to the linker's library includes + dnl ------------------------------------------------------- + AC_DEFINE(wxUSE_GSTREAMER) + LIBS="$LIBS -lgstreamer-0.8 -lgstplay-0.8" + LIBS="$LIBS -lgstinterfaces-0.8 -lxml2" + else + dnl ------------------------------------------------------- + dnl Generic "NO" message - triggered if any of the above + dnl conditions doesn't pan out + dnl ------------------------------------------------------- + AC_MSG_RESULT([no]) + fi + fi + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" + AC_DEFINE(wxUSE_MEDIACTRL) +fi + dnl --------------------------------------------------------------------------- dnl get the string with OS info - used by wxGetOsDescription() on MacOS X dnl --------------------------------------------------------------------------- diff --git a/docs/latex/wx/mediactrl.tex b/docs/latex/wx/mediactrl.tex index e2e78c5a3b..9506d73c19 100644 --- a/docs/latex/wx/mediactrl.tex +++ b/docs/latex/wx/mediactrl.tex @@ -18,8 +18,6 @@ wxMediaCtrl uses native backends to render media, for example on Windows there is a ActiveMovie/DirectShow backend, and on Macintosh there is a QuickTime backend. -wxMediaCtrl is not currently available on unix systems. - \wxheading{Derived from} \helpref{wxControl}{wxcontrol} @@ -107,6 +105,8 @@ and is available on Windows Only.} Use QuickTime. Windows and Mac Only. WARNING: On Mac Systems lower than OSX 10.2 this defaults to emulating window positioning and suffers from several bugs, including not working correctly embedded in a wxNotebook. } \twocolitem{{\bf wxMEDIABACKEND\_MCI}}{ Use Media Command Interface. Windows Only. } +\twocolitem{{\bf wxMEDIABACKEND\_GSTREAMER}}{ +Use GStreamer. Unix Only. } \end{twocollist} \membersection{wxMediaCtrl::wxMediaCtrl}\label{wxmediactrlwxmediactrl} diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index 78e62fc1ed..001eb73e55 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -58,6 +58,7 @@ enum wxMediaState #define wxMEDIABACKEND_DIRECTSHOW wxT("wxAMMediaBackend") #define wxMEDIABACKEND_MCI wxT("wxMCIMediaBackend") #define wxMEDIABACKEND_QUICKTIME wxT("wxQTMediaBackend") +#define wxMEDIABACKEND_GSTREAMER wxT("wxGStreamerMediaBackend") // ---------------------------------------------------------------------------- // diff --git a/setup.h.in b/setup.h.in index a2d34d8709..c7e4bb9aea 100644 --- a/setup.h.in +++ b/setup.h.in @@ -276,6 +276,8 @@ #define wxUSE_DIRECTSHOW 0 +#define wxUSE_GSTREAMER 0 + #define wxUSE_XRC 0 #if wxUSE_XRC -- 2.47.2