Changeset 4167:c94ebe68a53a in roaraudio for plugins/alsa

Timestamp:

08/14/10 00:26:21 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use new files provided by maister

Location:

plugins/alsa

Files:

• Makefile (modified) (1 diff)
• pcm_roar.c (added)
• roar.h (modified) (4 diffs)

plugins/alsa/Makefile

@@ -2 +2 @@
 SLIB=$(BASENAME)$(SHARED_SUFFIX)
 TARGET=$(SLIB)
-OBJS=roar.o pcm.o mixer.o
+INSTALL_DIR=$(PREFIX_LIB)/alsa-lib/
+OBJS=pcm_roar.o thread.o
 
 include ../../Makefile.conf

plugins/alsa/roar.h

@@ -3 +3 @@
 /*
  *      Copyright (C) Philipp 'ph3-der-loewe' Schafft - 2010
+ *      Copyright (C) Hans-Kristian 'maister' Arntzen - 2010
  *
  *  This file is part of libroar a part of RoarAudio,
@@ -27 +28 @@
  *  any patches.
  *
+ *  NOTE for uses of non-GPL (LGPL,...) software using libesd, libartsc
+ *  or libpulse*:
+ *  The libs libroaresd, libroararts and libroarpulse link this lib
+ *  and are therefore GPL. Because of this it may be illigal to use
+ *  them with any software that uses libesd, libartsc or libpulse*.
  */
 
@@ -38 +44 @@
 #include <alsa/pcm_external.h>
 #include <alsa/control_external.h>
+#include <pthread.h>
+#include <time.h>
 
 #define _as(x) (sizeof((x))/sizeof(*(x)))
@@ -53 +61 @@
  int                    stream_opened;
  size_t                 writec;
+ size_t                 last_ptr;
+ char*                  buffer;
+ size_t                 bufsize;
+ size_t                 bufptr;
+ pthread_t              thread;
+ pthread_mutex_t        lock;
+ pthread_mutex_t        cond_lock;
+ pthread_cond_t         cond;
+ volatile int           thread_active;
+ int                    bytes_in_buffer;
+ volatile int64_t       total_written;
+ int                    has_written;
+ struct timespec        start_tv;
 };
+
+void roar_reset(struct roar_alsa_pcm * self);
+void* roar_thread (void * thread_data);
+size_t roar_write(struct roar_alsa_pcm * self, const char * buf, size_t size);
+void roar_drain(struct roar_alsa_pcm * self);
 
 #endif