diff options
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | include/xine.h.tmpl.in | 7 | ||||
| -rw-r--r-- | src/video_out/Makefile.am | 9 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 7 |
5 files changed, 30 insertions, 7 deletions
diff --git a/acconfig.h b/acconfig.h index 212caa961..960362269 100644 --- a/acconfig.h +++ b/acconfig.h @@ -41,6 +41,9 @@ /* Define this if you have libXinerama installed */ #undef HAVE_XINERAMA +/* Define this if you have libaa installed */ +#undef HAVE_AA + /* Define this if you have Alsa (libasound) installed */ #undef HAVE_ALSA diff --git a/configure.in b/configure.in index ce2eb966c..03077b0b9 100644 --- a/configure.in +++ b/configure.in @@ -182,7 +182,18 @@ AC_CHECK_LIB(Xinerama, XineramaQueryExtension, ac_have_xinerama="yes",, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") + +dnl +dnl Checks for Ascii-Art library +dnl + +AC_CHECK_LIB(aa, main, + LIBS="$LIBS -laa" + AC_DEFINE(HAVE_AA) + ac_have_aa="yes",,) +AM_CONDITIONAL(HAVE_AA, test x$ac_have_aa = "xyes") + dnl dnl Alsa support diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index 296dc0ca4..c4858a481 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -29,7 +29,7 @@ \endverbatim */ /* - * $Id: xine.h.tmpl.in,v 1.19 2001/05/28 21:47:43 f1rmb Exp $ + * $Id: xine.h.tmpl.in,v 1.20 2001/06/10 23:10:52 heikos Exp $ * */ @@ -497,8 +497,9 @@ char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id); */ #define VISUAL_TYPE_X11 1 -#define VISUAL_TYPE_FB 2 -#define VISUAL_TYPE_GTK 3 +#define VISUAL_TYPE_AA 2 +#define VISUAL_TYPE_FB 3 +#define VISUAL_TYPE_GTK 4 /** * \fn char **list_video_output_plugins (int visual_type) diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index ba7769edd..249e5044c 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -12,13 +12,17 @@ xv_module = xineplug_vo_out_xv.la endif endif +if HAVE_AA +aa_module = xineplug_vo_out_aa.la +endif + ## # IMPORTANT: # --------- # All of xine video out plugins should be named like the # scheme "xineplug_vo_out_" # -lib_LTLIBRARIES = $(xv_module) $(syncfb_module) $(xshm_module) +lib_LTLIBRARIES = $(xv_module) $(syncfb_module) $(xshm_module) $(aa_module) xineplug_vo_out_xv_la_SOURCES = video_out_xv.c xineplug_vo_out_xv_la_LIBADD = $(X_LIBS) @@ -30,6 +34,9 @@ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module +xineplug_vo_out_aa_la_SOURCES = video_out_aa.c +xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module + noinst_HEADERS = yuv2rgb.h video_out_syncfb.h include_HEADERS = video_out_x11.h diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index a832fb0e1..7a787907b 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_internal.h,v 1.20 2001/06/03 18:08:56 guenter Exp $ + * $Id: xine_internal.h,v 1.21 2001/06/10 23:10:52 heikos Exp $ * */ @@ -359,8 +359,9 @@ void load_decoder_plugins (xine_t *this, /* video */ #define VISUAL_TYPE_X11 1 -#define VISUAL_TYPE_FB 2 -#define VISUAL_TYPE_GTK 3 +#define VISUAL_TYPE_AA 2 +#define VISUAL_TYPE_FB 3 +#define VISUAL_TYPE_GTK 4 /* * list_video_output_plugins |