aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2025-02-02 15:07:45 -05:00
Code
280 Commits 5 Branches 6 Tags
Commit Graph

129 Commits

Author SHA1 Message Date
moritz
9dbe97bf47 Merge. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13441 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-04 17:10:37 +00:00
moritz
c8a98a5b72 Sprinkle in some consistency ... 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13440 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-04 17:10:29 +00:00
moritz
3dd13ec7aa Do a clean shutdown on SIGINT and SIGTERM. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13438 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-04 17:04:50 +00:00
moritz
c444af6814 Merge xalloc changes. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13437 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-04 16:46:17 +00:00
moritz
53fa75fdba Now that xalloc is pretty much an external entity, explicitly set freed 
pointers to NULL if we lateron expect them to be NULL (no longer rely on
xalloc to do this for us.)


git-svn-id: https://svn.xiph.org/trunk/ezstream@13436 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-04 16:39:09 +00:00
moritz
f282e3d474 Do not xfree() something that wasn't x*alloc()'ed. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13433 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-04 16:09:50 +00:00
moritz
62661080dc Switch to using the (integrated) libxalloc. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13431 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-08-02 18:48:26 +00:00
moritz
c1ca736734 Cosmetic changes; no functional change. Use the calloc()-style API correctly. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13304 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-07-24 15:29:16 +00:00
moritz
452a8e83cb Cosmetic changes. No functional change. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13303 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-07-24 15:13:45 +00:00
moritz
ef221fcc38 Fix the dang file descriptor leak of < 0.4.1 for good; the old fix only 
took care of it partially. Diagnosed with the help from someone, who wishes
to stay anonymous. Thanks!


git-svn-id: https://svn.xiph.org/trunk/ezstream@13296 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-07-24 13:04:01 +00:00
moritz
af6479c0d9 D'oh! Make <stream_once/> work with playlists as well. Problem description 
found in the Icecast mailing list archive, in a mail by Geoff Shang, via
Google. Let's hope that the bug tracker prevents this kind of bug hunting
in the future ...


git-svn-id: https://svn.xiph.org/trunk/ezstream@13272 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-07-16 00:32:17 +00:00
moritz
24568a7ec8 Change my email address to the new one. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13259 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-07-14 01:32:28 +00:00
moritz
ec14d3b017 Plug an fd leak, triggered by using -q. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@13257 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-07-14 01:20:45 +00:00
moritz
cd37dd2e26 Make this build on Windows and not segfault the MIPSpro C compiler version <7.2. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12717 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-11 00:28:33 +00:00
moritz
6a40d2f7a5 taglib_file_audioproperties returns const 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12714 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-10 23:28:13 +00:00
moritz
a25656392e Remove unreachable statement. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12713 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-10 22:44:02 +00:00
moritz
1d4426e834 Do not execute group-/world-writeable playlist and metadata scripts. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12712 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-10 21:23:15 +00:00
moritz
6eb5d8f557 Include the total playing time of a song in the "real-time" output, if TagLib 
supplies it.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12711 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-10 21:18:21 +00:00
moritz
c5aaa28594 More metadata featuritis, add <metadata_format/> and implement support for 
'@a@', '@t@' and '@s@'.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12707 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-10 19:03:07 +00:00
moritz
6f779c21f3 Commit work-in-progress towards more fine-grained control over metadata. This 
has not been checked for changes to previous behavior and isn't complete, yet.
More to come.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12701 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-10 02:27:48 +00:00
moritz
bc6ae77abd Various tweakings, and sync Win32 README with new reality. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12698 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-09 13:43:26 +00:00
moritz
304908bff4 Add new <metadata_progname> configuration option, which specifies an external 
program/script to get metadata from. Also include SIGUSR2 handling that triggers
metadata updates from the external program mid-stream.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12693 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-09 02:30:29 +00:00
moritz
163b7ca187 Squash a bug that I introduced a few hours ago ... 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12692 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-09 02:24:04 +00:00
moritz
40566705ae Shrink buffers to PATH_MAX. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12686 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 21:38:12 +00:00
moritz
84bf642a1e Fix playlist_free() as well ... 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12685 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 20:59:29 +00:00
moritz
3cd7528b07 Working TagLib support (optional.) 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12684 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 20:24:09 +00:00
moritz
46cdb29f16 Define SIZE_T_MAX to the real maximum of size_t. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12683 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 19:46:23 +00:00
moritz
832c21def2 Hmph. I've been stepping into the copy-of-pointer trap twice now. Fix it again. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12681 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 15:25:33 +00:00
moritz
900886ab3f Iterate towards optional TagLib support, as well as scripted metadata support. 
This is just the first step and equivalent to current functionality.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12680 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 14:39:00 +00:00
moritz
a26710f497 Replace the very broken xfree() function with an xfree() macro - the main point 
was to set ptr to NULL, but the function only set the copy of ptr to NULL.
Spotted by Karl Heyes, thanks a lot!


