[xiph-cvs] cvs commit: ices/src cfgparse.c cfgparse.h im_alsa.c im_alsa.h im_oss.c im_oss.h im_stdinpcm.c input.c signals.c Makefile.am
Karl Heyes
karl at xiph.org
Thu Mar 27 17:07:38 PST 2003
karl 03/03/27 20:07:38
Modified: . Makefile.am
src cfgparse.c cfgparse.h im_alsa.c im_alsa.h im_oss.c
im_oss.h im_stdinpcm.c input.c signals.c
Makefile.am
Log:
small cleanups, header file namespace made more unique to avoid clashes
with system headers
Revision Changes Path
1.5 +2 -1 ices/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 13 Mar 2003 03:29:45 -0000 1.4
+++ Makefile.am 28 Mar 2003 01:07:37 -0000 1.5
@@ -1,6 +1,7 @@
## 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
<p><p>1.3 +2 -3 ices/src/cfgparse.c
Index: cfgparse.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/cfgparse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfgparse.c 22 Mar 2003 02:27:55 -0000 1.2
+++ cfgparse.c 28 Mar 2003 01:07:37 -0000 1.3
@@ -1,7 +1,7 @@
/* cfgparse.c
* - cfgparse file reading code, plus default settings.
*
- * $Id: cfgparse.c,v 1.2 2003/03/22 02:27:55 karl Exp $
+ * $Id: cfgparse.c,v 1.3 2003/03/28 01:07:37 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at 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"
<p><p>1.2 +1 -3 ices/src/cfgparse.h
Index: cfgparse.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/cfgparse.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfgparse.h 22 Mar 2003 01:14:35 -0000 1.1
+++ cfgparse.h 28 Mar 2003 01:07:37 -0000 1.2
@@ -1,7 +1,7 @@
/* config.h
* - configuration, and global structures built from config
*
- * $Id: cfgparse.h,v 1.1 2003/03/22 01:14:35 karl Exp $
+ * $Id: cfgparse.h,v 1.2 2003/03/28 01:07:37 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -16,8 +16,6 @@
#include "stream.h"
#include "inputmodule.h"
-
-#define VERSIONSTRING "IceS 2.0beta2"
typedef struct _module_param_tag
{
<p><p>1.5 +2 -2 ices/src/im_alsa.c
Index: im_alsa.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_alsa.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- im_alsa.c 22 Mar 2003 02:27:55 -0000 1.4
+++ im_alsa.c 28 Mar 2003 01:07:37 -0000 1.5
@@ -1,7 +1,7 @@
/* im_alsa.c
* - Raw PCM input from ALSA devices
*
- * $Id: im_alsa.c,v 1.4 2003/03/22 02:27:55 karl Exp $
+ * $Id: im_alsa.c,v 1.5 2003/03/28 01:07:37 karl Exp $
*
* by Jason Chu <jchu at 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"
<p><p>1.3 +3 -3 ices/src/im_alsa.h
Index: im_alsa.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_alsa.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im_alsa.h 16 Mar 2003 14:21:48 -0000 1.2
+++ im_alsa.h 28 Mar 2003 01:07:37 -0000 1.3
@@ -1,7 +1,7 @@
/* 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 at 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
{
<p><p>1.13 +2 -2 ices/src/im_oss.c
Index: im_oss.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_oss.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- im_oss.c 22 Mar 2003 02:27:55 -0000 1.12
+++ im_oss.c 28 Mar 2003 01:07:37 -0000 1.13
@@ -1,7 +1,7 @@
/* im_oss.c
* - Raw PCM input from OSS devices
*
- * $Id: im_oss.c,v 1.12 2003/03/22 02:27:55 karl Exp $
+ * $Id: im_oss.c,v 1.13 2003/03/28 01:07:37 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at 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"
<p><p>1.4 +3 -3 ices/src/im_oss.h
Index: im_oss.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_oss.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im_oss.h 16 Mar 2003 14:21:48 -0000 1.3
+++ im_oss.h 28 Mar 2003 01:07:37 -0000 1.4
@@ -1,7 +1,7 @@
/* 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 at 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
{
<p><p>1.8 +2 -2 ices/src/im_stdinpcm.c
Index: im_stdinpcm.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_stdinpcm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- im_stdinpcm.c 22 Mar 2003 02:27:55 -0000 1.7
+++ im_stdinpcm.c 28 Mar 2003 01:07:37 -0000 1.8
@@ -1,7 +1,7 @@
/* im_stdinpcm.c
* - Raw PCM input from stdin
*
- * $Id: im_stdinpcm.c,v 1.7 2003/03/22 02:27:55 karl Exp $
+ * $Id: im_stdinpcm.c,v 1.8 2003/03/28 01:07:37 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at 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"
<p><p>1.28 +3 -3 ices/src/input.c
Index: input.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/input.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- input.c 22 Mar 2003 02:27:55 -0000 1.27
+++ input.c 28 Mar 2003 01:07:37 -0000 1.28
@@ -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.27 2003/03/22 02:27:55 karl Exp $
+ * $Id: input.c,v 1.28 2003/03/28 01:07:37 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at 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"
<p><p>1.8 +2 -2 ices/src/signals.c
Index: signals.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/signals.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- signals.c 22 Mar 2003 02:27:55 -0000 1.7
+++ signals.c 28 Mar 2003 01:07:37 -0000 1.8
@@ -1,7 +1,7 @@
/* signals.c
* - signal handling/setup
*
- * $Id: signals.c,v 1.7 2003/03/22 02:27:55 karl Exp $
+ * $Id: signals.c,v 1.8 2003/03/28 01:07:37 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at 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"
<p><p>1.17 +0 -2 ices/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.am 27 Mar 2003 16:43:42 -0000 1.16
+++ Makefile.am 28 Mar 2003 01:07:37 -0000 1.17
@@ -28,8 +28,6 @@
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@"
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list