Changeset 320

Timestamp:

01/25/06 12:42:48 (3 years ago)

Author:

conrad

Message:

remove all the ALSA code

Files:

• libremix/trunk/config.h.in (modified) (1 diff)
• libremix/trunk/configure.ac (modified) (1 diff)
• libremix/trunk/remix.pc.in (modified) (1 diff)
• libremix/trunk/src/examples/Makefile.am (modified) (1 diff)
• libremix/trunk/src/libremix/remix_monitor.c (modified) (9 diffs)
• libremix/trunk/src/libremix/remix_private.h (modified) (2 diffs)

libremix/trunk/config.h.in

@@ -3 +3 @@
-/* Define to build experimental code */
-#undef ANX_CONFIG_EXPERIMENTAL
-
-/* Set to 1 if using ALSA for sound output. */
-#undef HAVE_ALSA
-
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-#undef HAVE_ALSA_ASOUNDLIB_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */

libremix/trunk/configure.ac

@@ -89 +89 @@
-AM_CONDITIONAL(BUILD_MONITOR, test -n "$BUILD_MONITOR")
-
-dnl Test for ALSA.
-
-HAVE_ALSA=0
-AC_CHECK_HEADERS(alsa/asoundlib.h)
-  if test "x${ac_cv_header_alsa_asoundlib_h}" = xyes ; then
-    HAVE_ALSA=1
-    ALSA_LIBS="-lasound"
-    AC_SUBST(ALSA_LIBS)
-  fi
-
-AC_DEFINE_UNQUOTED([HAVE_ALSA],${HAVE_ALSA}, [Set to 1 if using ALSA for sound output.])
-
-dnl
-dnl Set PACKAGE_PLUGIN_DIR in Makefiles and config.h.

libremix/trunk/remix.pc.in

@@ -8 +8 @@
-Requires: ctxdata sndfile
-Version: @VERSION@
- @ALSA_LIBS@
+
-Cflags: -I${includedir}

libremix/trunk/src/examples/Makefile.am

@@ -16 +16 @@
-
-noisedemo_SOURCES = noisedemo.c
- @ALSA_LIBS@
+
-
-squaredemo_SOURCES = squaredemo.c
- @ALSA_LIBS@
+
-
-sndfiledemo_SOURCES = sndfiledemo.c
- @ALSA_LIBS@
+

libremix/trunk/src/libremix/remix_monitor.c

