diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /stream/audio_in.c | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'stream/audio_in.c')
| -rw-r--r-- | stream/audio_in.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stream/audio_in.c b/stream/audio_in.c index 03259614a4..2b2497a8d9 100644 --- a/stream/audio_in.c +++ b/stream/audio_in.c @@ -30,7 +30,7 @@ int audio_in_init(audio_in_t *ai, int type) ai->alsa.device = strdup("default"); return 0; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: ai->oss.audio_fd = -1; ai->oss.device = strdup("/dev/dsp"); @@ -51,7 +51,7 @@ int audio_in_setup(audio_in_t *ai) ai->setup = 1; return 0; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: if (ai_oss_init(ai) < 0) return -1; ai->setup = 1; @@ -72,7 +72,7 @@ int audio_in_set_samplerate(audio_in_t *ai, int rate) if (ai_alsa_setup(ai) < 0) return -1; return ai->samplerate; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: ai->req_samplerate = rate; if (!ai->setup) return 0; @@ -94,7 +94,7 @@ int audio_in_set_channels(audio_in_t *ai, int channels) if (ai_alsa_setup(ai) < 0) return -1; return ai->channels; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: ai->req_channels = channels; if (!ai->setup) return 0; @@ -123,7 +123,7 @@ int audio_in_set_device(audio_in_t *ai, char *device) } return 0; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: if (ai->oss.device) free(ai->oss.device); ai->oss.device = strdup(device); @@ -148,7 +148,7 @@ int audio_in_uninit(audio_in_t *ai) ai->setup = 0; return 0; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: close(ai->oss.audio_fd); ai->setup = 0; @@ -166,7 +166,7 @@ int audio_in_start_capture(audio_in_t *ai) case AUDIO_IN_ALSA: return snd_pcm_start(ai->alsa.handle); #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: return 0; #endif @@ -200,7 +200,7 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer) } return ret; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO case AUDIO_IN_OSS: ret = read(ai->oss.audio_fd, buffer, ai->blocksize); if (ret != ai->blocksize) { |