[xiph-cvs] cvs commit: ices/conf ices-live.xml

[Karl Heyes]

karl        03/07/02 16:26:52

  Modified:    .        configure.in
               src      stream.c cfgparse.h cfgparse.c
               conf     ices-live.xml
  Log:
  you have to explicity enable YP for outgoing streams.

Revision  Changes    Path
1.26      +1 -1      ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- configure.in	1 Jul 2003 23:24:46 -0000	1.25
+++ configure.in	2 Jul 2003 20:26:51 -0000	1.26
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([IceS], 2.0-Beta2, [icecast at xiph.org])
-AC_PREREQ(2.52)
+AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR(src/ices.c)
 
 AM_INIT_AUTOMAKE

<p><p>1.29      +7 -1      ices/src/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- stream.c	28 Mar 2003 00:45:54 -0000	1.28
+++ stream.c	2 Jul 2003 20:26:51 -0000	1.29
@@ -1,7 +1,7 @@
 /* stream.c
  * - Core streaming functions/main loop.
  *
- * $Id: stream.c,v 1.28 2003/03/28 00:45:54 karl Exp $
+ * $Id: stream.c,v 1.29 2003/07/02 20:26:51 karl Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -102,6 +102,12 @@
     }
 
     if (!(shout_set_mount(sdsc->shout, stream->mount)) == SHOUTERR_SUCCESS) {
+        LOG_ERROR1("libshout error: %s\n", shout_get_error(sdsc->shout));
+        stream->died = 1;
+        return NULL;
+    }
+    if (shout_set_public (sdsc->shout, stream->public_stream & 1) != SHOUTERR_SUCCESS)
+    {
         LOG_ERROR1("libshout error: %s\n", shout_get_error(sdsc->shout));
         stream->died = 1;
         return NULL;

<p><p>1.3       +2 -1      ices/src/cfgparse.h

Index: cfgparse.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/cfgparse.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfgparse.h	28 Mar 2003 01:07:37 -0000	1.2
+++ cfgparse.h	2 Jul 2003 20:26:51 -0000	1.3
@@ -1,7 +1,7 @@
 /* config.h
  * - configuration, and global structures built from config
  *
- * $Id: cfgparse.h,v 1.2 2003/03/28 01:07:37 karl Exp $
+ * $Id: cfgparse.h,v 1.3 2003/07/02 20:26:51 karl Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -63,6 +63,7 @@
     int died;
     int kill;
     int skip;
+    int public_stream;
     int wait_for_critical;
 
     struct buffer_queue *queue;

<p><p>1.4       +3 -1      ices/src/cfgparse.c

Index: cfgparse.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/cfgparse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cfgparse.c	28 Mar 2003 01:07:37 -0000	1.3
+++ cfgparse.c	2 Jul 2003 20:26:51 -0000	1.4
@@ -1,7 +1,7 @@
 /* cfgparse.c
  * - cfgparse file reading code, plus default settings.
  *
- * $Id: cfgparse.c,v 1.3 2003/03/28 01:07:37 karl Exp $
+ * $Id: cfgparse.c,v 1.4 2003/07/02 20:26:51 karl Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -234,6 +234,8 @@
             SET_STRING(instance->password);
         else if (strcmp(node->name, "username") == 0)
             SET_STRING(instance->user);
+        else if (strcmp(node->name, "yp") == 0)
+            SET_INT(instance->public_stream);
         else if (strcmp(node->name, "savefile") == 0)
             SET_STRING(instance->savefilename);
         else if (strcmp(node->name, "mount") == 0)

<p><p>1.6       +1 -0      ices/conf/ices-live.xml

Index: ices-live.xml
===================================================================
RCS file: /usr/local/cvsroot/ices/conf/ices-live.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ices-live.xml	3 Aug 2002 08:14:54 -0000	1.5
+++ ices-live.xml	2 Jul 2003 20:26:51 -0000	1.6
@@ -50,6 +50,7 @@
                         <port>8000</port>
                         <password>hackme</password>
                         <mount>/example1.ogg</mount>
+            <yp>1</yp>   <!-- allow stream to be advertised on YP, default 0 -->
 
                         <!-- Live encoding/reencoding:
                                  channels and samplerate currently MUST match the channels

<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.