Changeset 458:7deaeb20da4f in roaraudio

Timestamp:

08/12/08 05:55:59 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

removed a lot non working code, no metadata update within a file

File:

• plugins/xmms/roar.c (modified) (8 diffs)

plugins/xmms/roar.c

@@ -7 +7 @@
 #include <stdio.h>
 #include <string.h>
-#include <pthread.h>
 
 #include "xmms/plugin.h"
@@ -74 +73 @@
  long unsigned int bps;
  int session;
- int next_test;
  int pause;
- int updateing;
 } g_inst;
 
@@ -86 +83 @@
  g_inst.state = 0;
  g_inst.server = NULL;
- g_inst.updateing = 0;
  g_inst.session = ctrlsocket_get_session_id();
  ROAR_DBG("roar_init(*) = (void)");
@@ -97 +93 @@
 void roar_write(void *ptr, int length) {
  int r;
- int need_update = 0;
- pthread_t thread;
-
- if ( g_inst.next_test < 1 ) {
-  need_update = 1;
-  g_inst.next_test = g_inst.bps;
-  pthread_create(&thread, NULL, (void (*)(void*))roar_chk_metadata, NULL);
-  //roar_socket_nonblock(g_inst.data_fh, ROAR_SOCKET_NONBLOCK);
- }
 
  if ( g_inst.pause )
@@ -115 +102 @@
    ptr              += r;
    length           -= r;
-   g_inst.next_test -= r;
   } else {
-   if ( errno == EAGAIN ) {
-    roar_socket_nonblock(g_inst.data_fh, ROAR_SOCKET_BLOCK);
-   } else {
-    return;
-   }
+   return;
   }
- }
-
-
- if ( need_update ) {
-  //roar_socket_nonblock(g_inst.data_fh, ROAR_SOCKET_BLOCK);
-  pthread_join(thread, NULL);
  }
 }
@@ -180 +156 @@
 
  g_inst.bps       = nch * rate * bits / 8;
- g_inst.next_test = g_inst.bps;
 
  if ( (g_inst.data_fh = roar_simple_new_stream_obj(&(g_inst.con), &(g_inst.stream),
@@ -259 +234 @@
  int pos;
 
- g_inst.updateing++;
-
- if ( g_inst.updateing > 1 ) {
-  g_inst.updateing--;
-  return -1;
- }
-
  pos     = xmms_remote_get_playlist_pos(g_inst.session);
 
@@ -299 +267 @@
  }
 
- g_inst.updateing--;
  return 0;
 }