git-svn-id: https://svn.xiph.org/trunk/ezstream@12677 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-08 01:12:13 +00:00
moritz
e656688fbe Remove redundant code since the switch to xfree(). 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12676 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-07 23:39:53 +00:00
moritz
ca41d8cac8 More code reorganization, move compatibility and utility functions out of 
ezstream.c. Use a basename() function for Windows that behaves identical to
a modern Unix' basename().


git-svn-id: https://svn.xiph.org/trunk/ezstream@12673 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-07 21:01:16 +00:00
moritz
928719013e cosmetics 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12672 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-07 12:53:47 +00:00
moritz
697e4bc3c7 Fix logic error and prevent an endless loop on error(s) in the config file. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12630 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-04 15:59:06 +00:00
moritz
78c5cc3115 While rand() being crappy is true for most/all *nix systems, on Windows, this 
is different. The shifting severely screwed up its randomness. Just leave it
away and systems that only have a bad version of rand() will have to just deal
with it.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12629 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-04 15:50:40 +00:00
moritz
79f9d809d5 More pre-release maintenance. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12628 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-04 15:16:36 +00:00
moritz
e025a58235 Add -V command line parameter to print the version number and exit. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12626 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-04 14:27:37 +00:00
moritz
2c8e1beef3 Some more cosmetic tweaks. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12620 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-03 20:17:33 +00:00
moritz
9a5b5ed973 Forgot one PATH_SEPARATOR instance ... 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12617 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-03 17:50:02 +00:00
moritz
6187391e2c Use size_t in strrcmp(). 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12616 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-03 17:48:11 +00:00
moritz
c205414d70 Iterate back towards working Windows support. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12615 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-03 16:13:08 +00:00
moritz
1be748b206 STDERR_FILENO -> fileno(stderr), and fix a brain'o: Systems with limited or 
no signals support obviously don't have SIG_HUP/SIG_USR1 defined.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12614 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-03 12:42:50 +00:00
moritz
539bb39322 Improve string to integer conversion stuff, and have another stab at the config 
file parsing. Ezstream now prints each error it can find and then bails out,
instead of bailing out on the first error. Tweak URL parsing as well, and do
some cosmetic changes to the error messages.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12603 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-02 12:52:10 +00:00
moritz
956f674a44 Allow users to restrict the number of reconnection attempts. This also changes 
how reconnections are handled in general: A recovered connection always skips
to the next tune as well, as it seems that at least for Ogg Vorbis, libshout
wants to see an Ogg header after a shout_open(). The new code makes this
behavior consistent among all formats.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12599 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-02 00:57:11 +00:00
moritz
2a511a64fc Enable more warnings on gcc, and do some miscellaneous cleanups. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12597 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-01 14:50:14 +00:00
moritz
ca6161358d Redirect only de-/encoder screen output to /dev/null with -q, and restore 
standard error outside that popen() call.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12596 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-03-01 01:22:06 +00:00
moritz
ad46ff44c6 Add new <stream_once> configuration option for disabling continuous streaming. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12592 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-02-28 21:48:01 +00:00
moritz
7d51c20fb8 Add new playlist scripting feature (works similar to Ices 2.x.) 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12591 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-02-28 21:26:16 +00:00
moritz
1712f4f88f Replace geteuid() check with stat(), and make it an error if the configuration 
file is group or world writeable. This is actually what the warning about root
was all about.


git-svn-id: https://svn.xiph.org/trunk/ezstream@12590 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-02-28 15:35:07 +00:00
moritz
159ebfdd91 Back out hardly used ezsignals.h. 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12589 0101bb08-14d6-0310-b084-bc0e0c8e3800
 2007-02-28 13:53:58 +00:00