[Mplayer-cvslog] CVS: main/libao2 ao_jack.c, NONE, 1.1 Makefile, 1.29, 1.30 audio_out.c, 1.37, 1.38
Alex Beregszaszi
syncmail at mplayerhq.hu
Fri Jun 25 20:11:16 CEST 2004
CVS change done by Alex Beregszaszi
Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv13650/libao2
Modified Files:
Makefile audio_out.c
Added Files:
ao_jack.c
Log Message:
Kamil Strzelecki <esack at o2.pl>
--- NEW FILE ---
/*
* ao_jack - JACK audio output driver for MPlayer
*
* Kamil Strzelecki < esack at browarek.net >
*
* This driver is distribuited under terms of GPL
*
* It uses bio2jack (http://bio2jack.sf.net/).
*
*/
#include <stdio.h>
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../config.h"
#include "../mp_msg.h"
//#include "bio2jack.h"
static int driver = 0;
//bio2jack stuff:
#define ERR_SUCCESS 0
#define ERR_OPENING_JACK 1
#define ERR_RATE_MISMATCH 2
#define ERR_BYTES_PER_FRAME_INVALID 3
enum status_enum { PLAYING, PAUSED, STOPPED, CLOSED, RESET };
void JACK_Init(void);
int JACK_Open(int* deviceID, unsigned int bits_per_sample, unsigned long *rate, int channels);
int JACK_Close(int deviceID); /* return 0 for success */
void JACK_Reset(int deviceID); /* free all buffered data and reset several values in the device */
long JACK_Write(int deviceID, char *data, unsigned long bytes); /* returns the number of bytes written */
long JACK_GetJackLatency(int deviceID); /* return the latency in milliseconds of jack */
int JACK_SetState(int deviceID, enum status_enum state); /* playing, paused, stopped */
int JACK_SetVolume(int deviceID, int left, int right); /* returns 0 on success */
void JACK_GetVolume(int deviceID, int *left, int *right);
//
static ao_info_t info =
{
"JACK audio output",
"jack",
"Kamil Strzelecki <esack at browarek.net>",
""
};
LIBAO_EXTERN(jack)
static int control(int cmd, void *arg)
{
switch(cmd) {
case AOCONTROL_GET_VOLUME:
{
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
int *l, *r;
JACK_GetVolume(driver, l, r);
vol->left = (float )*l;
vol->right = (float )*r;
return CONTROL_OK;
}
case AOCONTROL_SET_VOLUME:
{
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
int l = (int )vol->left,
r = (int )vol->right,
err = 0;
if((err = JACK_SetVolume(driver, l, r))) {
mp_msg(MSGT_AO, MSGL_ERR,
"AO: [Jack] Setting volume failed, error %d\n",err);
return CONTROL_ERROR;
}
return CONTROL_OK;
}
}
return(CONTROL_UNKNOWN);
}
static int init(int rate_hz, int channels, int format, int flags)
{
int err, m, frag_spec;
unsigned long rate;
unsigned int bits_per_sample;
mp_msg(MSGT_AO, MSGL_INFO, "AO: [Jack] Initialising library.\n");
JACK_Init();
switch (format) {
case AFMT_U8:
case AFMT_S8:
format = AFMT_U8;
bits_per_sample = 8;
m = 1;
break;
default:
format = AFMT_S16_LE;
bits_per_sample = 16;
m = 2;
break;
}
rate = rate_hz;
err = JACK_Open(&driver, bits_per_sample, &rate, channels);
/* if sample rates doesn't match try to open device with jack's rate and
* let mplayer convert it (rate now contains that which jackd use) */
if(err == ERR_RATE_MISMATCH) {
mp_msg(MSGT_AO, MSGL_INFO,
"AO: [Jack] Sample rate mismatch, trying to resample.\n");
err = JACK_Open(&driver, bits_per_sample, &rate, channels);
}
/* any other error */
if(err != ERR_SUCCESS) {
mp_msg(MSGT_AO, MSGL_ERR,
"AO: [Jack] JACK_Open() failed, error %d\n", err);
return 0;
}
ao_data.format = format;
ao_data.channels = channels;
ao_data.samplerate = rate;
ao_data.bps = ( rate * channels * m );
mp_msg(MSGT_AO, MSGL_INFO,
"AO: [Jack] OK. I'm ready to go (%d Hz/%d channels/%d bit)\n",
ao_data.samplerate, ao_data.channels, bits_per_sample);
return 1;
}
static void uninit(int immed)
{
int errval = 0;
JACK_Reset(driver);
if((errval = JACK_Close(driver)))
mp_msg(MSGT_AO, MSGL_ERR,
"AO: [Jack] error closing device, error %d\n", errval);
}
static int play(void* data,int len,int flags)
{
return JACK_Write(driver, data, len);
}
static void audio_pause()
{
JACK_SetState(driver, PAUSED);
}
static void audio_resume()
{
JACK_SetState(driver, PLAYING);
}
static void reset()
{
JACK_Reset(driver);
}
static int get_space()
{
return JACK_GetBytesFreeSpace(driver);
}
static float get_delay()
{
return (float )JACK_GetJackLatency(driver);
}
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile 24 Jun 2004 12:52:15 -0000 1.29
+++ Makefile 25 Jun 2004 18:11:13 -0000 1.30
@@ -6,7 +6,7 @@
OBJS=$(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC)
+CFLAGS = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(JACK_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC)
.SUFFIXES: .c .o
Index: audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- audio_out.c 25 Jun 2004 14:52:04 -0000 1.37
+++ audio_out.c 25 Jun 2004 18:11:13 -0000 1.38
@@ -22,6 +22,9 @@
#ifdef USE_ESD
extern ao_functions_t audio_out_esd;
#endif
+#ifdef USE_JACK
+extern ao_functions_t audio_out_jack;
+#endif
extern ao_functions_t audio_out_null;
#ifdef HAVE_ALSA5
extern ao_functions_t audio_out_alsa5;
@@ -94,6 +97,9 @@
#ifdef USE_ESD
&audio_out_esd,
#endif
+#ifdef USE_JACK
+ &audio_out_jack,
+#endif
#ifdef HAVE_NAS
&audio_out_nas,
#endif
More information about the MPlayer-cvslog
mailing list