Changeset 4960:60cdebcb83ef in roaraudio for libroarpulse/simple.c

Timestamp:

05/14/11 04:46:29 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some updates for pulseaudio emulation, converted libroarpulse-simple fully to VS API

File:

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

libroarpulse/simple.c

@@ -40 +40 @@
 #include <libroarpulse/libroarpulse.h>
 
+#define _seterr() if ( error != NULL ) { *error = roar_pa_raerror2paerror(err); }
+
 /** Create a new connection to the server */
 pa_simple* pa_simple_new(
@@ -52 +54 @@
     int *error                          /**< A pointer where the error code is stored when the routine returns NULL. It is OK to pass NULL here. */
     ) {
- struct roarpulse_simple * s;
+ struct roar_keyval kv[1];
+ roar_vs_t * vss = NULL;
  struct roar_audio_info info;
  int roar_dir;
- struct roar_meta meta;
+ int err = ROAR_ERROR_NONE;
 
  if ( dir == PA_STREAM_PLAYBACK ) {
@@ -69 +72 @@
  }
 
- if ( (s = roar_mm_malloc(sizeof(struct roarpulse_simple))) == NULL )
-  return NULL;
-
  server = roar_pa_find_server((char*)server);
 
- if ( roar_simple_connect(&(s->con), (char*)server, (char*)name) == -1 ) {
-  roar_mm_free(s);
+ vss = roar_vs_new(server, name, &err);
+ if ( vss == NULL ) {
+  _seterr();
   return NULL;
  }
 
- if ( roar_vio_simple_new_stream_obj(&(s->vio), &(s->con), &(s->stream),
-                                     info.rate, info.channels,
-                                     info.bits, info.codec, roar_dir) == -1 ) {
-  roar_disconnect(&(s->con));
-  roar_mm_free(s);
+ if ( roar_vs_stream(vss, &info, roar_dir, &err) == -1 ) {
+  roar_vs_close(vss, ROAR_VS_TRUE, NULL);
+  _seterr();
   return NULL;
  }
 
  if ( stream_name != NULL && stream_name[0] != 0 ) {
-  meta.value  = (char*)stream_name;
-  meta.key[0] = 0;
-  meta.type   = ROAR_META_TYPE_DESCRIPTION;
+  kv[0].key   = "DESCRIPTION";
+  kv[1].value = (char*)stream_name;
 
-  roar_stream_meta_set(&(s->con), &(s->stream), ROAR_META_MODE_SET, &meta);
+  roar_vs_meta(vss, kv, 1, NULL);
  }
 
- return (pa_simple*) s;
+ return (pa_simple*) vss;
 }
 
 /** Close and free the connection to the server. The connection objects becomes invalid when this is called. */
 void pa_simple_free(pa_simple *s) {
- struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
-
  if ( s == NULL )
   return;
 
- roar_vio_close(&(ss->vio));
- roar_disconnect(&(ss->con));
-
- roar_mm_free(s);
+ roar_vs_close((roar_vs_t*)s, ROAR_VS_FALSE, NULL);
 }
 
 /** Write some data to the server */
 int pa_simple_write(pa_simple *s, const void*data, size_t length, int *error) {
- struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
+ int ret;
+ int err = ROAR_ERROR_NONE;
 
  if ( s == NULL )
   return -1;
 
- return roar_vio_write(&(ss->vio), (char*) data, length);
+ ret = roar_vs_write((roar_vs_t*)s, data, length, &err);
+
+ _seterr();
+
+ return ret;
 }
 
 /** Wait until all data already written is played by the daemon */
 int pa_simple_drain(pa_simple *s, int *error) {
-// struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
+ int ret;
+ int err = ROAR_ERROR_NONE;
 
  if ( s == NULL )
   return -1;
 
- pa_simple_flush(s, error);
+ ret = roar_vs_sync((roar_vs_t*)s, ROAR_VS_WAIT, &err);
 
- return -1;
+ _seterr();
+
+ return ret;
 }
 
 /** Read some data from the server */
 int pa_simple_read(pa_simple *s, void*data, size_t length, int *error) {
- struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
+ int ret;
+ int err = ROAR_ERROR_NONE;
 
  if ( s == NULL )
   return -1;
 
- return roar_vio_read(&(ss->vio), data, length);
+ ret = roar_vs_read((roar_vs_t*)s, data, length, &err);
+
+ _seterr();
+
+ return ret;
 }
 
 /** Return the playback latency. \since 0.5 */
 pa_usec_t pa_simple_get_latency(pa_simple *s, int *error) {
- struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
+ roar_mus_t ret;
+ int err = ROAR_ERROR_NONE;
 
  if ( s == NULL )
   return -1;
 
- return -1;
+ ret = roar_vs_latency((roar_vs_t*)s, ROAR_VS_BACKEND_DEFAULT, &err);
+
+ if ( ret < 0 )
+  ret *= -1;
+
+ if ( ret == 0 && err != ROAR_ERROR_NONE ) {
+  _seterr();
+  return -1;
+ }
+
+ return ret;
 }
 
 /** Flush the playback buffer. \since 0.5 */
 int pa_simple_flush(pa_simple *s, int *error) {
- struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
+ int ret;
+ int err = ROAR_ERROR_NONE;
 
  if ( s == NULL )
   return -1;
 
- return roar_vio_sync(&(ss->vio));
+ ret = roar_vs_sync((roar_vs_t*)s, ROAR_VS_NOWAIT, &err);
+
+ _seterr();
+
+ return ret;
 }