Mercurial > audlegacy
changeset 7:fd430c8bc3a2 trunk
[svn] More progress :)
| author | nenolod |
|---|---|
| date | Mon, 24 Oct 2005 11:12:12 -0700 |
| parents | 31a41ed0ff71 |
| children | 0032d244ba5f |
| files | Input/aac/libmp4v2/mpeg4ip.h Input/aac/src/Makefile.am Input/aac/src/libmp4.c |
| diffstat | 3 files changed, 5 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/Input/aac/libmp4v2/mpeg4ip.h Mon Oct 24 11:07:02 2005 -0700 +++ b/Input/aac/libmp4v2/mpeg4ip.h Mon Oct 24 11:12:12 2005 -0700 @@ -233,34 +233,6 @@ #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} -#ifndef HAVE_GTK -typedef char gchar; -typedef unsigned char guchar; - -typedef int gint; -typedef unsigned int guint; - -typedef long glong; -typedef unsigned long gulong; - -typedef double gdouble; - -typedef int gboolean; - -typedef int16_t gint16; -typedef uint16_t guint16; - -typedef int32_t gint32; -typedef uint32_t guint32; - -typedef int64_t gint64; -typedef uint64_t guint64; - -typedef uint8_t guint8; -typedef int8_t gint8; - -#endif - #ifndef FALSE #define FALSE 0 #endif
--- a/Input/aac/src/Makefile.am Mon Oct 24 11:07:02 2005 -0700 +++ b/Input/aac/src/Makefile.am Mon Oct 24 11:12:12 2005 -0700 @@ -6,4 +6,4 @@ libaac_la_SOURCES = aac_utils.c libmp4.c mp4_utils.c -INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../libmp4v2 -I../libfaad +INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../include -I../libmp4v2 -I../libfaad
--- a/Input/aac/src/libmp4.c Mon Oct 24 11:07:02 2005 -0700 +++ b/Input/aac/src/libmp4.c Mon Oct 24 11:12:12 2005 -0700 @@ -16,10 +16,10 @@ #include "faad.h" #include "mp4.h" -#include <xmms/plugin.h> -#include <xmms/util.h> -#include <xmms/configfile.h> -#include <xmms/titlestring.h> +#include <audacious/plugin.h> +#include <audacious/util.h> +#include <audacious/configfile.h> +#include <audacious/titlestring.h> #define MP4_DESCRIPTION "MP4 & MPEG2/4-AAC audio player - 1.2.x" #define MP4_VERSION "ver. 0.4 - 24 November 2003"