Changeset 416:3c1e97685b59 in roaraudio for libroarpulse

Timestamp:

08/10/08 12:40:39 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use roar_simple_new_stream_obj() not roar_simple_*() to create a new stream so we can update meta data

File:

• libroarpulse/simple.c (modified) (4 diffs)

libroarpulse/simple.c

@@ -16 +16 @@
     ) {
  struct roarpulse_simple * s = malloc(sizeof(struct roarpulse_simple));
- int (*roarfunc)(int rate, int channels, int bits, int codec, char * server, char * name) = roar_simple_play;
+ int roar_dir;
  int codec = -1;
+ struct roar_meta meta;
 
  if ( !s )
@@ -23 +24 @@
 
  if ( dir == PA_STREAM_PLAYBACK ) {
-  roarfunc = roar_simple_play;
+  roar_dir = ROAR_DIR_PLAY;
  } else if ( dir == PA_STREAM_RECORD ) {
-  roarfunc = roar_simple_record;
+  roar_dir = ROAR_DIR_RECORD;
  } else {
   free(s);
@@ -33 +34 @@
  codec = roar_codec_pulse2roar(ss->format);
 
- s->data_fh = roarfunc(ss->rate, ss->channels, 16 /* does PulseAudio support something diffrent? */,
-                       codec, (char*)server, (char*)name);
+ if ( roar_simple_connect(&(s->con), (char*)server, (char*)name) == -1 ) {
+  free(s);
+  return NULL;
+ }
+
+ s->data_fh = roar_simple_new_stream_obj(&(s->con), &(s->stream), ss->rate, ss->channels,
+                  16 /* does PulseAudio support something diffrent? */, codec, roar_dir);
+
+ if ( s->data_fh == -1 ) {
+  roar_disconnect(&(s->con));
+  free(s);
+  return NULL;
+ }
+
+ meta.value  = (char*)stream_name;
+ meta.key[0] = 0;
+ meta.type   = ROAR_META_TYPE_DESCRIPTION;
+
+ roar_stream_meta_set(&(s->con), &(s->stream), ROAR_META_MODE_SET, &meta);
 
  return (pa_simple*) s;
@@ -46 +64 @@
 
  close(ss->data_fh);
+ roar_disconnect(&(ss->con));
 
  free(s);