Changeset 2740


Ignore:
Timestamp:
Jun 3, 2009 12:29:35 PM (15 years ago)
Author:
bennylp
Message:

Ticket #853: ./configure with --disable-sound argument does not work

  • when --disable-sound is specified, no sound factory will be created
  • modified audiodev.c to not return error when there's no device found
  • compilation error in pa_dev.c when it's disabled and include path is not set
Location:
pjproject/trunk/pjmedia
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r2601 r2740  
    103103# 
    104104ifeq ($(AC_PJMEDIA_SND),null) 
    105 # ***** Error ****** 
    106 # This will not work either with the new Audiodev 
    107 export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND 
     105export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 
    108106endif 
    109107 
  • pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

    r2570 r2740  
    345345{ 
    346346    unsigned i; 
    347     pj_status_t status = PJ_ENOMEM; 
     347    pj_status_t status = PJ_SUCCESS; 
    348348 
    349349    /* Allow init() to be called multiple times as long as there is matching 
  • pjproject/trunk/pjmedia/src/pjmedia-audiodev/pa_dev.c

    r2506 r2740  
    2323#include <pj/os.h> 
    2424#include <pj/string.h> 
     25 
     26#if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 
     27 
    2528#include <portaudio.h> 
    26  
    27 #if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 
    28  
    2929 
    3030#define THIS_FILE       "pa_dev.c" 
Note: See TracChangeset for help on using the changeset viewer.