Changeset 3622:21fc206e6ea0 in roaraudio for plugins/xmms

Timestamp:

03/02/10 21:24:17 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

sysio->vio

Location:

plugins/xmms

Files:

• all.h (modified) (1 diff)
• roar.c (modified) (4 diffs)

plugins/xmms/all.h

@@ -76 +76 @@
  struct roar_connection con;
  struct roar_stream     stream;
- int                 data_fh;
+ struct roar_vio_calls  vio;
  long unsigned int   written;
  long unsigned int   bps;

plugins/xmms/roar.c

@@ -78 +78 @@
 
 void roar_write(void *ptr, int length) {
- int r;
+ ssize_t r;
 
  if ( g_inst.pause )
@@ -86 +86 @@
 
  while (length) {
-  if ( (r = write(g_inst.data_fh, ptr, length >= 17640 ? 17640 : length)) != -1 ) {
+  if ( (r = roar_vio_write(&(g_inst.vio), ptr, length >= 1764*2 ? 1764*2 : length)) != -1 ) {
    g_inst.written   += r;
    ptr              += r;
@@ -147 +147 @@
  roar_close();
 
- if ( (g_inst.data_fh = roar_simple_new_stream_obj(&(g_inst.con), &(g_inst.stream),
-                              rate, nch, bits, codec, ROAR_DIR_PLAY)) == -1) {
+ if ( roar_vio_simple_new_stream_obj(&(g_inst.vio), &(g_inst.con), &(g_inst.stream),
+                                     rate, nch, bits, codec, ROAR_DIR_PLAY) == -1 ) {
   roar_disconnect(&(g_inst.con));
   g_inst.state |= STATE_CONNECTED;
@@ -173 +173 @@
 
 void roar_close(void) {
- if ( g_inst.data_fh != -1 )
-  close(g_inst.data_fh);
- g_inst.data_fh = -1;
+ int was_playing = g_inst.state & STATE_PLAYING;
+
  g_inst.state |= STATE_PLAYING;
  g_inst.state -= STATE_PLAYING;
+
+ if ( was_playing )
+  roar_vio_close(&(g_inst.vio));
+
  g_inst.written = 0;
  ROAR_DBG("roar_close(void) = (void)");