Changeset 762:b0fafbce8cc5 in roaraudio

Timestamp:

09/07/08 03:04:30 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a more complete roar_file_play_full()

Files:

• include/libroar/file.h (modified) (1 diff)
• libroar/file.c (modified) (4 diffs)

include/libroar/file.h

@@ -45 +45 @@
 ssize_t roar_file_send_raw   (int out, int in);
 ssize_t roar_file_play       (struct roar_connection * con, char * file, int exec);
+ssize_t roar_file_play_full  (struct roar_connection * con, char * file, int exec, int passfh, struct roar_stream * s);
 
 ssize_t roar_file_map        (char * filename, int flags, mode_t mode, size_t len, void ** mem);

libroar/file.c

@@ -157 +157 @@
 
 ssize_t roar_file_play (struct roar_connection * con, char * file, int exec) {
+ struct roar_stream s;
+
+ return roar_file_play_full(con, file, exec, 0, &s);
+}
+
+ssize_t roar_file_play_full  (struct roar_connection * con, char * file, int exec, int passfh, struct roar_stream * s) {
  int codec = -1;
  int in, out = -1;
- struct roar_stream s;
  ssize_t r = 0;
  int len;
@@ -171 +176 @@
   return -1;
 
+ if ( exec && passfh )
+  return -1;
+
  if ( (in = open(file, O_RDONLY, 0644)) == -1 ) {
   return -1;
@@ -188 +196 @@
 
  if ( exec ) {
-  if ( roar_stream_new(&s, rate, channels, bits, codec) == -1 ) {
-   close(in);
-   return -1;
-  }
-
-  if ( roar_stream_connect(con, &s, ROAR_DIR_PLAY) == -1 ) {
-   close(in);
-   return -1;
-  }
-
-  if ( roar_stream_exec(con, &s) == -1 ) {
+  if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
+   close(in);
+   return -1;
+  }
+
+  if ( roar_stream_connect(con, s, ROAR_DIR_PLAY) == -1 ) {
+   close(in);
+   return -1;
+  }
+
+  if ( roar_stream_exec(con, s) == -1 ) {
    close(in);
    return -1;
@@ -215 +223 @@
  write(out, buf, len);
 
- r = roar_file_send_raw(out, in);
-
- close(out);
-
- if ( exec ) {
-  con->fh = -1;
- }
-
- close(in);
+ if ( !passfh ) {
+  r = roar_file_send_raw(out, in);
+
+  close(out);
+
+  if ( exec ) {
+   con->fh = -1;
+  }
+
+  close(in);
+ } else {
+  if ( roar_stream_passfh(con, s, in) == -1 ) {
+   return -1;
+  }
+  close(out);
+  close(in);
+  return 0;
+ }
 
  return r;