Commit 628656a8 authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

completely dropped GEM_VIDEOBACKEND resp GEM_FILMBACKEND

parent e13a191a
......@@ -479,43 +479,6 @@ AC_LINK_IFELSE([AC_LANG_CALL([], [lqt_open_write])],
AC_MSG_RESULT(no))
LIBS="$gem_tmp_lqt_libs"
# using pix_videoOS rather than pix_video
AC_ARG_WITH([video], AS_HELP_STRING([--with-video=plugins|Darwin|DS|NT],[use plugins for video capture or OS-specific "pix_video"]))
AS_IF(
[test "x$with_video" = "x"], [with_video="plugins"],
[test "x$with_video" = "xyes"], [with_video="plugins"],
[test "x$with_video" = "xno"],
[
# hmm, what to do here?
AC_MSG_RESULT([ignoring request for no video...using plugins])
with_video="plugins"
],
[test "x$with_video" = "xplugins"], [:],
[
AC_DEFINE_UNQUOTED([GEM_VIDEOBACKEND], [GEM_VIDEOBACKEND_$with_video], [backend for deprecated video-capture objects])
AC_MSG_RESULT([using deprecated video-loader $with_video])
])
# using pix_filmOS rather than pix_film
AC_ARG_WITH([film], AS_HELP_STRING([--with-film=plugins|Darwin],[use plugins for video decoding or OS-specific "pix_film"]))
AS_IF(
[test "x$with_film" = "x"], [with_film="plugins"],
[test "x$with_film" = "xyes"], [with_film="plugins"],
[test "x$with_film" = "xno"],
[
# hmm, what to do here?
AC_MSG_RESULT([ignoring request for no film...using plugins])
with_film="plugins"
],
[test "x$with_film" = "xplugins"], [:],
[
AC_DEFINE_UNQUOTED([GEM_FILMBACKEND],
[GEM_FILMBACKEND_$with_film], [backend for deprecated film-decoding objects])
AC_MSG_RESULT([using deprecated film-loader $with_film])
])
# enabling "-freg-struct-return" (for FreeFrame)
# i wonder could we make this the default ???
AS_IF([test "x$enable_registerstruct" != "xno" ], [
......
......@@ -20,15 +20,6 @@
# endif
#endif
#define GEM_FILMBACKEND_undefined 0
#define GEM_FILMBACKEND_Darwin 1
#define GEM_VIDEOBACKEND_undefined 0
#define GEM_VIDEOBACKEND_Darwin 1
#define GEM_VIDEOBACKEND_DS 2
#define GEM_VIDEOBACKEND_NT 3
#define GEM_VIDEOBACKEND_SGI 4
#ifdef HAVE_CONFIG_H
# include "config.h"
......@@ -47,16 +38,6 @@
# endif
#endif
#if defined GEM_VIDEOBACKEND && GEM_VIDEOBACKEND == GEM_VIDEOBACKEND_undefined
# warning ignoring unknown video backend
# undef GEM_VIDEOBACKEND
#endif
#if defined GEM_FILMBACKEND && GEM_FILMBACKEND == GEM_FILMBACKEND_undefined
# warning ignoring unknown film backend
# undef GEM_FILMBACKEND
#endif
#ifdef HAVE_LIBFTGL
# define FTGL
#endif
......
......@@ -15,7 +15,6 @@
//
/////////////////////////////////////////////////////////
#include "Gem/GemConfig.h"
#ifndef GEM_FILMBACKEND
#include "pix_film.h"
#include "Gem/Image.h"
......@@ -786,4 +785,3 @@ void pix_film :: changeImageCallback(void *data, t_symbol *, int argc,
GetMyClass(data)->changeImage((argc<1)?0:atom_getint(argv),
(argc<2)?0:atom_getint(argv+1));
}
#endif /*OS-specific GEM_FILMBACKEND */
......@@ -17,7 +17,6 @@
/////////////////////////////////////////////////////////
#include "Gem/GemConfig.h"
#ifndef GEM_FILMBACKEND
#include "pix_movie.h"
#include "Gem/State.h"
......@@ -196,5 +195,3 @@ void pix_movie :: rectangleCallback(void *data, t_float quality)
{
GetMyClass(data)->modeMess(static_cast<int>(quality));
}
#endif /* no OS-specific GEM_FILMBACKEND */
......@@ -16,8 +16,6 @@
#include "Gem/GemConfig.h"
#ifndef GEM_VIDEOBACKEND
#include "pix_video.h"
#include "Gem/State.h"
#include "Gem/Image.h"
......@@ -1037,4 +1035,3 @@ void pix_video :: openMessCallback(void *data, t_symbol*s, int argc,
GetMyClass(data)->startRendering();
}
}
#endif /* no OS-specific GEM_VIDEOBACKEND */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment