Commit Graph

163 Commits

Author SHA1 Message Date
J. Alexander Treuman
30df7d49c5 Reverting patch to "fix" the alsa plugin when used with dmix. It ended up breaking the alsa rate plugin, and dmix seems to work fine without it. Thanks to Skee from #mpd for testing.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4269 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-11 23:59:18 +00:00
Eric Wong
19021e9cc6 src/audioOutputs/audioOutput_oss.c: fix for big-endian machines
Patch by Qball.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

git-svn-id: https://svn.musicpd.org/mpd/trunk@3935 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-03-25 05:33:14 +00:00
Eric Wong
867ca276ad Hopefully the last of the spelling fixes :>
git-svn-id: https://svn.musicpd.org/mpd/trunk@3923 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-03-16 06:41:41 +00:00
Warren Dukes
1dc252c920 potential fix for bug #466
git-svn-id: https://svn.musicpd.org/mpd/trunk@3726 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-12-12 03:22:27 +00:00
Eric Wong
f8597ccf25 remove C++ style comments
git-svn-id: https://svn.musicpd.org/mpd/trunk@3689 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-11-19 10:52:47 +00:00
Eric Wong
e8a54efe41 gcc 2.95 fixes
audioOutput_osx.c, aac_decode.c, mp4_decode.c have NOT been thoroughly
checked, but I nevertheless managed to eyeball and fix one
incompatibility in audioOutput_osx.c

All other files have been build successfully with gcc 2.95


git-svn-id: https://svn.musicpd.org/mpd/trunk@3688 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-11-19 10:29:20 +00:00
Qball Cow
20731cc7e6 Fixed (tested in Fink and DarwinPorts) osX output plugin
git-svn-id: https://svn.musicpd.org/mpd/trunk@3500 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-10-02 14:52:13 +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
Eric Wong
bde7029409 fix warning reported gcc 4.0: x == y == z does not work as intended
git-svn-id: https://svn.musicpd.org/mpd/trunk@3422 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-08-07 10:17:28 +00:00
Eric Wong
fb175591c3 don't check errno unless we have an error (ret<0) from write()
git-svn-id: https://svn.musicpd.org/mpd/trunk@3382 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-07-03 12:15:45 +00:00
Warren Dukes
db20894b90 fix OSS audioOutput plugin, so that when dropAudioBuffer is called and the oss device is closed, a subsequent call to playAudio will reopen the device
git-svn-id: https://svn.musicpd.org/mpd/trunk@3198 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-04-06 22:52:42 +00:00
Warren Dukes
e221502f59 destroy mutex's and condition's
git-svn-id: https://svn.musicpd.org/mpd/trunk@3132 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-24 11:46:44 +00:00
Warren Dukes
6107b65c23 revert to r3105
git-svn-id: https://svn.musicpd.org/mpd/trunk@3131 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-24 11:45:39 +00:00
Warren Dukes
754c29471f fix compilation error in os x plugin
git-svn-id: https://svn.musicpd.org/mpd/trunk@3115 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-23 00:52:26 +00:00
Warren Dukes
52cdd0baf6 potentially fix OS X woes
git-svn-id: https://svn.musicpd.org/mpd/trunk@3113 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-22 23:05:29 +00:00
Warren Dukes
cd03365fee some potential optimizations for OS X
git-svn-id: https://svn.musicpd.org/mpd/trunk@3105 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-20 21:08:24 +00:00
Warren Dukes
9297ae7fce print out bits in debug message output for OSS and ALSA
git-svn-id: https://svn.musicpd.org/mpd/trunk@3104 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-19 14:30:07 +00:00
Warren Dukes
d392b7e48b bump the OS X buffer up to 1s
git-svn-id: https://svn.musicpd.org/mpd/trunk@3098 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-17 03:28:05 +00:00
Warren Dukes
700d7aa2a0 dynamically allocate a buffer for 0.5s of audio for OS X
git-svn-id: https://svn.musicpd.org/mpd/trunk@3097 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-17 03:08:34 +00:00
Warren Dukes
a85438792f tweak OS X a bit more
git-svn-id: https://svn.musicpd.org/mpd/trunk@3096 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-17 02:52:19 +00:00
Warren Dukes
63f152466b OS X tweaks
git-svn-id: https://svn.musicpd.org/mpd/trunk@3095 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-17 02:33:40 +00:00
Warren Dukes
b4da244c5e fix for dmix
git-svn-id: https://svn.musicpd.org/mpd/trunk@3094 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-17 01:23:06 +00:00
Warren Dukes
c1057f0c34 slight tweak of avuton's idea of causing an error when no audio output's found
git-svn-id: https://svn.musicpd.org/mpd/trunk@3093 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-17 00:56:31 +00:00
Warren Dukes
6b36bf7964 cleanup debugging code and implement _dropBufferedAudio()
git-svn-id: https://svn.musicpd.org/mpd/trunk@3090 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-16 23:24:07 +00:00
Warren Dukes
b9bcfeaf49 closing the audio device seems to work now
git-svn-id: https://svn.musicpd.org/mpd/trunk@3089 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-16 23:11:08 +00:00
Warren Dukes
9f00e2a8f7 attempt to close the osx device
git-svn-id: https://svn.musicpd.org/mpd/trunk@3088 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-16 23:05:25 +00:00
Warren Dukes
d6607f5f23 playing audio in OS X now works, but far from finished
still need to implement closing the audio device

