Changeset 3738:791afc7d0aa4 in roaraudio

Timestamp:

04/26/10 14:56:48 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cleanup, use control connection

File:

• plugins/alsa/pcm.c (modified) (3 diffs)

plugins/alsa/pcm.c

@@ -48 +48 @@
   return 0;
 
- if ( roar_vio_simple_stream( &(self->stream_vio), self->info.rate,
-                        self->info.channels, self->info.bits, self->info.codec,
-                        NULL, ROAR_DIR_PLAY, "ALSA plugin" ) == -1 ) {
+ if ( roar_vio_simple_new_stream_obj(&(self->stream_vio), &(self->roar.con), &(self->stream),
+                                     self->info.rate, self->info.channels, self->info.bits, self->info.codec,
+                                     io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_DIR_PLAY : ROAR_DIR_MONITOR
+                                    ) == -1 ) {
   return -EINVAL;
  }
@@ -138 +139 @@
 }
 
-static int roar_pcm_dummy (snd_pcm_ioplug_t * io) {
- ROAR_DBG("roar_pcm_dummy(*) = 0");
- return 0;
-}
-
 
 ///////////////////////////////
@@ -208 +204 @@
 
 static int roar_pcm_prepare(snd_pcm_ioplug_t *io) {
- struct roar_alsa_pcm * self = io->private_data;
-
  ROAR_DBG("roar_pcm_prepare(*) = ?");
 
  return roar_pcm_start(io);
-
-#if 0
- if ( self->stream_opened ) {
-  roar_vio_close(&(self->stream_vio));
-  self->stream_opened = 0;
- }
-
- if ( roar_vio_simple_new_stream_obj(&(self->stream_vio), &(self->roar.con), &(self->stream),
-                                     self->info.rate, self->info.channels, self->info.bits, self->info.codec,
-                                     io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_DIR_PLAY : ROAR_DIR_MONITOR
-                                    ) == -1 ) {
-  return -EINVAL;
- }
-
- self->stream_opened = 1;
-
- ROAR_DBG("roar_pcm_prepare(*) = 0");
- return 0;
-#endif
 }