@@ -41 +41 @@
-#include <config.h>
-
-#if (HAVE_ALSA == 1)
-#define ALSA_PCM_OLD_HW_PARAMS_API
-#include <alsa/asoundlib.h>
-#else
-typedef void snd_pcm_t;
-#endif
-
-#define __REMIX__
-#include "remix.h"
@@ -71 +64 @@
-
-static RemixBase *
-alsa_reset_device (RemixEnv * env, RemixBase * base, snd_pcm_t * alsa_dev,
-                   int channels, int samplerate);
-
-static snd_pcm_t * alsa_open_device (RemixEnv * env, RemixBase * base);
-
-static RemixCount
-alsa_write_float (RemixEnv * env, snd_pcm_t * alsa_dev, RemixPCM *data,
-                  RemixCount playcount);
-
-static void alsa_close_device (RemixMonitor * monitor);
-
-
-static RemixBase *
-remix_monitor_reset_device (RemixEnv * env, RemixBase * base)
-{
@@ -110 +90 @@
-  }
-
-  if (monitor->alsa_dev != NULL) {
-    alsa_reset_device (env, base, monitor->alsa_dev, nr_channels, monitor->frequency);
-        return base;
-  }
-
-  if (ioctl (monitor->dev_dsp_fd, SNDCTL_DSP_GETFMTS, &monitor->mask) == -1) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
@@ -172 +147 @@
-  
-  monitor->dev_dsp_fd = -1;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  }
-
@@ -217 +185 @@
-  RemixMonitor * monitor = (RemixMonitor *)base;
-  
-
-
-
+
-    close (monitor->dev_dsp_fd);
-  }
@@ -255 +221 @@
-  RemixCount n = 0;
-  fd_set fds;
-
-  if (monitor->alsa_dev != NULL) {
-    printf ("1 ######## Should not be here if using ALSA.\n");
-        return count;
-  }
-
-  if (!(monitor->format & AFMT_S16_LE)) {
@@ -298 +259 @@
-  const RemixPCM max_value = (RemixPCM)SHRT_MAX / 2;
-
-  if (monitor->alsa_dev != NULL) {
-    /* Assuming here that we have two channels. */
-    i = alsa_write_float (env, monitor->alsa_dev, data, count / 2) * 2;
-    
-    return i;
-  }
-
-  for (i = 0; i < count; i++) {
-    value = *data++ * max_value;
@@ -324 +278 @@
-  RemixPCM * d;
- 
-  if (monitor->alsa_dev != NULL) {
-    while (remaining > 0) {
-      playcount = MIN (remaining, REMIX_MONITOR_BUFFERLEN);
-      d = &chunk->data[offset];
-      n = alsa_write_float (env, monitor->alsa_dev, d, playcount);
-
-      if (n == -1) {
-        return -1;
-      }
-
-      offset += n;
-      written += n;
-      remaining -= n;      
-    }
-    return written;
-  }
-
-  if (monitor->dev_dsp_fd == -1) {
-    remix_dprintf ("[remix_monitor_chunk] no file\n");
@@ -446 +383 @@
-  return monitor;
-}
-
-#if (HAVE_ALSA == 0)
-
-static snd_pcm_t *
-alsa_open_device (RemixEnv * env, RemixBase * base)
-{       
-  env = env;
-  base = base;
-  return NULL;
-}
-
-static RemixBase *
-alsa_reset_device (RemixEnv * env, RemixBase * base, snd_pcm_t * alsa_dev, int channels, int samplerate)
-{       
-  env = env;
-  alsa_dev = alsa_dev;
-  channels = channels;
-  samplerate = samplerate;
-  return base;
-}
-
-static RemixCount
-alsa_write_float (RemixEnv * env, snd_pcm_t * alsa_dev, RemixPCM *data,
-                  RemixCount playcount)
-{
-  env = env;
-  alsa_dev = alsa_dev;
-  data = data;
-  return playcount;
-}
-
-static void
-alsa_close_device (RemixMonitor * monitor)
-{
-  monitor = monitor;
-}
-
-#else
-
-static snd_pcm_t *
-alsa_open_device (RemixEnv * env, RemixBase * base)
-{
-  snd_pcm_t *alsa_device = NULL;
-  char  *device_name = "default";
-  int   error;
-  
-  if ((error = snd_pcm_open (&alsa_device, device_name, SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
-    return NULL;
-  }
-
-  return alsa_device;  
-}
-
-static RemixBase *
-alsa_reset_device (RemixEnv * env, RemixBase * base, snd_pcm_t * alsa_dev,
-                   int channels, int samplerate)
-{
-  snd_pcm_hw_params_t *hw_params;
-  int periods;
-  int error;
-        
-  if ((error = snd_pcm_hw_params_malloc (&hw_params)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  if ((error = snd_pcm_hw_params_any (alsa_dev, hw_params)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-  
-  if ((error = snd_pcm_hw_params_set_access (alsa_dev, hw_params,
-                                             SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  if ((error = snd_pcm_hw_params_set_format (alsa_dev, hw_params,
-                                             SND_PCM_FORMAT_FLOAT)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-  
-  if ((error = snd_pcm_hw_params_set_rate_near (alsa_dev, hw_params,
-                                                samplerate, 0)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-  
-  if ((error = snd_pcm_hw_params_set_channels (alsa_dev, hw_params, channels)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  if ((error = snd_pcm_hw_params_set_period_size (alsa_dev, hw_params,
-                                                  REMIX_MONITOR_BUFFERLEN/channels, 0)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  periods = MIN (4, snd_pcm_hw_params_get_periods_max (hw_params, 0));
-  periods =
-    MAX (periods, snd_pcm_hw_params_get_periods_min (hw_params, 0));
-
-  if ((error = snd_pcm_hw_params_set_periods (alsa_dev, hw_params,
-                                              periods, 0)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  if ((error = snd_pcm_hw_params (alsa_dev, hw_params)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  snd_pcm_hw_params_free (hw_params);
-
-  if ((error = snd_pcm_prepare (alsa_dev)) < 0) {
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return RemixNone;
-  }
-
-  return base;
-}
-
-static RemixCount
-alsa_write_float (RemixEnv * env, snd_pcm_t * alsa_dev, RemixPCM *data,
-                  RemixCount playcount /* frames */)
-{
-  snd_pcm_status_t * status;
-  int err;
-
-  /*printf ("want to write %ld thingies\n", playcount);*/
-
-  if (snd_pcm_wait (alsa_dev, 1000) < 0) {
-    printf ("snd_pcm_wait error\n");
-    remix_set_error (env, REMIX_ERROR_SYSTEM);
-    return -1;
-  }
-
-  err = snd_pcm_writei (alsa_dev, data, playcount);
-
-  if (err == -EPIPE) {
-    snd_pcm_status_alloca(&status);
-    if ((err = snd_pcm_status(alsa_dev, status))<0) {
-      fprintf(stderr, "Remix: alsa_write: xrun. can't determine length\n");
-    } else {
-      if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) {
-        struct timeval now, diff, tstamp;
-        gettimeofday(&now, 0);
-        snd_pcm_status_get_trigger_tstamp(status, &tstamp);
-        timersub(&now, &tstamp, &diff);
-        fprintf(stderr, "Remix: alsa_write: xrun of at least %.3f msecs. "
-            "resetting stream\n", diff.tv_sec * 1000 + diff.tv_usec / 1000.0);
-      } else {
-        fprintf(stderr, "Remix: alsa_write: xrun. can't determine length\n");
-      }
-    }  
-    snd_pcm_prepare(alsa_dev);
-    err = snd_pcm_writei(alsa_dev, data, playcount);
-    if (err != playcount) {
-      fprintf(stderr, "Remix: alsa_write: %s\n", snd_strerror(err));
-      return 0;
-    } else if (err < 0) {
-      fprintf(stderr, "Remix: alsa_write: %s\n", snd_strerror(err));
-      return 0;
-    }
-  }
-
-  return err;
-}
-
-static void
-alsa_close_device (RemixMonitor * monitor)
-{
-  snd_pcm_close (monitor->alsa_dev);
-  monitor->alsa_dev = NULL;
-}
-#endif

libremix/trunk/src/libremix/remix_private.h

@@ -170 +170 @@
-#define REMIX_MONITOR_BUFFERLEN 2048
-
-/* Opaque type from <alsa/pcm.h> */
-#ifndef __ALSA_PCM_H
-typedef struct _snd_pcm snd_pcm_t;
-#endif
-
-struct _RemixMonitor {
-  RemixBase base;
@@ -187 +182 @@
-  int numfrags;
-  int fragsize;
-  snd_pcm_t *alsa_dev;
-};
-