Changeset 5156:9655b6a73884 in roaraudio


Ignore:
Timestamp:
10/16/11 09:03:13 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

sync to maister's version

Location:
plugins
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • plugins/alsa/pcm_roar.c

    r4708 r5156  
    3535 */ 
    3636 
     37//#define DEBUG 
    3738#include "roar.h" 
    3839 
     
    4445static int roar_pcm_start (snd_pcm_ioplug_t * io) { 
    4546 struct roar_alsa_pcm * self = io->private_data; 
     47 int fh; 
    4648 
    4749 ROAR_DBG("roar_pcm_start(*) = ?"); 
     
    5860 } 
    5961 
    60  int fh; 
    6162 if ( roar_vio_ctl(&(self->stream_vio),  
    6263    io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_VIO_CTL_GET_SELECT_WRITE_FH : 
     
    486487SND_PCM_PLUGIN_SYMBOL(roar); 
    487488 
     489#ifdef __TESTCODE_PH3__ 
    488490int __snd_pcm_roar_open_dlsym_pcm_001 (void) { 
    489491 ROAR_DBG("__snd_pcm_roar_open_dlsym_pcm_001(void) = 0"); 
    490492 return 0; 
    491493} 
     494#endif 
    492495 
    493496//ll 
  • plugins/alsa/roar.h

    r4708 r5156  
    6464 char*                  buffer; 
    6565 size_t                 bufsize; 
    66  volatile size_t                 bufptr; 
     66 volatile size_t        bufptr; 
    6767 pthread_t              thread; 
    6868 pthread_mutex_t        lock; 
  • plugins/alsa/thread.c

    r4708 r5156  
    3535 */ 
    3636 
     37//#define DEBUG 
    3738 
    3839#include "roar.h" 
    39 #define CHUNK_SIZE 256 
     40#define CHUNK_SIZE 2048 
     41//#define CHUNK_SIZE 256 
    4042 
    4143 
     
    133135   self->bufptr -= rc; 
    134136   pthread_mutex_unlock(&(self->lock)); 
     137   ROAR_DBG("roar_thread(*): Wrote data to vio. New bufptr: %i", (int)self->bufptr); 
    135138 
    136139   /* Buffer has decreased, signal fill_buffer() */ 
  • plugins/alsavs/pcm_roar.c

    r4708 r5156  
    3535 */ 
    3636 
     37//#define DEBUG 
    3738#include "roar.h" 
    3839 
     
    4445static int roar_pcm_start (snd_pcm_ioplug_t * io) { 
    4546 struct roar_alsa_pcm * self = io->private_data; 
     47 int fh; 
    4648 
    4749 ROAR_DBG("roar_pcm_start(*) = ?"); 
     
    5860 } 
    5961 
    60  int fh; 
    6162 if ( roar_vio_ctl(&(self->stream_vio),  
    6263    io->stream == SND_PCM_STREAM_PLAYBACK ? ROAR_VIO_CTL_GET_SELECT_WRITE_FH : 
     
    486487SND_PCM_PLUGIN_SYMBOL(roar); 
    487488 
     489#ifdef __TESTCODE_PH3__ 
    488490int __snd_pcm_roar_open_dlsym_pcm_001 (void) { 
    489491 ROAR_DBG("__snd_pcm_roar_open_dlsym_pcm_001(void) = 0"); 
    490492 return 0; 
    491493} 
     494#endif 
    492495 
    493496//ll 
  • plugins/alsavs/roar.h

    r4708 r5156  
    6464 char*                  buffer; 
    6565 size_t                 bufsize; 
    66  volatile size_t                 bufptr; 
     66 volatile size_t        bufptr; 
    6767 pthread_t              thread; 
    6868 pthread_mutex_t        lock; 
  • plugins/alsavs/thread.c

    r4708 r5156  
    3535 */ 
    3636 
     37//#define DEBUG 
    3738 
    3839#include "roar.h" 
    39 #define CHUNK_SIZE 256 
     40#define CHUNK_SIZE 2048 
     41//#define CHUNK_SIZE 256 
    4042 
    4143 
     
    133135   self->bufptr -= rc; 
    134136   pthread_mutex_unlock(&(self->lock)); 
     137   ROAR_DBG("roar_thread(*): Wrote data to vio. New bufptr: %i", (int)self->bufptr); 
    135138 
    136139   /* Buffer has decreased, signal fill_buffer() */ 
Note: See TracChangeset for help on using the changeset viewer.