Changeset 5380:0504bc7766aa in roaraudio for roarclients


Ignore:
Timestamp:
01/04/12 21:36:22 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Added support for stream direction RECPLAY.

Location:
roarclients
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • roarclients/roarinterconnect.c

    r5289 r5380  
    6767#define ST_TRANSMIT 0x03 
    6868#define ST_RECEIVE  0x04 
     69#define ST_RECPLAY  0x05 
     70#define ST_RECORD   0x06 
    6971// no default here as the default depend on the server type 
    7072 
     
    102104        "  transmit           - Transmit data from local server to remote server\n" 
    103105        "  receive            - Receive data from remote server\n" 
     106        "  recplay            - Record from and play data to remote server\n" 
     107        "  record             - Record data from remote server\n" 
    104108       ); 
    105109 
     
    144148    ret -= ret & ST_MASK; 
    145149    ret += ST_RECEIVE; 
     150   } else if ( !strcmp(type, "recplay") ) { 
     151    ret -= ret & ST_MASK; 
     152    ret += ST_RECPLAY; 
     153   } else if ( !strcmp(type, "record") ) { 
     154    ret -= ret & ST_MASK; 
     155    ret += ST_RECORD; 
    146156   } else { 
    147157    return MT_NONE|ST_NONE; 
     
    174184#ifdef _HAVE_RSOUND 
    175185// RSound format helper function: 
    176 enum rsd_format para2rsdfmt (int bits, int codec) { 
     186enum rsd_format para2rsdfmt (uint32_t bits, uint32_t codec) { 
    177187 switch (codec) { 
    178188  case ROAR_CODEC_PCM_S_LE: 
     
    318328       localdir = ROAR_DIR_PLAY; 
    319329      break; 
     330     case ST_RECPLAY: 
     331       tmp      = ROAR_DIR_RECPLAY; 
     332      break; 
     333     case ST_RECORD: 
     334       tmp      = ROAR_DIR_RECORD; 
     335       localdir = ROAR_DIR_PLAY; 
     336      break; 
    320337     default: 
    321338       fprintf(stderr, "Error: unknown stream type\n"); 
     
    343360      break; 
    344361     case ST_RECEIVE: 
     362       tmp      = ROAR_DIR_MONITOR; 
     363       localdir = ROAR_DIR_PLAY; 
     364      break; 
     365     case ST_RECPLAY: 
     366       tmp      = ROAR_DIR_RECPLAY; 
     367      break; 
     368     case ST_RECORD: 
    345369       tmp      = ROAR_DIR_RECORD; 
    346370       localdir = ROAR_DIR_PLAY; 
     
    400424     case ST_TRANSMIT: 
    401425       rfh = esd_play_stream(tmp, rate, remote, CLIENT_NAME); 
     426       localdir = ROAR_DIR_MONITOR; 
    402427      break; 
    403428     case ST_RECEIVE: 
    404429       rfh = esd_monitor_stream(tmp, rate, remote, CLIENT_NAME); 
     430       localdir = ROAR_DIR_PLAY; 
    405431      break; 
    406432     default: 
  • roarclients/roarphone.c

    r5294 r5380  
    546546 } 
    547547 
    548  if ( roar_cdriver_open(&dvio, driver, device, &dinfo, ROAR_DIR_BIDIR) == -1 ) { 
     548 if ( roar_cdriver_open(&dvio, driver, device, &dinfo, ROAR_DIR_RECPLAY) == -1 ) { 
    549549  ROAR_ERR("Can not open sound card."); 
    550550  return 1; 
Note: See TracChangeset for help on using the changeset viewer.