1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Commit Graph

475 Commits

Author SHA1 Message Date
oddsock
b1cd3085f2 cleaned a bit
svn path=/trunk/icecast/; revision=5094
2003-07-07 22:04:29 +00:00
oddsock
8ce77fc778 win32 goodies
svn path=/trunk/icecast/; revision=5093
2003-07-07 22:02:39 +00:00
brendan
729d65ae52 va_copy is undefined on windows
svn path=/trunk/net/; revision=5092
2003-07-07 21:33:58 +00:00
brendan
ff09d9eaa9 The last of the convenience lib cleanups. A little forethought in designing
a keyboard macro made this one a lot easier.

svn path=/trunk/thread/; revision=5090
2003-07-07 20:38:34 +00:00
brendan
a66ba595c9 Irix portability fixes:
1. Don't define _XOPEN_SOURCE, at least with GCC. As ALWAYS, this macro undefines
   a lot of the symbols we need. As of libshout 2.1, this define will be moved
   into the "if not $GCC" category so we don't have to deal with it so often.
2. Irix defines inet_pton but not sockaddr_storage. We could fake it by using
   an in6 structure, but why bother? Just don't check for inet_pton unless
   we have struct sockaddr_storage.

svn path=/trunk/m4/; revision=5087
2003-07-07 03:40:00 +00:00
brendan
5685b9a866 MAX may be defined elsewhere
svn path=/trunk/avl/; revision=5086
2003-07-07 03:37:23 +00:00
brendan
fd289cfe4d httpp goes through the rinse cycle
svn path=/trunk/httpp/; revision=5085
2003-07-07 01:49:27 +00:00
brendan
1af405ee9c I missed a spot. And another one.
svn path=/trunk/avl/; revision=5084
2003-07-07 01:40:08 +00:00
brendan
8278b004fe net gets the namespace deep cleansing treatment.
I suspect all this may be unnecessary, only because I've never heard of this
before. But then, I don't do much library work, and better safe than sorry.

svn path=/trunk/net/; revision=5083
2003-07-07 01:32:42 +00:00
brendan
3833c824ae Namespace cleanup: _mangle exported symbols, declare others static.
This is tedious.

svn path=/trunk/avl/; revision=5082
2003-07-07 01:10:14 +00:00
brendan
cbfb283e6f Move MP3 headers back into format_mp3.c per Mike's desire.
I removed icy- support from the generic send headers function, as it is my
understanding that only MP3 sources use icy headers. PLEASE correct me
if I am wrong.

I also added code in the mp3 function to convert ice-audio-info bitrate to
an icy-br header. ice-audio-info is for YP, icy-br for clients. Perhaps we
should send both to clients though?

svn path=/trunk/icecast/; revision=5079
2003-07-06 15:27:50 +00:00
brendan
004152cf7a Write a newline after the m3u entry (patch by Paul Bryan).
svn path=/trunk/icecast/; revision=5067
2003-07-05 06:36:16 +00:00
giles
a2400995a0 Add a name mangling mechanism so we can safely compile in code we share with applications that might link with use. Currently only hooked up for the timing liblet, but thread is the real target.
Basically we define _mangle() in config.h, and use that in timing.h (if available) to prepend the package name to all the symbols in the header and including C files. It's thus fairly invisible.

Unfortunately the prefix is hardwired, so it's another thing that has to be maintained by hand (not that is changes often, but we can't make it a macro). AH_VERBATIM seems to be the only way to add a macro that takes arguments, and it explicitly doesn't do shell expansion. Further, @PACKAGE@ substitution doesn't happen on config.h.in. Insert standard autotools frustration here.

svn path=/trunk/timing/; revision=5060
2003-07-04 23:18:26 +00:00
brendan
7c40c8ae92 Get everthing in make dist, and remove bitkeeper cruft
svn path=/trunk/avl/; revision=5050
2003-07-03 12:59:06 +00:00
brendan
e21a3fc19e Convert ice headers to icy headers for MP3 streams.
TODO: rewrite ice-audio-info bitrate tag to icy-br.

svn path=/trunk/icecast/; revision=5045
2003-07-03 01:39:59 +00:00
brendan
205d225b73 When relaying MP3 we reported the source metainterval as well as our own,
causing stuttering in some clients. Thank goodness icecast uses an
odd metainterval, or this bug would never have been discoverd :)

