Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
Icecast-IceS
Commits
960498a0
Commit
960498a0
authored
Mar 28, 2003
by
Karl Heyes
Browse files
small cleanups, header file namespace made more unique to avoid clashes
with system headers svn path=/trunk/ices/; revision=4556
parent
5509cb64
Changes
11
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
960498a0
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS
=
foreign dist-zip
AUTOMAKE_OPTIONS
=
foreign dist-bzip2
ACLOCAL_AMFLAGS
=
-I
m4
SUBDIRS
=
src conf
...
...
src/Makefile.am
View file @
960498a0
...
...
@@ -28,8 +28,6 @@ ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reenco
ices_LDADD
=
log/libicelog.la @ALSA_LIBS@
INCLUDES
=
-I
$(srcdir)
/net
-I
$(srcdir)
/thread
-I
$(srcdir)
/avl
-I
$(srcdir)
/log
-I
$(srcdir)
/timing
debug
:
$(MAKE)
all
CFLAGS
=
"@DEBUG@"
...
...
src/cfgparse.c
View file @
960498a0
/* cfgparse.c
* - cfgparse file reading code, plus default settings.
*
* $Id: cfgparse.c,v 1.
2
2003/03/2
2
0
2:27:55
karl Exp $
* $Id: cfgparse.c,v 1.
3
2003/03/2
8
0
1:07:37
karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -24,11 +24,10 @@
#include
<libxml/parser.h>
#include
<libxml/xmlmemory.h>
#include
"
thread.h
"
#include
<thread/
thread.h
>
#include
"cfgparse.h"
#include
"stream.h"
#include
"thread/thread.h"
#define DEFAULT_BACKGROUND 0
#define DEFAULT_LOGPATH "/tmp"
...
...
src/cfgparse.h
View file @
960498a0
/* config.h
* - configuration, and global structures built from config
*
* $Id: cfgparse.h,v 1.
1
2003/03/2
2
01:
14
:3
5
karl Exp $
* $Id: cfgparse.h,v 1.
2
2003/03/2
8
01:
07
:3
7
karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -17,8 +17,6 @@
#include
"stream.h"
#include
"inputmodule.h"
#define VERSIONSTRING "IceS 2.0beta2"
typedef
struct
_module_param_tag
{
char
*
name
;
...
...
src/im_alsa.c
View file @
960498a0
/* im_alsa.c
* - Raw PCM input from ALSA devices
*
* $Id: im_alsa.c,v 1.
4
2003/03/2
2
0
2:27:55
karl Exp $
* $Id: im_alsa.c,v 1.
5
2003/03/2
8
0
1:07:37
karl Exp $
*
* by Jason Chu <jchu@uvic.ca>, based
* on im_oss.c which is...
...
...
@@ -29,7 +29,7 @@
#include
<fcntl.h>
#include
"
thread.h
"
#include
<thread/
thread.h
>
#include
"cfgparse.h"
#include
"stream.h"
#include
"metadata.h"
...
...
src/im_alsa.h
View file @
960498a0
/* im_alsa.h
* - read pcm data from oss devices
*
* $Id: im_alsa.h,v 1.
2
2003/03/
16 14:21:48 msmith
Exp $
* $Id: im_alsa.h,v 1.
3
2003/03/
28 01:07:37 karl
Exp $
*
* by Jason Chu <jchu@uvic.ca>, based
* on im_oss.c which is...
...
...
@@ -17,9 +17,9 @@
#define __IM_ALSA_H__
#include
<alsa/asoundlib.h>
#include
"inputmodule.h"
#include
"thread.h"
#include
<thread/thread.h>
#include
<ogg/ogg.h>
#include
"inputmodule.h"
typedef
struct
{
...
...
src/im_oss.c
View file @
960498a0
/* im_oss.c
* - Raw PCM input from OSS devices
*
* $Id: im_oss.c,v 1.1
2
2003/03/2
2
0
2:27:55
karl Exp $
* $Id: im_oss.c,v 1.1
3
2003/03/2
8
0
1:07:37
karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -27,7 +27,7 @@
#include
<fcntl.h>
#include
"
thread.h
"
#include
<thread/
thread.h
>
#include
"cfgparse.h"
#include
"stream.h"
#include
"metadata.h"
...
...
src/im_oss.h
View file @
960498a0
/* im_oss.h
* - read pcm data from oss devices
*
* $Id: im_oss.h,v 1.
3
2003/03/
16 14:21:48 msmith
Exp $
* $Id: im_oss.h,v 1.
4
2003/03/
28 01:07:37 karl
Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -14,9 +14,9 @@
#ifndef __IM_OSS_H__
#define __IM_OSS_H__
#include
"inputmodule.h"
#include
"thread.h"
#include
<thread/thread.h>
#include
<ogg/ogg.h>
#include
"inputmodule.h"
typedef
struct
{
...
...
src/im_stdinpcm.c
View file @
960498a0
/* im_stdinpcm.c
* - Raw PCM input from stdin
*
* $Id: im_stdinpcm.c,v 1.
7
2003/03/2
2
0
2:27:55
karl Exp $
* $Id: im_stdinpcm.c,v 1.
8
2003/03/2
8
0
1:07:37
karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -21,7 +21,7 @@
#include
<errno.h>
#include
<ogg/ogg.h>
#include
"
thread.h
"
#include
<thread/
thread.h
>
#include
"cfgparse.h"
#include
"stream.h"
...
...
src/input.c
View file @
960498a0
...
...
@@ -2,7 +2,7 @@
* - Main producer control loop. Fetches data from input modules, and controls
* submission of these to the instance threads. Timing control happens here.
*
* $Id: input.c,v 1.2
7
2003/03/2
2
0
2:27:55
karl Exp $
* $Id: input.c,v 1.2
8
2003/03/2
8
0
1:07:37
karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -26,10 +26,10 @@
#include
<vorbis/codec.h>
#include
<string.h>
#include
<timing/timing.h>
#include
<thread/thread.h>
#include
"cfgparse.h"
#include
"thread/thread.h"
#include
"stream.h"
#include
"timing.h"
#include
"input.h"
#include
"event.h"
#include
"inputmodule.h"
...
...
src/signals.c
View file @
960498a0
/* signals.c
* - signal handling/setup
*
* $Id: signals.c,v 1.
7
2003/03/2
2
0
2:27:55
karl Exp $
* $Id: signals.c,v 1.
8
2003/03/2
8
0
1:07:37
karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith@labyrinth.net.au>
*
...
...
@@ -19,7 +19,7 @@
#include
<stdlib.h>
#include
<signal.h>
#include
"
thread.h
"
#include
<thread/
thread.h
>
#include
"cfgparse.h"
#include
"stream.h"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment