[xiph-cvs] cvs commit: ices/src config.h ices.c stream.c

[Michael Smith]

msmith      02/08/16 11:47:36

  Modified:    src      config.h ices.c stream.c
  Log:
  Send ices2 version string to server.
  (bump version number to beta2, it's been a long time since it started saying
  beta1).

Revision  Changes    Path
1.15      +3 -1      ices/src/config.h

Index: config.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/config.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config.h	16 Aug 2002 14:23:43 -0000	1.14
+++ config.h	16 Aug 2002 15:47:36 -0000	1.15
@@ -1,7 +1,7 @@
 /* config.h
  * - configuration, and global structures built from config
  *
- * $Id: config.h,v 1.14 2002/08/16 14:23:43 msmith Exp $
+ * $Id: config.h,v 1.15 2002/08/16 15:47:36 msmith Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -16,6 +16,8 @@
 
 #include "stream.h"
 #include "inputmodule.h"
+
+#define VERSIONSTRING "IceS 2.0beta2"
 
 typedef struct _module_param_tag
 {

<p><p>1.5       +2 -2      ices/src/ices.c

Index: ices.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/ices.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ices.c	29 Jan 2002 09:20:27 -0000	1.4
+++ ices.c	16 Aug 2002 15:47:36 -0000	1.5
@@ -1,7 +1,7 @@
 /* ices.c
  * - Main startup, thread launching, and cleanup code.
  *
- * $Id: ices.c,v 1.4 2002/01/29 09:20:27 msmith Exp $
+ * $Id: ices.c,v 1.5 2002/08/16 15:47:36 msmith Exp $
  *
  * Copyright (c) 2001-2002 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -34,7 +34,7 @@
 
         if (argc != 2) 
         {
-		fprintf(stderr, "IceS version 2.0beta1\n"
+		fprintf(stderr, VERSIONSTRING "\n"
                                 "  (c) Copyright 2001-2002 Michael Smith <msmith at icecast.org>\n"
                                 "\n"
                                 "Usage: \"ices config.xml\"\n");

<p><p>1.21      +8 -1      ices/src/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- stream.c	16 Aug 2002 14:23:43 -0000	1.20
+++ stream.c	16 Aug 2002 15:47:36 -0000	1.21
@@ -1,7 +1,7 @@
 /* stream.c
  * - Core streaming functions/main loop.
  *
- * $Id: stream.c,v 1.20 2002/08/16 14:23:43 msmith Exp $
+ * $Id: stream.c,v 1.21 2002/08/16 15:47:36 msmith Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -103,6 +103,13 @@
                 stream->died = 1;
                 return NULL;
     }
+
+	if (!(shout_set_agent(sdsc->shout, VERSIONSTRING)) == SHOUTERR_SUCCESS) {
+		LOG_ERROR1("libshout error: %s\n", shout_get_error(sdsc->shout));
+		free(connip);
+		stream->died = 1;
+		return NULL;
+	}
 
         if (!(shout_set_mount(sdsc->shout, stream->mount)) == SHOUTERR_SUCCESS) {
                 LOG_ERROR1("libshout error: %s\n", shout_get_error(sdsc->shout));

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