svn path=/trunk/icecast/; revision=5044
2003-07-03 01:36:06 +00:00
Karl Heyes
f6efb106de this was never used and it's handled elsewhere anyway
svn path=/trunk/net/; revision=5042
2003-07-02 21:29:08 +00:00
brendan
9a2bd205f5 updates
svn path=/trunk/icecast/; revision=5040
2003-07-02 19:47:44 +00:00
brendan
26e3be189a finish what we started re: resolver
svn path=/trunk/net/; revision=5026
2003-07-01 18:49:07 +00:00
brendan
5dd9110774 Cosmetics (superfluous "checking")
svn path=/trunk/m4/; revision=5025
2003-07-01 18:21:46 +00:00
brendan
37707895da shout.m4 splits SHOUT_CFLAGS into SHOUT_CFLAGS and SHOUT_CPPFLAGS, and
defines SHOUT_THREADED if the library was built threadsafe (from Karl).

svn path=/trunk/m4/; revision=5024
2003-07-01 18:02:19 +00:00
Karl Heyes
7fda8c6afb infinite loop/memory leak fix for private streams when yp is enabled
svn path=/trunk/icecast/; revision=5019
2003-06-29 18:12:09 +00:00
brendan
8d79bc7416 Karl's extension to shout-config, shout.pc
Adds cppflags and cflags-only variables

svn path=/trunk/m4/; revision=5018
2003-06-28 02:16:47 +00:00
brendan
f42b977f10 If you're going to shoot an elephant, you'd better make sure you finish the job.
svn path=/trunk/m4/; revision=5017
2003-06-26 19:38:23 +00:00
brendan
b0e5216528 Seed PKG_CONFIG_PATH with the default libshout shout.pc location
(ported from ices0 version)

svn path=/trunk/m4/; revision=5016
2003-06-26 19:34:00 +00:00
brendan
52dbe24523 Prune shout_prefix from *-config include flags if it would generate a warning.
Make all xiph_compiler macros comply with our coding guidelines
XIPH_GCC_INCLUDE_WARNING renamed XIPH_GCC_WARNING

svn path=/trunk/m4/; revision=5013
2003-06-26 16:03:37 +00:00
oddsock
4b92ae2baa - add_yp_info moved into yp.c
- all yp adds/touches are now done within a single thread.
  This should eliminate any "thread growth" issues and make
  things behave much nicer when yp problems arise.  We should
  eventually change the add/touches to non-blocking sockets,
  which will be needed for large numbers of streams doing adds/touches.

svn path=/trunk/icecast/; revision=5012
2003-06-26 13:33:55 +00:00
oddsock
abb6cddbf0 - added startup of yp add/touch thread
svn path=/trunk/icecast/; revision=5011
2003-06-26 13:33:15 +00:00
oddsock
fb9292658b - fixed small memory leak
svn path=/trunk/icecast/; revision=5010
2003-06-26 13:32:34 +00:00
oddsock
303c11197f - moved add_yp_info into yp.c
- most of the yp processing now moved into the yp add/touch thread
- use ice/icy-public rather than ice/icy-private to coorespond to libshout and general convention
- memory leak fixed with audio-info

svn path=/trunk/icecast/; revision=5009
2003-06-26 13:32:04 +00:00
oddsock
dd6af7e848 - force touches when vorbis metadata changes
svn path=/trunk/icecast/; revision=5008
2003-06-26 13:31:38 +00:00
oddsock
428c1f1f36 - force touches when mp3 metadata is updated via admin interface
svn path=/trunk/icecast/; revision=5007
2003-06-26 13:31:17 +00:00
brendan
1726d0cd89 Don't use PKG_CHECK_MODULES: it aborts configure on systems without pkg-config,
even if action-if-not-found is defined.

Rename have_shout to xt_have_shout, in conformance with macro writing guidelines :)

svn path=/trunk/m4/; revision=5006
2003-06-25 17:03:55 +00:00
brendan
4dacf00422 Lots more autoconf stuff
1. src/net tests abstracted into XIPH_NET macro. We should do the same for
   src/thread, but it's a little more complicated - it will have to
   interact with the caller (eg some apps may want --disable-threads)
