# HG changeset patch
# User nenolod
# Date 1130198240 25200
# Node ID a3913b2d0acdf4a1557eed327a01f449f6df1266
# Parent  b7dc79a2ae147fe9b3c9c16e935ad4c81f8bde07
[svn] Regenerate Makefiles, AAC fixes.

diff -r b7dc79a2ae14 -r a3913b2d0acd Input/aac/include/systems.h
--- a/Input/aac/include/systems.h	Mon Oct 24 16:54:59 2005 -0700
+++ b/Input/aac/include/systems.h	Mon Oct 24 16:57:20 2005 -0700
@@ -228,33 +228,6 @@
 #define MALLOC_STRUCTURE(a) ((a *)malloc(sizeof(a)))
 
 #define CHECK_AND_FREE(a) if ((a) != NULL) { free((a)); (a) = NULL;}
-#ifndef HAVE_GLIB_H
-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 TRUE
 #define TRUE 1
diff -r b7dc79a2ae14 -r a3913b2d0acd Input/aac/src/Makefile.am
--- a/Input/aac/src/Makefile.am	Mon Oct 24 16:54:59 2005 -0700
+++ b/Input/aac/src/Makefile.am	Mon Oct 24 16:57:20 2005 -0700
@@ -2,7 +2,7 @@
 
 libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-libaac_la_LDFLAGS = $(PLUGIN_LDFLAGS) ../libmp4v2/libmp4v2.la ../libfaad2/libfaad2.la
+libaac_la_LDFLAGS = $(PLUGIN_LDFLAGS) ../libmp4v2/libmp4v2.la ../libfaad2/libfaad.la
 
 libaac_la_SOURCES = aac_utils.c libmp4.c mp4_utils.c
 
diff -r b7dc79a2ae14 -r a3913b2d0acd Input/aac/src/Makefile.in
--- a/Input/aac/src/Makefile.in	Mon Oct 24 16:54:59 2005 -0700
+++ b/Input/aac/src/Makefile.in	Mon Oct 24 16:57:20 2005 -0700
@@ -280,7 +280,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 lib_LTLIBRARIES = libaac.la
-libaac_la_LDFLAGS = $(PLUGIN_LDFLAGS) ../libmp4v2/libmp4v2.la ../libfaad2/libfaad2.la
+libaac_la_LDFLAGS = $(PLUGIN_LDFLAGS) ../libmp4v2/libmp4v2.la ../libfaad2/libfaad.la
 libaac_la_SOURCES = aac_utils.c libmp4.c mp4_utils.c
 INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../include -I../libmp4v2 -I../libfaad
 all: all-am
diff -r b7dc79a2ae14 -r a3913b2d0acd Input/aac/src/mp4_utils.c
--- a/Input/aac/src/mp4_utils.c	Mon Oct 24 16:54:59 2005 -0700
+++ b/Input/aac/src/mp4_utils.c	Mon Oct 24 16:57:20 2005 -0700
@@ -54,7 +54,7 @@
     const char *trackType = MP4GetTrackType(file, trackID);
     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
       int j=0;
-      u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
+      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
       while(mp4AudioTypes[j]){ // what kind of audio is ?
 	if(mp4AudioTypes[j] == audiotype){
 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
@@ -126,7 +126,7 @@
     printf("Track %d, %s", trackID, trackType);
     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
       int j=0;
-      u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
+      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
       while(mp4AudioTypes[j]){ // what kind of audio is ?
 	if(mp4AudioTypes[j] == audiotype){
 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){
diff -r b7dc79a2ae14 -r a3913b2d0acd skin/Makefile.in
--- a/skin/Makefile.in	Mon Oct 24 16:54:59 2005 -0700
+++ b/skin/Makefile.in	Mon Oct 24 16:57:20 2005 -0700
@@ -265,26 +265,59 @@
 target_vendor = @target_vendor@
 skindir = $(pkgdatadir)/Skins/Default
 skin_DATA = \
-Avs.bmp \
-Balance.bmp \
-Eq_ex.bmp \
-Eqmain.bmp \
-Main.bmp \
-Mb.bmp \
-Monoster.bmp \
-Nums_ex.bmp \
-Pledit.bmp \
-Posbar.bmp \
-Shufrep.bmp \
-Text.bmp \
-Titlebar.bmp \
-Volume.bmp \
-cButtons.bmp \
-pLaypaus.bmp \
-pLedit.txt \
-readme.txt \
-screenshot.bmp \
-vIscolor.txt
+PLEDIT.txt \
+README.txt \
+VISCOLOR.txt \
+WINAMPMB.txt \
+Eqclose.cur \
+Eqslid.cur \
+Mainmenu.cur \
+Mmenu.cur \
+Pclose.cur \
+Posbar.cur \
+Ptbar.cur \
+Pwinbut.cur \
+Pwssize.cur \
+Titlebar.cur \
+Winbut.cur \
+Wsposbar.cur \
+Eqnormal.cur \
+Eqtitle.cur \
+Min.cur \
+Normal.cur \
+Pnormal.cur \
+Psize.cur \
+Pvscroll.cur \
+Pwsnorm.cur \
+Songname.cur \
+Volbal.cur \
+Wsnormal.cur \
+Close.ani \
+Min.ani \
+AMAROK.bmp \
+BALANCE.bmp \
+EQMAIN.bmp \
+GEN.bmp \
+MAIN.bmp \
+MBINNER.bmp \
+MONOSTER.bmp \
+NUMS_EX.bmp \
+PLEDIT.bmp \
+SHUFREP.bmp \
+TITLEBAR.bmp \
+VIDEO.bmp \
+AVS.bmp \
+CBUTTONS.bmp \
+EQ_EX.bmp \
+GENEX.bmp \
+MB.bmp \
+MIKRO.bmp \
+NUMBERS.bmp \
+PLAYPAUS.bmp \
+POSBAR.bmp \
+TEXT.bmp \
+VIDAMP.bmp \
+VOLUME.bmp
 
 EXTRA_DIST = $(skin_DATA)
 all: all-am