Commit d5e28258 authored by Karl Heyes's avatar Karl Heyes
Browse files

you have to explicity enable YP for outgoing streams.

svn path=/trunk/ices/; revision=5041
parent 947508ff
......@@ -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
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([IceS], 2.0-Beta2, [icecast@xiph.org])
AC_PREREQ(2.52)
AC_PREREQ(2.54)
AC_CONFIG_SRCDIR(src/ices.c)
AM_INIT_AUTOMAKE
......
/* 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@labyrinth.net.au>
*
......@@ -234,6 +234,8 @@ static void _parse_instance(config_t *config, xmlDocPtr doc, xmlNodePtr node)
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)
......
/* 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@labyrinth.net.au>
*
......@@ -63,6 +63,7 @@ typedef struct _instance_tag
int died;
int kill;
int skip;
int public_stream;
int wait_for_critical;
struct buffer_queue *queue;
......
/* 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@labyrinth.net.au>
*
......@@ -106,6 +106,12 @@ void *ices_instance_stream(void *arg)
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;
}
/* set the metadata for the stream */
if(stream->stream_name)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment