RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

par kozmetikai valtoztatas, meg van ami nem :) cvs diff.. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1048 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
al3x 2001-06-07 13:06:03 +00:00
parent f5f7b69b3a
commit a579f59963
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libao2/audio_out.c
View File

@ -5,31 +5,24 @@
#include "audio_out.h" #include "audio_out.h"
#ifdef USE_OSS_AUDIO
#include <sys/soundcard.h> /* AFMT_* */ #include <sys/soundcard.h> /* AFMT_* */
#endif
#ifndef SOUNCARD_H
#ifndef AFMT_U8
# define AFMT_MU_LAW 0x00000001 # define AFMT_MU_LAW 0x00000001
# define AFMT_A_LAW 0x00000002 # define AFMT_A_LAW 0x00000002
# define AFMT_IMA_ADPCM 0x00000004 # define AFMT_IMA_ADPCM 0x00000004
# define AFMT_U8 0x00000008 # define AFMT_U8 0x00000008
# define AFMT_S16_LE 0x00000010 /* Little endian signed # define AFMT_S16_LE 0x00000010 /* Little endian signed 16*/
16*/ # define AFMT_S16_BE 0x00000020 /* Big endian signed 16 */
# define AFMT_S16_BE 0x00000020 /* Big endian signed 16
*/
# define AFMT_S8 0x00000040 # define AFMT_S8 0x00000040
# define AFMT_U16_LE 0x00000080 /* Little endian U16 */ # define AFMT_U16_LE 0x00000080 /* Little endian U16 */
# define AFMT_U16_BE 0x00000100 /* Big endian U16 */ # define AFMT_U16_BE 0x00000100 /* Big endian U16 */
# define AFMT_MPEG 0x00000200 /* MPEG (2) audio */ # define AFMT_MPEG 0x00000200 /* MPEG (2) audio */
/* 32 bit formats (MSB aligned) formats */ /* 32 bit formats (MSB aligned) formats */
# define AFMT_S32_LE 0x00001000 # define AFMT_S32_LE 0x00001000
# define AFMT_S32_BE 0x00002000 # define AFMT_S32_BE 0x00002000
#endif #endif
// there are some globals: // there are some globals:
int ao_samplerate=0; int ao_samplerate=0;
int ao_channels=0; int ao_channels=0;
@ -46,14 +39,12 @@ extern ao_functions_t audio_out_null;
#ifdef HAVE_ALSA5 #ifdef HAVE_ALSA5
extern ao_functions_t audio_out_alsa5; extern ao_functions_t audio_out_alsa5;
#endif #endif
/*
#ifdef HAVE_ALSA9 #ifdef HAVE_ALSA9
extern ao_functions_t audio_out_alsa9; extern ao_functions_t audio_out_alsa9;
#endif #endif
#ifdef HAVE_ESD #ifdef HAVE_ESD
extern ao_functions_t audio_out_esd; extern ao_functions_t audio_out_esd;
#endif #endif
*/
#ifdef HAVE_SDL #ifdef HAVE_SDL
extern ao_functions_t audio_out_sdl; extern ao_functions_t audio_out_sdl;
#endif #endif
@ -70,14 +61,12 @@ ao_functions_t* audio_out_drivers[] =
#ifdef HAVE_ALSA5 #ifdef HAVE_ALSA5
&audio_out_alsa5, &audio_out_alsa5,
#endif #endif
/*
#ifdef HAVE_ALSA9 #ifdef HAVE_ALSA9
&audio_out_alsa9, &audio_out_alsa9,
#endif #endif
#ifdef HAVE_ESD #ifdef HAVE_ESD
&audio_out_esd, &audio_out_esd,
#endif #endif
*/
#ifdef HAVE_SDL #ifdef HAVE_SDL
&audio_out_sdl, &audio_out_sdl,
#endif #endif
@ -91,18 +80,29 @@ char *audio_out_format_name(int format)
{ {
switch (format) switch (format)
{ {
/*
case AFMT_MU_LAW:
case AFMT_A_LAW:
case AFMT_IMA_ADPCM:
*/
case AFMT_S8: case AFMT_S8:
return("signed 8-bit"); return("Signed 8-bit");
case AFMT_U8: case AFMT_U8:
return("unsigned 8-bit"); return("Unsigned 8-bit");
case AFMT_U16_LE: case AFMT_U16_LE:
return("unsigned 16-bit (little-endian)"); return("Unsigned 16-bit (Little-Endian)");
case AFMT_U16_BE: case AFMT_U16_BE:
return("unsigned 16-bit (big-endian)"); return("Unsigned 16-bit (Big-Endian)");
case AFMT_S16_LE: case AFMT_S16_LE:
return("signed 16-bit (little-endian)"); return("Signed 16-bit (Little-Endian)");
case AFMT_S16_BE: case AFMT_S16_BE:
return("unsigned 16-bit (big-endian)"); return("Unsigned 16-bit (Big-Endian)");
case AFMT_MPEG:
return("MPEG (2) audio");
case AFMT_S32_LE:
return("Signed 32-bit (Little-Endian");
case AFMT_S32_BE:
return("Signed 32-bit (Big-Endian");
} }
return("unknown"); return("Unknown");
} }