oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity
1,832 Commits 1 Branch 144 Tags 56 MiB
b4ea6e52b2
Commit Graph

96 Commits

Author SHA1 Message Date
Eric Wong
a25acbc94f rewrite statefile code for audio devices 
In the words of the original author, it was 'crappy'.  I tend to
agree :)

The code has also been broken for at least the past few months,
and nobody bothered fixing it

The previous format it was overly complex: 5 lines to describe
each device.  The new format is one-line per-device:

audio_device_state:%d:%s

%d - 0 for disabled, any integer for enabled
%s - name of the device as specified in the config file,
whitespace and all

Incompatibilities:

* Output names are now _required_ to be unique.

This is required because the new format relies solely on the
name of the audio device.

Relying on the device IDs internal to MPD was a bad idea
anyways since the user usually has none or very little idea
how they're generated, and adding a new device or removing
one from a config would throw things off completely.

This is also just a Good Idea(TM) because it makes things
less confusing to users when they see it in their clients.

* Output states are not preserved from the previous format.

Not a big deal, since the previous code was never officially
released.  Also, it's been broken for months now, so I doubt
anybody would notice :)

git-svn-id: https://svn.musicpd.org/mpd/trunk@3928 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2006-03-18 03:58:31 +00:00
Qball Cow
2aba0437a6 Saving state of output-device in state-file. (This is a temporary solution, rewrite of state-file is planned for 0.13) 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3449 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2005-08-23 12:01:37 +00:00
Warren Dukes
dee9ab5ecd patch from Oliver Logghe for Hauppage Media MVP support 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3432 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2005-08-11 12:34:38 +00:00
Warren Dukes
8936789631 add OS X configure stuff and added a skeleton audioOutput plugin for OS X 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3074 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2005-03-13 19:23:09 +00:00
Warren Dukes
8583a3bc4e if no audioOutput specified, we no attempt to detect if there exists a usable oss or alsa device 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3057 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2005-03-12 03:10:09 +00:00
Warren Dukes
92653f8474 implemented dropping of current buffered audio, works for oss, but there seems 
to be a "blip" for alsa devices, needs more work

git-svn-id: https://svn.musicpd.org/mpd/trunk@3011 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2005-03-05 14:01:13 +00:00
Warren Dukes
d1a4bb382f implemented alsa audioOutput plugin, now it needs testing 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3008 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2005-03-05 05:22:30 +00:00
Warren Dukes
d5a9925d1f s/device/output/ 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2678 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-15 20:18:21 +00:00
Warren Dukes
fb7de941c3 don't set granulepos, that's pad, mmmkay? 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2555 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-09 03:10:14 +00:00
Warren Dukes
b7315f8391 add a buffer to audio layer, so we only send data to audio devices 32 times per second 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2553 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-09 00:13:42 +00:00
Warren Dukes
78c5d884d2 new command "devices", prints devices and their states 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2486 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-02 23:08:00 +00:00
Warren Dukes
69176148bf enabling and disabling individual audioOutputs is mostly done, just need 
to add the command hooks

git-svn-id: https://svn.musicpd.org/mpd/trunk@2484 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-02 21:48:53 +00:00
Warren Dukes
8b08ee82b4 begin work on avuton's disabling and enabling of individual audio outputs 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2483 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-02 21:06:44 +00:00
Warren Dukes
ee5d5d6330 abstract out audioFormat conversion from shout plugin to the audioOutput layer, 
now format can be specified for each different audioOutput device

git-svn-id: https://svn.musicpd.org/mpd/trunk@2474 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-02 17:05:27 +00:00
Warren Dukes
c269e18813 now np's OSS stuff actually works 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2459 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-11-02 02:03:00 +00:00
Warren Dukes
a5e3445697 fix a little bug with audio device being closed on song change, oops 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2376 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-28 05:22:22 +00:00
Warren Dukes
58dbe4bb5d merge shank-rewrite-config changes 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2375 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-28 05:14:55 +00:00
Warren Dukes
a494bd73d8 try to fix metadata on initially playing (metadata being sent before device is open) 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2344 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-26 02:00:17 +00:00
Warren Dukes
ce10ba4b11 fix a big time bug in metadataChunk (off by one in an array assignment) 
also, now we have metadata in our streams

