Changeset 3135:af6a10f1b0ab in roaraudio for plugins/alsa

Timestamp:

01/15/10 10:23:04 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done a lot stuff for testing, plugin now loads but libasound2 segfaults

Location:

plugins/alsa

Files:

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

plugins/alsa/Makefile

@@ -9 +9 @@
 
 #DEFINES=-DDEBUG
+DEFINES=-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"alsa-plugins\" -DVERSION=\"1.0.13\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1 -DHAVE_LIBASOUND=1 -D_REENTRANT -DDEBUG
 CFLAGS += -g -Wall -O2 -I../../include $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) -I/usr/include/alsa -D_GNU_SOURCE
-LDFLAGS = -g $(SHARED) $(LDPATH) -L../../lib -module -avoid-version -export-dynamic
-LIBS    = $(LIBROAR) -lasound
+LDFLAGS = -g $(SHARED) $(LDPATH) -L../../lib 
+LIBS    = $(LIBROAR) -lm -ldl /usr/lib/libasound.so
 
 all: ${TARGET}
@@ -26 +27 @@
 
 $(SLIB): $(OBJS)
-        $(CC) $(LDFLAGS) -Wl,-soname,$(SLIB) -o $(SLIB) $(OBJS) $(LIBS)
+        $(CC) $(LDFLAGS) -Wl,-soname -Wl,$(SLIB) -o $(SLIB) $(OBJS) $(LIBS)

plugins/alsa/pcm.c

@@ -50 +50 @@
  int ret;
 
+ ROAR_DBG("roar_hw_constraint(*) = ?");
+
  if ( (ret = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS,
         _as(access_list), access_list)) < 0 )
@@ -74 +76 @@
   return ret;
 
+ ROAR_DBG("roar_hw_constraint(*) = 0");
+
  return 0;
 }
 
 static int roar_pcm_dummy (snd_pcm_ioplug_t * io) {
+ ROAR_DBG("roar_pcm_dummy(*) = ?");
  return 0;
 }
 
 static snd_pcm_sframes_t roar_pcm_pointer(snd_pcm_ioplug_t *io) {
+ ROAR_DBG("roar_pcm_pointer(*) = ?");
  return 0;
 }
@@ -93 +99 @@
  char * buf;
 
+ ROAR_DBG("roar_pcm_transfer(*) = ?");
+
  buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
 
@@ -101 +109 @@
 
 static int roar_pcm_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp) {
+ ROAR_DBG("roar_pcm_delay(*) = ?");
  return 0;
 }
@@ -106 +115 @@
 static int roar_pcm_prepare(snd_pcm_ioplug_t *io) {
  struct roar_alsa_pcm * self = io->private_data;
+
+ ROAR_DBG("roar_pcm_prepare(*) = ?");
 
  if ( self->stream_opened ) {
@@ -127 +138 @@
 static int roar_pcm_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params) {
  struct roar_alsa_pcm * self = io->private_data;
+
+ ROAR_DBG("roar_pcm_hw_params(*) = ?");
 
  self->info.channels = io->channels;
@@ -161 +174 @@
 static int roar_pcm_close (snd_pcm_ioplug_t * io) {
  struct roar_alsa_pcm * self = io->private_data;
+
+ ROAR_DBG("roar_pcm_close(*) = ?");
 
  roar_disconnect(&(self->roar.con));
@@ -192 +207 @@
  int            ret;
 
- printf("TEST!\n");
+ ROAR_DBG("SND_PCM_PLUGIN_DEFINE_FUNC(roar) = ?");
 
  snd_config_for_each(i, next, conf) {
@@ -245 +260 @@
  }
 
+ ROAR_DBG("SND_PCM_PLUGIN_DEFINE_FUNC(roar) = 0");
+
  return 0;
 }
@@ -250 +267 @@
 SND_PCM_PLUGIN_SYMBOL(roar);
 
+int __snd_pcm_roar_open_dlsym_pcm_001 (void) {
+ return 0;
+}
+
 //ll

plugins/alsa/roar.c

@@ -35 +35 @@
 #include "roar.h"
 
+struct snd_dlsym_link *snd_dlsym_start;
+
 //ll

plugins/alsa/roar.h

@@ -39 +39 @@
 #include <errno.h>
 #include <alsa/asoundlib.h>
+#include <alsa/global.h>
 #include <alsa/pcm_external.h>
 #include <alsa/control_external.h>