git-svn-id: https://svn.musicpd.org/mpd/trunk@3086 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-16 04:46:41 +00:00
Warren Dukes
f723517057 broken os x output
git-svn-id: https://svn.musicpd.org/mpd/trunk@3082 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-14 04:30:32 +00:00
Warren Dukes
5a2f599dba a little more error output
git-svn-id: https://svn.musicpd.org/mpd/trunk@3078 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-13 23:59:04 +00:00
Warren Dukes
92f1bb82f7 some broken OS X stuff
git-svn-id: https://svn.musicpd.org/mpd/trunk@3075 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-13 21:33:55 +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
3d81a723c7 slight changes to alsa errors
git-svn-id: https://svn.musicpd.org/mpd/trunk@3072 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-13 16:42:04 +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
d4c225fa50 code to attempt to pick a supported sample rate, bits, and channels if the requested format is not supported by the OSS device
git-svn-id: https://svn.musicpd.org/mpd/trunk@3049 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-10 02:47:18 +00:00
Warren Dukes
b5e55a648f we ne allow audioOutput plugins to set the final outAudioFormat that will be used. we now use alsa's _near functions to detect what to use.
git-svn-id: https://svn.musicpd.org/mpd/trunk@3038 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-08 01:53:13 +00:00
Warren Dukes
6a77e60c70 now player and decoder processes should only exit() when receiving term signal from their respective parent processes
git-svn-id: https://svn.musicpd.org/mpd/trunk@3034 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-08 00:17:33 +00:00
Warren Dukes
4b016cafa1 wee bit of code cleanup
git-svn-id: https://svn.musicpd.org/mpd/trunk@3021 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 21:09:32 +00:00
Warren Dukes
8e634b8237 don't need the extra snd_pcm_prepare after _drop
git-svn-id: https://svn.musicpd.org/mpd/trunk@3020 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 21:07:09 +00:00
Warren Dukes
8004ae341f more alsa work
git-svn-id: https://svn.musicpd.org/mpd/trunk@3019 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 20:51:36 +00:00
Warren Dukes
99b28b12b6 this seemed to help a bit with the blip's on next
git-svn-id: https://svn.musicpd.org/mpd/trunk@3015 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 14:45:27 +00:00
Warren Dukes
8a00fa6c57 we want to stat, not lstat
git-svn-id: https://svn.musicpd.org/mpd/trunk@3014 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 14:28:37 +00:00
Warren Dukes
c8f044572e fix some compilation warning
git-svn-id: https://svn.musicpd.org/mpd/trunk@3013 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 14:26:37 +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
7f183f687b now alsa plugin should work
git-svn-id: https://svn.musicpd.org/mpd/trunk@3009 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 05:45:39 +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
82ff4c321c don't open device in initDriver! instead we just stat() for the device
git-svn-id: https://svn.musicpd.org/mpd/trunk@3007 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05 03:36:24 +00:00
Warren Dukes
9999a20c12 this should fix compile bugs #350 and #351
git-svn-id: https://svn.musicpd.org/mpd/trunk@2884 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-01-16 16:03:14 +00:00
Warren Dukes
26e943c025 fix oss_openDevice() to match the new openDevice callback protocol (w/o a audioFormat argument)
git-svn-id: https://svn.musicpd.org/mpd/trunk@2715 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-20 14:44:01 +00:00
Warren Dukes
1fd8d9a790 don't need to pass audioFormat to openDeviceFunc
git-svn-id: https://svn.musicpd.org/mpd/trunk@2708 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-19 15:09:01 +00:00
Warren Dukes
c5d27d8eaa merge changes from metadata-rewrite branch
git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-10 21:58:27 +00:00
Warren Dukes
902cfe2523 add "genre" and "description" to shout config parameters
git-svn-id: https://svn.musicpd.org/mpd/trunk@2557 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-09 13:04:20 +00:00
Warren Dukes
c2a2383090 be sure to flush the metadata on song change
git-svn-id: https://svn.musicpd.org/mpd/trunk@2556 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-09 03:58:12 +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
c3eabe01da try one other thing to fix icecast dropping clients
git-svn-id: https://svn.musicpd.org/mpd/trunk@2554 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-09 00:29:09 +00:00
Warren Dukes
d06ca1dbda make default non-public
git-svn-id: https://svn.musicpd.org/mpd/trunk@2506 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-04 04:03:08 +00:00
Warren Dukes
e9f65c9b98 shout config: make "user" optional and default to "source", also add optional "public"
git-svn-id: https://svn.musicpd.org/mpd/trunk@2505 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-04 04:01:04 +00:00
Warren Dukes
f1f5d668aa remove signal handling code from ao open() and close()
git-svn-id: https://svn.musicpd.org/mpd/trunk@2493 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-03 14:33:35 +00:00
Warren Dukes
44eb26c16f new commands: enalbe_device, and disable_device, (maybe these commands should be toggles instead of two seperate commands?)
also, on close device, close the shout connection

git-svn-id: https://svn.musicpd.org/mpd/trunk@2485 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-02 22:13:58 +00:00
Warren Dukes
d89a48aaa2 DEBUG statement that prints out which ao driver is being used
git-svn-id: https://svn.musicpd.org/mpd/trunk@2478 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-02 18:31:54 +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
0298239770 print more info out in error messages for shout
git-svn-id: https://svn.musicpd.org/mpd/trunk@2473 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-02 13:45:38 +00:00
Warren Dukes
2c9b50cabd only attempt to reconnect to shout server every 60 seconds
git-svn-id: https://svn.musicpd.org/mpd/trunk@2472 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-02 13:26:50 +00:00
Warren Dukes
82cb5e0931 move audioOutput dir to audioOutputs
git-svn-id: https://svn.musicpd.org/mpd/trunk@2471 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-02 12:50:53 +00:00