git-svn-id: https://svn.musicpd.org/mpd/trunk@2337 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-25 20:09:03 +00:00
Warren Dukes
12597322a2 configure shout encoding quality and audio format 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2307 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-23 01:04:58 +00:00
Warren Dukes
5b7a1419b9 on finishAudioDriver, be sure to set shoutOutput = NULL 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2296 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-22 17:58:12 +00:00
Warren Dukes
d021f6b042 this really fixes pause 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2294 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-22 16:16:39 +00:00
Warren Dukes
d171fe9a2f fix segfault when resuming from pause 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2293 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-22 15:19:35 +00:00
Warren Dukes
72a7740fd5 shout audioOutput will now connect and disconnect from icecast server 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2285 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-20 20:41:21 +00:00
Warren Dukes
e1701d2991 stub audioOutput plugin for shout 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2283 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-20 17:49:04 +00:00
Warren Dukes
c2455ec0ca oops, accidently broke crossfading, fixed now 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2281 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-20 17:25:36 +00:00
Warren Dukes
fd2ae556a2 some small cleanups 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2280 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-20 17:11:04 +00:00
Warren Dukes
f4d75d7596 ok, now we're using some of the new audioOutput layer stuff, needs some serious testing, and there maybe some serios BREAKAGE 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2279 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-20 16:48:22 +00:00
Warren Dukes
ce5773848c minor little changes to audio junk 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2278 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-10-20 16:16:50 +00:00
Warren Dukes
dbd79a6b47 fix a few bugs in mp3_decode and minimize alsa underruns by playing silence when switch songs 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1572 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-06-19 22:27:29 +00:00
Warren Dukes
43b355734c Add WARNING log method. it's the same as ERROR, except that when mpd starts, 
warnings are buffered until the error log is opened, and then flushed to the
error log.

git-svn-id: https://svn.musicpd.org/mpd/trunk@1442 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-06-12 02:06:16 +00:00
Warren Dukes
e89c9769f9 allow any sampleRate > 0? 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1150 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-05-24 22:29:04 +00:00
Warren Dukes
69a0b86173 trash XMMS resampling, use ESD's instead, don't understand it, but it works 
git-svn-id: https://svn.musicpd.org/mpd/trunk@979 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-05-10 22:31:23 +00:00
Warren Dukes
872af20777 resampling code blatantly ripped from xmms, needs testing and need to 
right conversion routines for bit conversion and channel conversion

git-svn-id: https://svn.musicpd.org/mpd/trunk@971 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-05-10 15:21:40 +00:00
Warren Dukes
7626d9a547 more little bits of code in prep for resample/audioFormat conversion, 
now to just write the actual audioFormat conversion code!

git-svn-id: https://svn.musicpd.org/mpd/trunk@970 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-05-10 14:06:23 +00:00
Warren Dukes
9dd098f09b use memcpy for isCurrentAudioFormat() 
git-svn-id: https://svn.musicpd.org/mpd/trunk@969 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-05-10 13:37:48 +00:00
Warren Dukes
cd3180c701 stuff for configuring the audio output format (sampling rate, channels, bits) 
git-svn-id: https://svn.musicpd.org/mpd/trunk@967 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-05-10 02:20:15 +00:00
Warren Dukes
549344d38a add vim shiznit to end of all source files 
git-svn-id: https://svn.musicpd.org/mpd/trunk@750 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-04-14 14:53:41 +00:00
Warren Dukes
7091235a68 add --disable-audio configure option 
git-svn-id: https://svn.musicpd.org/mpd/trunk@679 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-04-11 04:49:27 +00:00
Warren Dukes
7d29f1772a don't report an error about not able to open device in audioError 
also, update TODO with ideas about non-blocking update

git-svn-id: https://svn.musicpd.org/mpd/trunk@632 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-04-07 23:46:33 +00:00
Warren Dukes
785cdb0114 use EXIT_SUCCESS and EXIT_FAILURE 
git-svn-id: https://svn.musicpd.org/mpd/trunk@591 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-04-02 23:34:16 +00:00
Warren Dukes
09880de539 fix for iconv 
git-svn-id: https://svn.musicpd.org/mpd/trunk@339 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-03-21 06:17:32 +00:00
Warren Dukes
6436b0ac8a close audio device on pause 
git-svn-id: https://svn.musicpd.org/mpd/trunk@329 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-03-20 19:47:05 +00:00
Warren Dukes
821355361c audio cleanups 
git-svn-id: https://svn.musicpd.org/mpd/trunk@109 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-02-27 23:13:26 +00:00
Warren Dukes
5622edbc98 cleanup audio code some 
git-svn-id: https://svn.musicpd.org/mpd/trunk@108 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-02-27 23:05:56 +00:00
Warren Dukes
d35747a40c import from SF CVS 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1 09075e82-0dd4-0310-85a5-a0d7c8717e4f
 2004-02-23 23:41:20 +00:00