Mercurial > mplayer.hg
changeset 27706:8dec0335f75b
Replace numeric constants by their defines.
Fixes icc warning #188: enumerated type mixed with another type
| author | cehoyos |
|---|---|
| date | Thu, 09 Oct 2008 17:08:47 +0000 |
| parents | ad1d056da559 |
| children | e13f4e8ea77e |
| files | libao2/ao_alsa.c libvo/vo_sdl.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_alsa.c Thu Oct 09 11:13:14 2008 +0000 +++ b/libao2/ao_alsa.c Thu Oct 09 17:08:47 2008 +0000 @@ -192,7 +192,7 @@ set_vol = vol->left / f_multi + pmin + 0.5; //setting channels - if ((err = snd_mixer_selem_set_playback_volume(elem, 0, set_vol)) < 0) { + if ((err = snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, set_vol)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_ErrorSettingLeftChannel, snd_strerror(err)); return CONTROL_ERROR; @@ -201,7 +201,7 @@ set_vol = vol->right / f_multi + pmin + 0.5; - if ((err = snd_mixer_selem_set_playback_volume(elem, 1, set_vol)) < 0) { + if ((err = snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, set_vol)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_ErrorSettingRightChannel, snd_strerror(err)); return CONTROL_ERROR; @@ -221,9 +221,9 @@ } } else { - snd_mixer_selem_get_playback_volume(elem, 0, &get_vol); + snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, &get_vol); vol->left = (get_vol - pmin) * f_multi; - snd_mixer_selem_get_playback_volume(elem, 1, &get_vol); + snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, &get_vol); vol->right = (get_vol - pmin) * f_multi; mp_msg(MSGT_AO,MSGL_DBG2,"left=%f, right=%f\n",vol->left,vol->right);
--- a/libvo/vo_sdl.c Thu Oct 09 11:13:14 2008 +0000 +++ b/libvo/vo_sdl.c Thu Oct 09 17:08:47 2008 +0000 @@ -1120,7 +1120,7 @@ { struct sdl_priv_s *priv = &sdl_priv; SDL_Event event; - SDLKey keypressed = 0; + SDLKey keypressed = SDLK_UNKNOWN; /* Poll the waiting SDL Events */ while ( SDL_PollEvent(&event) ) {