# HG changeset patch
# User Paula Stanciu <paula.stanciu@gmail.com>
# Date 1218100634 -10800
# Node ID f084f639e9626de9579999714c2b301372d8d9a7
# Parent  b136f202ebfa3d2242b338bb37f624caf87a6968# Parent  c6f352d25d273c59de19d406a5cf181ce219f2b6
Automated merge with ssh://paula@hg.atheme.org//hg/audacious

diff -r c6f352d25d27 -r f084f639e962 src/audacious/Makefile
--- a/src/audacious/Makefile	Thu Aug 07 12:16:46 2008 +0300
+++ b/src/audacious/Makefile	Thu Aug 07 12:17:14 2008 +0300
@@ -150,8 +150,7 @@
        ui/carbon-menubar.ui
 
 CLEAN = build_stamp.c libaudacious.exe.a
-EXT_DEPS = ../libguess/libguess.a \
-           ../libSAD/libSAD.a
+EXT_DEPS = ../libguess/libguess.a ../libSAD/libSAD.so
 
 ifeq ($(USE_EGGSM),yes)
 EXT_DEPS += ../libeggsmclient/libeggsmclient.a
@@ -192,7 +191,7 @@
 		${LIBINTL}						\
 		${SAMPLERATE_LIBS}				\
 		../libguess/libguess.a			\
-		../libSAD/libSAD.a				\
+		-L../libSAD -lSAD			\
 		${EGGSM_LIBS}					\
 		${GLIB_LIBS}					\
 		${GTHREAD_LIBS}					\
diff -r c6f352d25d27 -r f084f639e962 src/audacious/output.c
--- a/src/audacious/output.c	Thu Aug 07 12:16:46 2008 +0300
+++ b/src/audacious/output.c	Thu Aug 07 12:17:14 2008 +0300
@@ -55,8 +55,6 @@
 # include "src_flow.h"
 #endif
 
-#define FMT_FRACBITS(a) ( (a) == FMT_FIXED32 ? __AUDACIOUS_ASSUMED_MAD_F_FRACBITS__ : 0 )
-
 OutputPluginData op_data = {
     NULL,
     NULL
diff -r c6f352d25d27 -r f084f639e962 src/audacious/plugin.h
--- a/src/audacious/plugin.h	Thu Aug 07 12:16:46 2008 +0300
+++ b/src/audacious/plugin.h	Thu Aug 07 12:17:14 2008 +0300
@@ -47,6 +47,7 @@
 #include "audacious/preferences.h"
 #include "audacious/interface.h"
 #include "audacious/equalizer_preset.h"
+#include "libSAD/libSAD.h"
 
 #define PLUGIN(x)         ((Plugin *)(x))
 #define INPUT_PLUGIN(x)   ((InputPlugin *)(x))
@@ -122,6 +123,8 @@
      a == FMT_S32_NE || a == FMT_S32_LE || a == FMT_S32_BE || a == FMT_U32_NE || a == FMT_U32_LE || a == FMT_U32_BE || \
      a == FMT_FIXED32) ? sizeof(gint32) : sizeof(float))))
 
+#define FMT_FRACBITS(a) ( (a) == FMT_FIXED32 ? __AUDACIOUS_ASSUMED_MAD_F_FRACBITS__ : 0 )
+
 typedef enum {
     INPUT_VIS_ANALYZER,
     INPUT_VIS_SCOPE,
@@ -361,6 +364,9 @@
     gchar *(*util_get_localdir)(void);
     void (*util_menu_main_show)(gint x, gint y, guint button, guint time);
 
+    gpointer (*smart_realloc)(gpointer ptr, gsize *size);
+    SAD_sample_format (*sadfmt_from_afmt)(AFormat fmt);
+
     /* INI funcs */
     INIFile *(*open_ini_file)(const gchar *filename);
     void (*close_ini_file)(INIFile *key_file);
@@ -750,6 +756,8 @@
 #define aud_info_dialog			_audvt->util_info_dialog
 #define audacious_info_dialog		_audvt->util_info_dialog
 #define aud_get_gentitle_format		_audvt->get_gentitle_format
+#define aud_smart_realloc               _audvt->smart_realloc
+#define aud_sadfmt_from_afmt            _audvt->sadfmt_from_afmt
 
 #define aud_escape_shell_chars		_audvt->escape_shell_chars
 #define aud_str_append			_audvt->str_append
diff -r c6f352d25d27 -r f084f639e962 src/audacious/pluginenum.c
--- a/src/audacious/pluginenum.c	Thu Aug 07 12:16:46 2008 +0300
+++ b/src/audacious/pluginenum.c	Thu Aug 07 12:17:14 2008 +0300
@@ -154,6 +154,9 @@
     .util_info_dialog = util_info_dialog,
     .get_gentitle_format = get_gentitle_format,
 
+    .smart_realloc = smart_realloc,
+    .sadfmt_from_afmt = sadfmt_from_afmt,
+
     .escape_shell_chars = escape_shell_chars,
     .str_append = str_append,
     .str_replace = str_replace,
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_about.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_albumart.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_credits.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_credits.h
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_fileinfo.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_fileinfo.h
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_jumptotrack.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_jumptotrack.h
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_jumptotrack_cache.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_jumptotrack_cache.h
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_urlopener.c
diff -r c6f352d25d27 -r f084f639e962 src/audacious/ui_urlopener.h
diff -r c6f352d25d27 -r f084f639e962 src/libSAD/Makefile
--- a/src/libSAD/Makefile	Thu Aug 07 12:16:46 2008 +0300
+++ b/src/libSAD/Makefile	Thu Aug 07 12:17:14 2008 +0300
@@ -1,4 +1,7 @@
-STATIC_LIB_NOINST = libSAD.a
+LIB = ${LIB_PREFIX}SAD${LIB_SUFFIX}
+LIB_MAJOR = 1
+LIB_MINOR = 0
+
 SRCS = dither.c \
        dither_ops.c \
        noicegen.c
@@ -12,3 +15,4 @@
 
 PACKAGE = libSAD
 CPPFLAGS += ${SIMD_CFLAGS} -I../..
+CFLAGS += ${LIB_CFLAGS}
\ No newline at end of file