2. uintxx_t, socklen_t tests encapsulated, moved to xiph_types.m4
3. solaris fixes for socket func, nanosleep detection
4. added $LIBS to SHOUT_LIBS for *-config scripts. Good or bad idea?

We'll definitely need a libshout beta 2.

svn path=/trunk/m4/; revision=5005
2003-06-24 21:35:44 +00:00
brendan
eac72054f9 oops.
svn path=/trunk/m4/; revision=4998
2003-06-24 05:04:54 +00:00
Karl Heyes
247b9b7620 autoconf seems to be removing trailing spaces, apply a work around for it
svn path=/trunk/m4/; revision=4996
2003-06-24 02:41:19 +00:00
brendan
265f609b4a A load of changes by Karl
svn path=/trunk/m4/; revision=4992
2003-06-24 00:58:10 +00:00
Karl Heyes
f2e1bc2419 handle error returned from listening sockets, can cause busy looping
svn path=/trunk/icecast/; revision=4986
2003-06-20 18:50:24 +00:00
brendan
784fe52e85 Whoops! make install could overwrite an existing icecast.xml.
Install icecast.xml.dist in doc
Install as $(sysconfdir)/icecast.xml only if that file doesn't already
exist.

svn path=/trunk/icecast/; revision=4983
2003-06-20 04:01:31 +00:00
Karl Heyes
ea2dc4a67f ermmm, let's use the right operator.
svn path=/trunk/httpp/; revision=4963
2003-06-18 15:52:25 +00:00
Karl Heyes
032ad5d9ff minor cleanup, removes compiler warning, makes it static, and doesn't
re-evaluate string length each time.

svn path=/trunk/httpp/; revision=4961
2003-06-18 11:13:11 +00:00
Karl Heyes
a4d20515f1 remove file descriptor leak when IPv6 is being used.
svn path=/trunk/net/; revision=4960
2003-06-18 11:05:49 +00:00
brendan
49c6946c07 Karl's simplified and cleaned up ogg/vorbis macros. This will push back
release a bit unfortunately.

svn path=/trunk/m4/; revision=4958
2003-06-18 03:55:41 +00:00
brendan
e19a7af1b1 Fix critical TODO item 1 (make install)
ATTN Mike!

make install now installs the xsl files in pkgdatadir ($prefix/share/icecast) web
and admin directories, and builds icecast.xml accordingly. icecast.xml is now
installed in $sysconfdir/etc, and IMHO icecast should attempt to find a config
file there, and only demand one on the command line if it can't.

svn path=/trunk/icecast/; revision=4956
2003-06-17 21:10:56 +00:00
brendan
816ca31be1 One half of rename to NEWS
svn path=/trunk/icecast/; revision=4955
2003-06-17 21:07:26 +00:00
brendan
693aca88d9 This critical item should be resolved.
svn path=/trunk/icecast/; revision=4954
2003-06-16 22:33:15 +00:00
brendan
4e4a6f9aef Copied back from ices/m4/shout.m4 1.2. There must be a better way of keeping
these m4 macros synchronised.

svn path=/trunk/m4/; revision=4944
2003-06-13 22:20:26 +00:00
brendan
055160b09a Move m4 macros from acinclude into m4 directory
Use new shout.m4 macro

svn path=/trunk/m4/; revision=4943
2003-06-13 19:22:16 +00:00
brendan
d1f807ace8 Make configure --help look pretty
svn path=/trunk/m4/; revision=4941
2003-06-13 19:08:32 +00:00
brendan
346845b22b shout.m4 has been completely rewritten for libshout 2.
It relies on pkg-config or shout-config (in that order) for compiler/linker
flags. --with-shout-prefix is gone. Also gone is --disable-shouttest. I don't
understand the advantages of that home built script over the standard header/
func checks, so I used those. I guess AC_TRY_RUN isn't invoked, but I feel
(mildly) that the business of autoconf is to ensure the program builds
correctly, not runs correctly. Run errors can usually be fixed after the build
(by tweaking LD_LIBRARY_PATH, ld.so.conf, crle etc) without rebuilding.

I've ported ices 0 to this macro in order to test it, but haven't put the various
fallbacks through the ringer yet. I will before release.

TODO: I don't think this file is being included with make dist. Should it be?
Probably. Should it be installed? Probably, but less so.

svn path=/trunk/m4/; revision=4939
2003-06-13 04:26:23 +00:00