From: Andre Noll Date: Thu, 5 May 2011 13:50:49 +0000 (+0200) Subject: Merge branch 't/libao' X-Git-Tag: v0.4.7~11 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a24d175e6d093d6d9f6e583c3026e45924bad621;hp=-c;ds=sidebyside Merge branch 't/libao' --- a24d175e6d093d6d9f6e583c3026e45924bad621 diff --combined Makefile.in index 8ecc1b8f,a440e4f6..24b06fb9 --- a/Makefile.in +++ b/Makefile.in @@@ -56,6 -56,7 +56,6 @@@ CPPFLAGS += -Wunused-macro CPPFLAGS += -Wbad-function-cast CPPFLAGS += -fno-strict-aliasing CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F) -CPPFLAGS += @SSL_CPPFLAGS@ CPPFLAGS += @arch_cppflags@ CPPFLAGS += -I/usr/local/include CPPFLAGS += -I$(cmdline_dir) @@@ -149,9 -150,6 +149,9 @@@ $(object_dir) $(man_dir): mkdir -p $@ +$(object_dir)/crypt.o: crypt.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @openssl_cppflags@ $< $(object_dir)/spx_common.o: spx_common.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ogg_cppflags@ $< @@@ -195,6 -193,9 +195,9 @@@ $(object_dir)/aac_afh.o: aac_afh.c | $( $(object_dir)/gui%.o: gui%.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $< + $(object_dir)/ao_write.o: ao_write.c | $(object_dir) + @[ -z "$(Q)" ] || echo 'CC $<' + $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ao_cppflags@ $< $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' diff --combined NEWS index 32957386,3443ebb3..4430343e --- a/NEWS +++ b/NEWS @@@ -2,11 -2,8 +2,13 @@@ 0.4.7 (to be announced) "infinite rollback" ------------------------------------------- ++ - Support for ESD, Pulseaudio, AIX, Solaris, IRIX and other ++ platforms through the libao audio library. - configure: improved options for ogg/vorbis/speex. - The git version reported by --version always matches HEAD. + - The autogen script detects the number of processors and + runs a parallel make if possible. + - Major cleanup of the crypto API. ------------------------------------------ 0.4.6 (2011-03-31) "deterministic entropy" diff --combined configure.ac index 32381c6b,ac840618..89042812 --- a/configure.ac +++ b/configure.ac @@@ -87,7 -87,7 +87,7 @@@ AC_DEFUN([add_cmdline],[$(for i in $@; all_errlist_objs="server mp3_afh afh_common vss command net string signal time daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer -playlist sha1 sched audiod grab_client filter_common wav_filter compress_filter +playlist sched audiod grab_client filter_common wav_filter compress_filter http_recv dccp_recv recv_common write_common file_write audiod_command client_common recv stdout filter stdin audioc write client exec send_common ggo udp_recv udp_send color fec fecdec_filter prebuffer_filter mm @@@ -118,7 -118,7 +118,7 @@@ audiod_cmdline_objs="add_cmdline(audio audiod_errlist_objs="audiod signal string daemon stat net time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv recv_common fd sched write_common file_write audiod_command crypt fecdec_filter - client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list + client_common ggo udp_recv color fec prebuffer_filter audiod_command_list bitstream imdct wma_common wmadec_filter buffer_tree" audiod_ldflags="-lm" audiod_audio_formats="wma" @@@ -131,7 -131,7 +131,7 @@@ server_cmdline_objs="add_cmdline(server server_errlist_objs="server afh_common mp3_afh vss command net string signal time daemon crypt http_send close_on_fork mm ipc dccp_send fd user_list chunk_queue afs aft mood score attribute - blob playlist sha1 sched acl send_common udp_send color fec + blob playlist sched acl send_common udp_send color fec server_command_list afs_command_list wma_afh wma_common" server_ldflags="" server_audio_formats="mp3 wma" @@@ -145,7 -145,7 +145,7 @@@ default_writer="FILE_WRITE client_cmdline_objs="add_cmdline(client)" client_errlist_objs="client net string crypt fd sched stdin stdout time - client_common sha1 buffer_tree" + client_common buffer_tree" client_ldflags="" gui_cmdline_objs="add_cmdline(gui)" @@@ -273,52 -273,46 +273,52 @@@ f CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" -########################################################################### ssl -dnl @synopsis CHECK_SSL -dnl -dnl based on the follwing macro from the autoconf archive -dnl -dnl @category InstalledPackages -dnl @author Mark Ethan Trostler -dnl @version 2003-01-28 -dnl @license AllPermissive - -AC_DEFUN([CHECK_SSL], -[ - for ssldir in $1 /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do - AC_MSG_CHECKING(for openssl in $ssldir) - if test -f "$ssldir/include/openssl/ssl.h"; then - found_ssl="yes" - AC_MSG_RESULT(yes) - SSL_CFLAGS="-I$ssldir/include" - SSL_CPPFLAGS="-I$ssldir/include" - break - fi - AC_MSG_RESULT(no) - done - if test x_$found_ssl != x_yes; then - AC_MSG_ERROR(Cannot find ssl libraries) - else - SSL_LIBS="-lssl -lcrypto"; - SSL_LDFLAGS="-L$ssldir/lib"; +###################################################################### openssl +OLD_CPPFLAGS="$CPPFLAGS" +OLD_LD_FLAGS="$LDFLAGS" +OLD_LIBS="$LIBS" +have_openssl="yes" +AC_ARG_WITH(openssl_headers, [AC_HELP_STRING(--with-openssl-headers=dir, + [look for openssl headers also in dir])]) +if test -n "$with_openssl_headers"; then + openssl_cppflags="-I$with_openssl_headers" + CPPFLAGS="$CPPFLAGS $openssl_cppflags" +fi +AC_ARG_WITH(openssl_libs, [AC_HELP_STRING(--with-openssl-libs=dir, + [look for openssl libraries also in dir])]) +if test -n "$with_openssl_libs"; then + openssl_libs="-L$with_openssl_libs" + LDFLAGS="$LDFLAGS $openssl_libs" +fi +AC_CHECK_HEADER(openssl/ssl.h, [], [have_openssl="no"]) +AC_CHECK_LIB([crypto], [RAND_bytes], [], [have_openssl="no"]) +if test "$have_openssl" = "no" -a -z "$with_openssl_headers$with_openssl_libs"; then + # try harder: openssl is sometimes installed in /usr/local/ssl + openssl_cppflags="-I/usr/local/ssl/include" + CPPFLAGS="$CPPFLAGS $openssl_cppflags" + openssl_libs="-L/usr/local/ssl/lib" + LDFLAGS="$LDFLAGS $openssl_libs" + # clear cache + unset ac_cv_header_openssl_ssl_h 2> /dev/null + unset ac_cv_lib_crypto_RAND_bytes 2> /dev/null + AC_CHECK_HEADER(openssl/ssl.h, [have_openssl="yes"], []) + if test "$have_openssl" = "yes"; then + AC_CHECK_LIB([crypto], [RAND_bytes], [], [have_openssl="no"]) fi - AC_SUBST(SSL_CPPFLAGS) -])dnl - -AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path, - [Search for openssl also in path.])]) -if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi -CHECK_SSL($enable_ssldir) -server_ldflags="$server_ldflags $SSL_LDFLAGS $SSL_LIBS" -client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS" -audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS" - +fi +if test "$have_openssl" = "yes"; then + AC_DEFINE(HAVE_OPENSSL, 1, [define to 1 to turn on openssl support]) + AC_SUBST(openssl_cppflags) + openssl_libs="$openssl_libs -lssl -lcrypto" + server_ldflags="$server_ldflags $openssl_libs" + client_ldflags="$client_ldflags $openssl_libs" + audiod_ldflags="$audiod_ldflags $openssl_libs" +else + AC_MSG_ERROR([openssl libraries not found]) +fi +CPPFLAGS="$OLD_CPPFLAGS" +LDFLAGS="$OLD_LDFLAGS" +LIBS="$OLD_LIBS" ########################################################################### libsocket AC_CHECK_LIB([c], [socket], [socket_lib=], @@@ -727,6 -721,67 +727,67 @@@ f CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" + ########################################################################### libao + OLD_CPPFLAGS="$CPPFLAGS" + OLD_LD_FLAGS="$LDFLAGS" + OLD_LIBS="$LIBS" + + have_ao="yes" + AC_ARG_WITH(ao_headers, [AC_HELP_STRING(--with-ao-headers=dir, + [look for ao/ao.h also in dir])]) + if test -n "$with_ao_headers"; then + ao_cppflags="-I$with_ao_headers" + CPPFLAGS="$CPPFLAGS $ao_cppflags" + fi + AC_ARG_WITH(ao_libs, [AC_HELP_STRING(--with-ao-libs=dir, + [look for libao also in dir])]) + if test -n "$with_ao_libs"; then + ao_libs="-L$with_ao_libs" + LDFLAGS="$LDFLAGS $ao_libs" + fi + msg="no libao support for para_audiod/para_write" + AC_CHECK_HEADERS([ao/ao.h], [ + ], [ + have_ao="no" + AC_MSG_WARN([ao.h not found, $msg]) + ]) + if test "$have_ao" = "yes"; then + AC_CHECK_LIB([ao], [ao_initialize], [], [ + have_ao="no" + AC_MSG_WARN([ao lib not found or not working, $msg]) + ]) + fi + if test "$have_ao" = "yes"; then + AC_CHECK_HEADERS([pthread.h], [ + ], [ + have_ao="no" + AC_MSG_WARN([pthread.h not found, $msg]) + ]) + fi + if test "$have_ao" = "yes"; then + AC_CHECK_LIB([pthread], [pthread_create], [], [ + have_ao="no" + AC_MSG_WARN([pthread lib not found or not working, $msg]) + ]) + fi + if test "$have_ao" = "yes"; then + all_errlist_objs="$all_errlist_objs ao_write" + audiod_errlist_objs="$audiod_errlist_objs ao_write" + audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(ao_write)" + audiod_ldflags="$audiod_ldflags -lao -lpthread" + + write_errlist_objs="$write_errlist_objs ao_write" + write_cmdline_objs="$write_cmdline_objs add_cmdline(ao_write)" + write_ldflags="$write_ldflags $ao_libs -lao -lpthread" + writers="$writers ao" + AC_SUBST(ao_cppflags) + fi + + CPPFLAGS="$OLD_CPPFLAGS" + LDFLAGS="$OLD_LDFLAGS" + LIBS="$OLD_LIBS" + + AC_SUBST(install_sh, [$INSTALL]) AC_CONFIG_FILES([Makefile]) diff --combined error.h index 2e32c240,b8b0074c..a24af894 --- a/error.h +++ b/error.h @@@ -19,6 -19,7 +19,6 @@@ DEFINE_ERRLIST_OBJECT_ENUM #define GUI_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS -#define SHA1_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS @@@ -104,6 -105,18 +104,18 @@@ extern const char **para_errlist[] PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \ + #define AO_WRITE_ERRORS \ + PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \ + PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \ + PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \ + PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \ + PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \ + PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \ + PARA_ERROR(AO_PLAY, "ao_play() failed"), \ + PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \ + PARA_ERROR(AO_PTHREAD, "pthread error"), \ + + #define COMPRESS_FILTER_ERRORS \ PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \ PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \ diff --combined web/manual.m4 index 5be89378,03726956..ea5ebeb7 --- a/web/manual.m4 +++ b/web/manual.m4 @@@ -251,6 -251,10 +251,10 @@@ Optional Linux, you'll need to have ALSA's development package libasound2-dev installed. + - XREFERENCE(http://downloads.xiph.org/releases/ao/, + libao). Needed to build the ao writer (ESD, PulseAudio,...). + Debian package: libao-dev. + Installation ~~~~~~~~~~~~ @@@ -1533,7 -1537,7 +1537,7 @@@ From these observations it is clear tha FEC parameters: The slice size, the number of data slices k, and the total number of slices n. It is crucial to choose the slice size such that no fragmentation of network packets takes place because -FEC only guards against losses and reodering but fails if slices are +FEC only guards against losses and reordering but fails if slices are received partially. FEC decoding in paralash is performed through the fecdec filter which @@@ -1678,6 -1682,11 +1682,11 @@@ write the PCM data to a file on the fil it through a sound device. It is supported on all platforms and is always compiled in. + *AO*. _Libao_ is a cross-platform audio library which supports a wide + variety of platforms including PulseAudio (gnome), ESD (Enlightened + Sound Daemon), AIX, Solaris and IRIX. The ao writer plays audio + through an output plugin of libao. + Examples ~~~~~~~~ @@@ -2032,7 -2041,7 +2041,7 @@@ detection of duplicate or reordered pac protocol, only minimal internal state about the connection is maintained, which means that there is no protection against packet loss or network congestion. Error checking and correction (if at all) -are performed in the application.' +are performed in the application. *DCCP*. The _Datagram Congestion Control Protocol_ combines the connection-oriented state maintenance known from TCP with the