Changeset 457:60f64b109d75 in roaraudio for plugins/xmms

Timestamp:

08/12/08 05:52:22 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some non working pthread based meta data update code

Location:

plugins/xmms

Files:

• Makefile (modified) (1 diff)
• roar.c (modified) (10 diffs)

plugins/xmms/Makefile

@@ -10 +10 @@
 INSTALL_DIR=`xmms-config --output-plugin-dir`
 
-DEFINES=-DDEBUG
+#DEFINES=-DDEBUG
 CFLAGS  = -g -Wall -O2 $(DEFINES) $(INCLUDE) -fPIC $(GTK_CFLAFS) $(XMMS_CFLAGS)
 LDFLAGS = -g -shared -lroar $(GTK_LIBS) $(XMMS_LIBS)

plugins/xmms/roar.c

@@ -7 +7 @@
 #include <stdio.h>
 #include <string.h>
+#include <pthread.h>
 
 #include "xmms/plugin.h"
@@ -54 +55 @@
         roar_close,
         NULL, //roar_flush,
-        NULL, //roar_pause,
+        roar_pause,
         roar_free,
         roar_playing,
@@ -74 +75 @@
  int session;
  int next_test;
+ int pause;
+ int updateing;
 } g_inst;
 
@@ -83 +86 @@
  g_inst.state = 0;
  g_inst.server = NULL;
+ g_inst.updateing = 0;
  g_inst.session = ctrlsocket_get_session_id();
  ROAR_DBG("roar_init(*) = (void)");
@@ -93 +97 @@
 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 )
+  return;
 
  while (length) {
-  if ( (r = write(g_inst.data_fh, ptr, length >= 1764 ? 1764 : length)) != -1 ) {
+  if ( (r = write(g_inst.data_fh, ptr, length >= 17640 ? 17640 : length)) != -1 ) {
    g_inst.written   += r;
    ptr              += r;
@@ -101 +117 @@
    g_inst.next_test -= r;
   } else {
-   return;
+   if ( errno == EAGAIN ) {
+    roar_socket_nonblock(g_inst.data_fh, ROAR_SOCKET_BLOCK);
+   } else {
+    return;
+   }
   }
  }
 
 
- if ( g_inst.next_test < 1 ) {
-  roar_chk_metadata();
-  g_inst.next_test = g_inst.bps;
+ if ( need_update ) {
+  //roar_socket_nonblock(g_inst.data_fh, ROAR_SOCKET_BLOCK);
+  pthread_join(thread, NULL);
  }
 }
@@ -169 +189 @@
 
  g_inst.written = 0;
+ g_inst.pause   = 0;
 
  roar_update_metadata();
@@ -182 +203 @@
 }
 
-void roar_pause(short p);
+void roar_pause(short p) {
+ g_inst.pause = p;
+}
 
 int roar_free(void) {
@@ -236 +259 @@
  int pos;
 
+ g_inst.updateing++;
+
+ if ( g_inst.updateing > 1 ) {
+  g_inst.updateing--;
+  return -1;
+ }
+
  pos     = xmms_remote_get_playlist_pos(g_inst.session);
 
@@ -269 +299 @@
  }
 
+ g_inst.updateing--;
  return 0;
 }