Changeset 73:7eb32a675a95 in roaraudio for libroaresd

Timestamp:

07/12/08 15:34:46 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some more simple things, including fallback support via +fork

Location:

libroaresd

Files:

• esdbasic.c (modified) (2 diffs)
• esdstream.c (modified) (4 diffs)

libroaresd/esdbasic.c

@@ -10 +10 @@
  struct roar_connection con;
 
- if ( roar_simple_connect(&con, host, NULL) == -1 ) {
+ if ( roar_simple_connect(&con, (char*) host, NULL) == -1 ) {
   ROAR_DBG("esd_open_sound(*): roar_simple_connect() faild!");
   return -1;
@@ -19 +19 @@
 
 /* send the authorization cookie, create one if needed */
-int esd_send_auth( int sock );
+int esd_send_auth( int sock ) {
+ return 0;
+}
 
 /* closes fd, previously obtained by esd_open */

libroaresd/esdstream.c

@@ -7 +7 @@
 int esd_play_stream( esd_format_t format, int rate,
                      const char *host, const char *name ) {
-
-int channels;
-int bits;
+ int channels;
+ int bits;
 
  if ( (format & ESD_BITS8) ) {
@@ -28 +27 @@
 int esd_play_stream_fallback( esd_format_t format, int rate,
                               const char *host, const char *name ) {
- return esd_play_stream(format, rate, host, name); // for the moment this need to be ok...
+ int r;
+
+ if ( (r = esd_play_stream(format, rate, host, name)) != -1 ) {
+  return r;
+ }
+
+ return esd_play_stream(format, rate, "+fork", name);
 }
 
@@ -35 +40 @@
 int esd_monitor_stream( esd_format_t format, int rate,
                         const char *host, const char *name ) {
-
-int channels;
-int bits;
+ int channels;
+ int bits;
 
  if ( (format & ESD_BITS8) ) {
@@ -60 +64 @@
 int esd_filter_stream( esd_format_t format, int rate,
                        const char *host, const char *name ) {
-
-int channels;
-int bits;
+ int channels;
+ int bits;
 
  if ( (format & ESD_BITS8) ) {