github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-23 12:59:51 +02:00
Code Releases Activity

Add volume control, patch by

Browse Source 
Colin Leroy <colin at colino.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6185 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2002-05-25 11:08:53 +00:00
parent 0a581e3bf3
commit aefac09349
1 changed files with 20 additions and 4 deletions

22
libao2/ao_sdl.c

@ -16,6 +16,7 @@
#include "audio_out.h" #include "audio_out.h"
#include "audio_out_internal.h" #include "audio_out_internal.h"
#include "afmt.h" #include "afmt.h"
#include <SDL.h>
#include "../libvo/fastmemcpy.h" #include "../libvo/fastmemcpy.h"
@ -46,7 +47,7 @@ static unsigned int buf_read=0;
static unsigned int buf_write=0; static unsigned int buf_write=0;
static unsigned int buf_read_pos=0; static unsigned int buf_read_pos=0;
static unsigned int buf_write_pos=0; static unsigned int buf_write_pos=0;
static unsigned int volume=127;
static int full_buffers=0; static int full_buffers=0;
static int buffered_bytes=0; static int buffered_bytes=0;
@ -79,6 +80,7 @@ static int read_buffer(unsigned char* data,int len){
x=BUFFSIZE-buf_read_pos; x=BUFFSIZE-buf_read_pos;
if(x>len) x=len; if(x>len) x=len;
memcpy(data+len2,buffer[buf_read]+buf_read_pos,x); memcpy(data+len2,buffer[buf_read]+buf_read_pos,x);
SDL_MixAudio(data+len2, data+len2, x, volume);
len2+=x; len-=x; len2+=x; len-=x;
buffered_bytes-=x; buf_read_pos+=x; buffered_bytes-=x; buf_read_pos+=x;
if(buf_read_pos>=BUFFSIZE){ if(buf_read_pos>=BUFFSIZE){
@ -93,8 +95,6 @@ static int read_buffer(unsigned char* data,int len){
// end ring buffer stuff // end ring buffer stuff
#include <SDL.h>
#if defined(sun) && defined(__svr4__) #if defined(sun) && defined(__svr4__)
/* setenv is missing on solaris */ /* setenv is missing on solaris */
static void setenv(const char *name, const char *val, int _xx) static void setenv(const char *name, const char *val, int _xx)
@ -114,6 +114,22 @@ static void setenv(const char *name, const char *val, int _xx)
// to set/get/query special features/parameters // to set/get/query special features/parameters
static int control(int cmd,int arg){ static int control(int cmd,int arg){
switch (cmd) {
case AOCONTROL_GET_VOLUME:
{
ao_control_vol_t* vol = (ao_control_vol_t*)arg;
vol->left = vol->right = (float)((volume + 127)/2.55);
return CONTROL_OK;
}
case AOCONTROL_SET_VOLUME:
{
float diff;
ao_control_vol_t* vol = (ao_control_vol_t*)arg;
diff = (vol->left+vol->right) / 2;
volume = (int)(diff * 2.55) - 127;
return CONTROL_OK;
}
}
return -1; return -1;
} }