some sidplay fixoring

Original commit message from CVS:
some sidplay fixoring
This commit is contained in:
Christian Schaller 2005-05-06 19:11:14 +00:00
parent a191c39fb4
commit d1b7493b39
5 changed files with 25 additions and 18 deletions

View file

@ -1,3 +1,10 @@
2005-05-06 Christian Schaller <uraeus@gnome.org>
* configure.ac: add sidplay
* ext/Makefile.am: add sidplay
* ext/sidplay/Makefile.am: add GST_PLUGINS_CFLAGS
* ext/sidplay/gstsiddec.cc: remove bytestream.h
2005-05-06 Christian Schaller <uraeus@gnome.org>
* configure.ac: add gst-plugins-libs

View file

@ -242,6 +242,7 @@ if test "x$HAVE_GST_BASE" = "xno"; then
fi
AC_SUBST(GST_BASE_LIBS)
AC_SUBST(GST_BASE_CFLAGS)
dnl check for gstreamer-interfaces; uinstalled is selected preferentially
PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-interfaces-$GST_MAJORMINOR >= $GST_REQ,
@ -252,6 +253,7 @@ if test "x$HAVE_GST_INTERFACES" = "xno"; then
fi
AC_SUBST(GST_INTERFACES_LIBS)
AC_SUBST(GST_INTERFACES_CFLAGS)
dnl check for gstreamer-interfaces; uinstalled is selected preferentially
PKG_CHECK_MODULES(GST_PLUGINS_LIBS, gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
@ -262,7 +264,7 @@ if test "x$HAVE_GST_PLUGINS" = "xno"; then
fi
AC_SUBST(GST_PLUGINS_LIBS)
AC_SUBST(GST_PLUGINS_CFLAGS)
dnl Determine endianness
AC_C_BIGENDIAN
@ -305,8 +307,7 @@ dnl these are all the gst plug-ins, compilable without additional libs
GST_PLUGINS_ALL="\
videofilter \
effectv \
law \
sidplay"
law"
dnl see if we can build C++ plug-ins
if test "x$HAVE_CXX" = "xyes"; then
@ -359,6 +360,11 @@ dnl ])
dnl ])
dnl ])
dnl ###########################
dnl # Configure external libs #
dnl ###########################
dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
@ -389,10 +395,6 @@ AC_SUBST(MAD_LIBS)
AC_SUBST(GST_LIBS)
AC_SUBST(GST_CFLAGS)
dnl ###########################
dnl # Configure external libs #
dnl ###########################
dnl ############################
dnl # Set up some more defines #
dnl ############################

View file

@ -316,11 +316,11 @@ endif
# SHOUT2_DIR=
# endif
# if USE_SIDPLAY
# SIDPLAY_DIR=sidplay
# else
# SIDDPLAY_DIR=
# endif
if USE_SIDPLAY
SIDPLAY_DIR=sidplay
else
SIDDPLAY_DIR=
endif
# if USE_SMOOTHWAVE
# SMOOTHWAVE_DIR=smoothwave
@ -443,4 +443,5 @@ SUBDIRS=\
$(XVID_DIR)
DIST_SUBDIRS=\
mad
mad \
sidplay

View file

@ -2,8 +2,8 @@
plugin_LTLIBRARIES = libgstsid.la
libgstsid_la_SOURCES = gstsiddec.cc
libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS)
libgstsid_la_LIBADD = $(SIDPLAY_LIBS)
libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS) $(GST_PLUGINS_CFLAGS)
libgstsid_la_LIBADD = $(SIDPLAY_LIBS) $(GST_PLUGINS_LIBS)
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstsiddec.h

View file

@ -22,9 +22,6 @@
#endif
#include <string.h>
#include <gst/bytestream/bytestream.h>
#include "gstsiddec.h"
/* Sidec signals and args */