2004-02-24 00:41:20 +01:00
|
|
|
/* the Music Player Daemon (MPD)
|
2006-07-14 21:37:45 +02:00
|
|
|
* (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
|
2004-02-24 00:41:20 +01:00
|
|
|
* This project's homepage is: http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "audio.h"
|
2004-10-20 18:48:22 +02:00
|
|
|
#include "audioOutput.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
#include "conf.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "sig_handlers.h"
|
2004-11-02 22:06:44 +01:00
|
|
|
#include "command.h"
|
2004-11-02 22:48:53 +01:00
|
|
|
#include "playerData.h"
|
2005-08-23 14:01:37 +02:00
|
|
|
#include "utils.h"
|
2006-05-08 10:14:37 +02:00
|
|
|
#include "playlist.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-10-20 18:48:22 +02:00
|
|
|
#include <stdlib.h>
|
2004-02-24 00:41:20 +01:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <signal.h>
|
2005-08-23 14:01:37 +02:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
#define AUDIO_DEVICE_STATE "audio_device_state:"
|
|
|
|
#define AUDIO_DEVICE_STATE_LEN 19 /* strlen(AUDIO_DEVICE_STATE) */
|
2005-08-23 14:01:37 +02:00
|
|
|
#define AUDIO_BUFFER_SIZE 2*MAXPATHLEN
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-05-10 04:20:15 +02:00
|
|
|
static AudioFormat audio_format;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-05-10 04:20:15 +02:00
|
|
|
static AudioFormat * audio_configFormat = NULL;
|
|
|
|
|
2004-11-02 22:06:44 +01:00
|
|
|
static AudioOutput ** audioOutputArray = NULL;
|
|
|
|
static mpd_uint8 audioOutputArraySize = 0;
|
|
|
|
/* the audioEnabledArray should be stuck into shared memory, and then disable
|
|
|
|
and enable in playAudio() routine */
|
2004-11-02 22:48:53 +01:00
|
|
|
static mpd_sint8 * pdAudioDevicesEnabled = NULL;
|
|
|
|
static mpd_sint8 myAudioDevicesEnabled[AUDIO_MAX_DEVICES];
|
2004-11-02 22:06:44 +01:00
|
|
|
|
|
|
|
static mpd_uint8 audioOpened = 0;
|
|
|
|
|
2004-11-09 01:13:42 +01:00
|
|
|
static mpd_sint32 audioBufferSize = 0;
|
|
|
|
static char * audioBuffer = NULL;
|
|
|
|
static mpd_sint32 audioBufferPos = 0;
|
|
|
|
|
2004-10-25 22:09:03 +02:00
|
|
|
void copyAudioFormat(AudioFormat * dest, AudioFormat * src) {
|
2004-10-22 18:16:39 +02:00
|
|
|
if(!src) return;
|
|
|
|
|
2004-11-02 18:05:27 +01:00
|
|
|
memcpy(dest, src, sizeof(AudioFormat));
|
|
|
|
}
|
|
|
|
|
2006-04-05 11:54:43 +02:00
|
|
|
int cmpAudioFormat(AudioFormat * f1, AudioFormat * f2)
|
|
|
|
{
|
|
|
|
if (f1 && f2 && (f1->sampleRate == f2->sampleRate) &&
|
|
|
|
(f1->bits == f2->bits) &&
|
|
|
|
(f1->channels == f2->channels))
|
|
|
|
return 0;
|
|
|
|
return 1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
2005-03-05 06:22:30 +01:00
|
|
|
extern AudioOutputPlugin alsaPlugin;
|
2004-10-20 18:48:22 +02:00
|
|
|
extern AudioOutputPlugin aoPlugin;
|
2004-11-02 03:03:00 +01:00
|
|
|
extern AudioOutputPlugin ossPlugin;
|
2005-03-13 20:23:09 +01:00
|
|
|
extern AudioOutputPlugin osxPlugin;
|
2006-07-13 21:03:49 +02:00
|
|
|
extern AudioOutputPlugin pulsePlugin;
|
2005-08-11 14:34:38 +02:00
|
|
|
extern AudioOutputPlugin mvpPlugin;
|
2005-03-05 06:22:30 +01:00
|
|
|
extern AudioOutputPlugin shoutPlugin;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void loadAudioDrivers(void) {
|
2004-10-20 18:48:22 +02:00
|
|
|
initAudioOutputPlugins();
|
2005-03-05 06:22:30 +01:00
|
|
|
loadAudioOutputPlugin(&alsaPlugin);
|
2004-10-20 18:48:22 +02:00
|
|
|
loadAudioOutputPlugin(&aoPlugin);
|
2004-11-02 03:03:00 +01:00
|
|
|
loadAudioOutputPlugin(&ossPlugin);
|
2005-03-13 20:23:09 +01:00
|
|
|
loadAudioOutputPlugin(&osxPlugin);
|
2006-07-13 21:03:49 +02:00
|
|
|
loadAudioOutputPlugin(&pulsePlugin);
|
2005-08-11 14:34:38 +02:00
|
|
|
loadAudioOutputPlugin(&mvpPlugin);
|
2005-03-05 06:22:30 +01:00
|
|
|
loadAudioOutputPlugin(&shoutPlugin);
|
2006-07-16 16:57:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* make sure initPlayerData is called before this function!! */
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void initAudioDriver(void) {
|
2006-07-16 16:57:26 +02:00
|
|
|
ConfigParam * param = NULL;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
loadAudioDrivers();
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-11-02 22:48:53 +01:00
|
|
|
pdAudioDevicesEnabled = (getPlayerData())->audioDeviceEnabled;
|
|
|
|
|
|
|
|
for(i = 0; i < AUDIO_MAX_DEVICES; i++) {
|
|
|
|
pdAudioDevicesEnabled[i] = 1;
|
|
|
|
myAudioDevicesEnabled[i] = 1;
|
|
|
|
}
|
|
|
|
|
2005-03-12 04:10:09 +01:00
|
|
|
param = getNextConfigParam(CONF_AUDIO_OUTPUT, param);
|
|
|
|
|
|
|
|
do {
|
2006-03-18 04:58:31 +01:00
|
|
|
AudioOutput *output;
|
|
|
|
int j;
|
|
|
|
|
2004-11-02 22:48:53 +01:00
|
|
|
if(audioOutputArraySize == AUDIO_MAX_DEVICES) {
|
2004-11-02 22:06:44 +01:00
|
|
|
ERROR("only up to 255 audio output devices are "
|
|
|
|
"supported");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
i = audioOutputArraySize++;
|
|
|
|
|
|
|
|
audioOutputArray = realloc(audioOutputArray,
|
|
|
|
audioOutputArraySize*sizeof(AudioOutput *));
|
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
output = newAudioOutput(param);
|
|
|
|
if(!output && param) {
|
2004-10-28 07:14:55 +02:00
|
|
|
ERROR("problems configuring output device defined at "
|
|
|
|
"line %i\n", param->line);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2006-03-18 04:58:31 +01:00
|
|
|
|
|
|
|
/* require output names to be unique: */
|
|
|
|
for (j = i - 1; j >= 0; --j) {
|
|
|
|
if ( !strcmp( output->name,
|
|
|
|
audioOutputArray[j]->name) ) {
|
|
|
|
ERROR("output devices with identical "
|
|
|
|
"names: %s\n",
|
|
|
|
output->name);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
audioOutputArray[i] = output;
|
2005-03-12 04:10:09 +01:00
|
|
|
} while((param = getNextConfigParam(CONF_AUDIO_OUTPUT, param)));
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 04:20:15 +02:00
|
|
|
void getOutputAudioFormat(AudioFormat * inAudioFormat,
|
|
|
|
AudioFormat * outAudioFormat)
|
|
|
|
{
|
|
|
|
if(audio_configFormat) {
|
|
|
|
copyAudioFormat(outAudioFormat,audio_configFormat);
|
|
|
|
}
|
|
|
|
else copyAudioFormat(outAudioFormat,inAudioFormat);
|
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void initAudioConfig(void) {
|
2004-10-28 07:14:55 +02:00
|
|
|
ConfigParam * param = getConfigParam(CONF_AUDIO_OUTPUT_FORMAT);
|
2004-05-10 04:20:15 +02:00
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
if(NULL == param || NULL == param->value) return;
|
2004-05-10 04:20:15 +02:00
|
|
|
|
|
|
|
audio_configFormat = malloc(sizeof(AudioFormat));
|
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
if(0 != parseAudioConfig(audio_configFormat, param->value)) {
|
|
|
|
ERROR("error parsing \"%s\" at line %i\n",
|
|
|
|
CONF_AUDIO_OUTPUT_FORMAT, param->line);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2004-10-23 03:04:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int parseAudioConfig(AudioFormat * audioFormat, char * conf) {
|
|
|
|
char * test;
|
|
|
|
|
|
|
|
memset(audioFormat,0,sizeof(AudioFormat));
|
2004-05-10 04:20:15 +02:00
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
audioFormat->sampleRate = strtol(conf,&test,10);
|
2004-05-10 04:20:15 +02:00
|
|
|
|
|
|
|
if(*test!=':') {
|
|
|
|
ERROR("error parsing audio output format: %s\n",conf);
|
2004-10-23 03:04:58 +02:00
|
|
|
return -1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
/*switch(audioFormat->sampleRate) {
|
2004-05-10 04:20:15 +02:00
|
|
|
case 48000:
|
|
|
|
case 44100:
|
2004-05-11 00:31:23 +02:00
|
|
|
case 32000:
|
|
|
|
case 16000:
|
2004-05-10 04:20:15 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ERROR("sample rate %i can not be used for audio output\n",
|
2004-10-23 03:04:58 +02:00
|
|
|
(int)audioFormat->sampleRate);
|
|
|
|
return -1
|
2004-05-25 00:29:04 +02:00
|
|
|
}*/
|
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
if(audioFormat->sampleRate <= 0) {
|
2004-05-25 00:29:04 +02:00
|
|
|
ERROR("sample rate %i is not >= 0\n",
|
2004-10-23 03:04:58 +02:00
|
|
|
(int)audioFormat->sampleRate);
|
|
|
|
return -1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
audioFormat->bits = strtol(test+1,&test,10);
|
2004-05-10 04:20:15 +02:00
|
|
|
|
|
|
|
if(*test!=':') {
|
|
|
|
ERROR("error parsing audio output format: %s\n",conf);
|
2004-10-23 03:04:58 +02:00
|
|
|
return -1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
switch(audioFormat->bits) {
|
2004-05-10 04:20:15 +02:00
|
|
|
case 16:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ERROR("bits %i can not be used for audio output\n",
|
2004-10-23 03:04:58 +02:00
|
|
|
(int)audioFormat->bits);
|
|
|
|
return -1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
audioFormat->channels = strtol(test+1,&test,10);
|
2004-05-10 04:20:15 +02:00
|
|
|
|
|
|
|
if(*test!='\0') {
|
|
|
|
ERROR("error parsing audio output format: %s\n",conf);
|
2004-10-23 03:04:58 +02:00
|
|
|
return -1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
2004-10-23 03:04:58 +02:00
|
|
|
switch(audioFormat->channels) {
|
|
|
|
case 1:
|
2004-05-10 04:20:15 +02:00
|
|
|
case 2:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ERROR("channels %i can not be used for audio output\n",
|
2004-10-23 03:04:58 +02:00
|
|
|
(int)audioFormat->channels);
|
|
|
|
return -1;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
2004-10-23 03:04:58 +02:00
|
|
|
|
|
|
|
return 0;
|
2004-05-10 04:20:15 +02:00
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void finishAudioConfig(void) {
|
2004-05-10 04:20:15 +02:00
|
|
|
if(audio_configFormat) free(audio_configFormat);
|
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void finishAudioDriver(void) {
|
2004-10-28 07:14:55 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
finishAudioOutput(audioOutputArray[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(audioOutputArray);
|
|
|
|
audioOutputArray = NULL;
|
2004-11-03 00:08:00 +01:00
|
|
|
audioOutputArraySize = 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int isCurrentAudioFormat(AudioFormat * audioFormat) {
|
2004-10-28 07:22:22 +02:00
|
|
|
if(!audioFormat) return 1;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-11-02 18:05:27 +01:00
|
|
|
if(cmpAudioFormat(audioFormat, &audio_format) != 0) return 0;
|
2004-10-20 19:11:04 +02:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-07-15 15:42:57 +02:00
|
|
|
static void syncAudioDevicesEnabledArrays(void) {
|
2004-11-02 22:48:53 +01:00
|
|
|
int i;
|
|
|
|
|
|
|
|
memcpy(myAudioDevicesEnabled, pdAudioDevicesEnabled,AUDIO_MAX_DEVICES);
|
|
|
|
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
if(myAudioDevicesEnabled[i]) {
|
|
|
|
openAudioOutput(audioOutputArray[i], &audio_format);
|
|
|
|
}
|
2005-03-05 15:01:13 +01:00
|
|
|
else {
|
|
|
|
dropBufferedAudioOutput(audioOutputArray[i]);
|
|
|
|
closeAudioOutput(audioOutputArray[i]);
|
|
|
|
}
|
2004-11-02 22:48:53 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
static int flushAudioBuffer(void) {
|
2004-11-09 01:13:42 +01:00
|
|
|
int ret = -1;
|
2006-07-16 18:52:29 +02:00
|
|
|
int i, err;
|
2004-11-09 01:13:42 +01:00
|
|
|
|
|
|
|
if(audioBufferPos == 0) return 0;
|
|
|
|
|
|
|
|
if(0 != memcmp(pdAudioDevicesEnabled, myAudioDevicesEnabled,
|
|
|
|
AUDIO_MAX_DEVICES))
|
|
|
|
{
|
|
|
|
syncAudioDevicesEnabledArrays();
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
if(!myAudioDevicesEnabled[i]) continue;
|
2006-07-16 18:52:29 +02:00
|
|
|
err = playAudioOutput(audioOutputArray[i], audioBuffer,
|
|
|
|
audioBufferPos);
|
|
|
|
if (!err)
|
2004-11-09 01:13:42 +01:00
|
|
|
ret = 0;
|
2006-07-16 18:52:29 +02:00
|
|
|
else if (err < 0)
|
|
|
|
/* device should already be closed if the play func
|
|
|
|
* returned an error */
|
|
|
|
myAudioDevicesEnabled[i] = 0;
|
2004-11-09 01:13:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
audioBufferPos = 0;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2004-05-10 04:20:15 +02:00
|
|
|
int openAudioDevice(AudioFormat * audioFormat) {
|
2004-10-28 07:14:55 +02:00
|
|
|
int isCurrentFormat = isCurrentAudioFormat(audioFormat);
|
|
|
|
int ret = -1;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if(!audioOutputArray) return -1;
|
|
|
|
|
2004-11-09 01:13:42 +01:00
|
|
|
if(!audioOpened || !isCurrentFormat) {
|
|
|
|
flushAudioBuffer();
|
2004-10-28 07:14:55 +02:00
|
|
|
copyAudioFormat(&audio_format, audioFormat);
|
2004-11-09 04:10:14 +01:00
|
|
|
audioBufferSize = (audio_format.bits >> 3)*
|
|
|
|
audio_format.channels;
|
2004-11-09 01:13:42 +01:00
|
|
|
audioBufferSize*= audio_format.sampleRate >> 5;
|
|
|
|
audioBuffer = realloc(audioBuffer, audioBufferSize);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2004-11-02 22:48:53 +01:00
|
|
|
syncAudioDevicesEnabledArrays();
|
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
2004-10-28 07:22:22 +02:00
|
|
|
if(audioOutputArray[i]->open) ret = 0;
|
2004-10-28 07:14:55 +02:00
|
|
|
}
|
|
|
|
|
2004-11-02 22:06:44 +01:00
|
|
|
if(ret == 0) audioOpened = 1;
|
|
|
|
else {
|
|
|
|
/* close all devices if there was an error */
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
closeAudioOutput(audioOutputArray[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
audioOpened = 0;
|
|
|
|
}
|
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
return ret;
|
2004-10-20 18:16:50 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-02-28 00:13:26 +01:00
|
|
|
int playAudio(char * playChunk, int size) {
|
2004-11-09 01:13:42 +01:00
|
|
|
int send;
|
|
|
|
|
|
|
|
while(size > 0) {
|
|
|
|
send = audioBufferSize-audioBufferPos;
|
|
|
|
send = send < size ? send : size;
|
2004-10-28 07:14:55 +02:00
|
|
|
|
2004-11-09 01:13:42 +01:00
|
|
|
memcpy(audioBuffer+audioBufferPos, playChunk, send);
|
|
|
|
audioBufferPos += send;
|
|
|
|
size -= send;
|
|
|
|
playChunk+= send;
|
2004-11-02 22:06:44 +01:00
|
|
|
|
2004-11-09 01:13:42 +01:00
|
|
|
if(audioBufferPos == audioBufferSize) {
|
|
|
|
if( flushAudioBuffer() < 0 ) return -1;
|
2004-10-28 07:14:55 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-09 01:13:42 +01:00
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
int isAudioDeviceOpen(void) {
|
2004-11-02 22:06:44 +01:00
|
|
|
return audioOpened;
|
2004-06-20 00:27:29 +02:00
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void dropBufferedAudio(void) {
|
2005-03-05 15:01:13 +01:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if(0 != memcmp(pdAudioDevicesEnabled, myAudioDevicesEnabled,
|
|
|
|
AUDIO_MAX_DEVICES))
|
|
|
|
{
|
|
|
|
syncAudioDevicesEnabledArrays();
|
|
|
|
}
|
|
|
|
|
|
|
|
audioBufferPos = 0;
|
|
|
|
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
if(!myAudioDevicesEnabled[i]) continue;
|
|
|
|
dropBufferedAudioOutput(audioOutputArray[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void closeAudioDevice(void) {
|
2004-10-28 07:14:55 +02:00
|
|
|
int i;
|
|
|
|
|
2004-11-09 01:13:42 +01:00
|
|
|
flushAudioBuffer();
|
|
|
|
|
|
|
|
free(audioBuffer);
|
|
|
|
audioBuffer = NULL;
|
|
|
|
audioBufferSize = 0;
|
|
|
|
|
2004-10-28 07:14:55 +02:00
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
closeAudioOutput(audioOutputArray[i]);
|
|
|
|
}
|
2004-11-02 22:06:44 +01:00
|
|
|
|
|
|
|
audioOpened = 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2004-10-25 22:09:03 +02:00
|
|
|
|
2004-10-26 04:00:17 +02:00
|
|
|
void sendMetadataToAudioDevice(MpdTag * tag) {
|
2004-10-28 07:14:55 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
|
|
|
sendMetadataToAudioOutput(audioOutputArray[i], tag);
|
|
|
|
}
|
2004-10-25 22:09:03 +02:00
|
|
|
}
|
2004-11-02 22:06:44 +01:00
|
|
|
|
|
|
|
int enableAudioDevice(FILE * fp, int device) {
|
|
|
|
if(device < 0 || device >= audioOutputArraySize) {
|
|
|
|
commandError(fp, ACK_ERROR_ARG, "audio output device id %i "
|
|
|
|
"doesn't exist\n", device);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-02 22:48:53 +01:00
|
|
|
pdAudioDevicesEnabled[device] = 1;
|
2004-11-02 22:06:44 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int disableAudioDevice(FILE * fp, int device) {
|
|
|
|
if(device < 0 || device >= audioOutputArraySize) {
|
|
|
|
commandError(fp, ACK_ERROR_ARG, "audio output device id %i "
|
|
|
|
"doesn't exist\n", device);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-02 22:48:53 +01:00
|
|
|
pdAudioDevicesEnabled[device] = 0;
|
2004-11-02 22:06:44 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2004-11-03 00:08:00 +01:00
|
|
|
|
|
|
|
void printAudioDevices(FILE * fp) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < audioOutputArraySize; i++) {
|
2004-11-15 21:18:21 +01:00
|
|
|
myfprintf(fp, "outputid: %i\n", i);
|
|
|
|
myfprintf(fp, "outputname: %s\n", audioOutputArray[i]->name);
|
|
|
|
myfprintf(fp, "outputenabled: %i\n",
|
2004-11-03 00:08:00 +01:00
|
|
|
(int)pdAudioDevicesEnabled[i]);
|
|
|
|
}
|
|
|
|
}
|
2005-08-23 14:01:37 +02:00
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void saveAudioDevicesState(void) {
|
2006-03-18 04:58:31 +01:00
|
|
|
char *stateFile;
|
|
|
|
FILE *fp;
|
|
|
|
int i;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
if (!(stateFile = getStateFile()))
|
|
|
|
return;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
while(!(fp = fopen(stateFile,"a")) && errno==EINTR);
|
|
|
|
if(!fp) {
|
|
|
|
ERROR("problems opening state file \"%s\" for "
|
|
|
|
"writing: %s\n", stateFile, strerror(errno));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(audioOutputArraySize != 0);
|
2006-05-20 21:56:29 +02:00
|
|
|
for (i = 0; i < audioOutputArraySize; i++) {
|
2006-03-18 04:58:31 +01:00
|
|
|
myfprintf(fp, AUDIO_DEVICE_STATE "%d:%s\n",
|
|
|
|
(int)pdAudioDevicesEnabled[i],
|
|
|
|
audioOutputArray[i]->name);
|
2005-08-23 14:01:37 +02:00
|
|
|
}
|
2006-03-18 04:58:31 +01:00
|
|
|
while(fclose(fp) && errno==EINTR);
|
2005-08-23 14:01:37 +02:00
|
|
|
}
|
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
static void parse_audio_device_state(FILE *fp)
|
|
|
|
{
|
|
|
|
char buffer[AUDIO_BUFFER_SIZE];
|
|
|
|
int i;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
assert(audioOutputArraySize != 0);
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
while (myFgets(buffer,AUDIO_BUFFER_SIZE,fp)) {
|
|
|
|
char *c, *name;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
if (strncmp(buffer,AUDIO_DEVICE_STATE,AUDIO_DEVICE_STATE_LEN))
|
|
|
|
continue;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
c = strchr(buffer,':');
|
|
|
|
if (!c || !(++c))
|
|
|
|
goto errline;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
name = strchr(c,':');
|
|
|
|
if (!name || !(++name))
|
|
|
|
goto errline;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
for (i = audioOutputArraySize - 1; i >= 0; --i) {
|
|
|
|
if (!strcmp(name, audioOutputArray[i]->name)) {
|
|
|
|
pdAudioDevicesEnabled[i] = atoi(c);
|
|
|
|
break;
|
2005-08-23 14:01:37 +02:00
|
|
|
}
|
|
|
|
}
|
2006-03-18 04:58:31 +01:00
|
|
|
continue;
|
|
|
|
errline:
|
|
|
|
/* nonfatal */
|
|
|
|
ERROR("invalid line in state_file: %s\n", buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
sparse: ANSI-fy function declarations
These are just warnings from sparse, but it makes the output
easier to read. I ran this through a quick perl script, but
of course verified the output by looking at the diff and making
sure the thing still compiles.
here's the quick perl script I wrote to generate this patch:
----------- 8< -----------
use Tie::File;
defined(my $pid = open my $fh, '-|') or die $!;
if (!$pid) {
open STDERR, '>&STDOUT' or die $!;
exec 'sparse', @ARGV or die $!;
}
my $na = 'warning: non-ANSI function declaration of function';
while (<$fh>) {
print STDERR $_;
if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) {
my ($f, $l, $pos, $func) = ($1, $2, $3, $4);
$l--;
tie my @x, 'Tie::File', $f or die "$!: $f";
print '-', $x[$l], "\n";
$x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/;
print '+', $x[$l], "\n";
untie @x;
}
}
git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 02:15:34 +02:00
|
|
|
void readAudioDevicesState(void) {
|
2006-03-18 04:58:31 +01:00
|
|
|
char *stateFile;
|
|
|
|
FILE *fp;
|
|
|
|
struct stat st;
|
2005-08-23 14:01:37 +02:00
|
|
|
|
2006-03-18 04:58:31 +01:00
|
|
|
if (!(stateFile = getStateFile()))
|
|
|
|
return;
|
|
|
|
if(stat(stateFile,&st)<0) {
|
|
|
|
DEBUG("failed to stat state file\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if(!S_ISREG(st.st_mode)) {
|
|
|
|
ERROR("state file \"%s\" is not a regular file\n",
|
|
|
|
stateFile);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
|
|
|
|
fp = fopen(stateFile,"r");
|
|
|
|
if(!fp) {
|
|
|
|
ERROR("problems opening state file \"%s\" for "
|
|
|
|
"reading: %s\n", stateFile,
|
|
|
|
strerror(errno));
|
|
|
|
exit(EXIT_FAILURE);
|
2005-08-23 14:01:37 +02:00
|
|
|
}
|
2006-03-18 04:58:31 +01:00
|
|
|
parse_audio_device_state(fp);
|
|
|
|
fclose(fp);
|
2005-08-23 14:01:37 +02:00
|
|
|
}
|
|
|
|
|