aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/alsa_plugin.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* alsa_plugin.c: workaround snd_pcm_drain bugJeffrey Middleton2009-11-021-1/+2
| | | | | | | Reintroduce a fix from commit 52a0653 (Warren Dukes): "don't call snd_pcm_drain unless we're already in the RUNNING state". This prevents ALSA with dmix from sometimes hanging when snd_pcm_drain is called, e.g. when moving from one song to the next (as in mantis issue 2634).
* output_plugin: added method "drain"Max Kellermann2009-10-291-3/+9
| | | | | | | drain() is the opposite of cancel(): it waits until all data in the buffer has finished playing. Instead of implicitly draining in the close() method like the ALSA plugin has been doing it forever, let the output thread decide whether to drain or to cancel.
* output/alsa: don't recover on CANCELMax Kellermann2009-10-291-1/+1
| | | | | | The recovery is for nothing if we get CLOSE afterwards. Let's not recover in the cancel() method, and let the next play() call sort it out.
* mixer/{oss,alsa}: renamed the mixer source filesMax Kellermann2009-10-201-1/+2
|
* Support wrong-endian ALSA outputDavid Woodhouse2009-07-191-2/+50
|
* alsa_output: don't use atexit() to clean up the ALSA libraryMax Kellermann2009-04-211-7/+3
| | | | | Call snd_config_update_free_global() manually in our finish() method, don't use atexit().
* output_plugin: replaced output_plugin.get_mixer() with mixer_pluginMax Kellermann2009-03-261-19/+1
| | | | | | The mixer core library is now responsible for creating and managing the mixer object. This removes duplicated code from the output plugins.
* mixer_api: moved mixer_plugin imports to mixer_list.hMax Kellermann2009-03-141-1/+1
| | | | | | This patch allows the output plugins to import only mixer_list.h, instead of the full mixer_api.h (which would expose internal structures).
* mixer_api: moved functions to mixer_control.cMax Kellermann2009-03-141-0/+1
| | | | | | mixer_control.h should provide the functions needed to manipulate a mixer, without exposing the internal mixer API (which is provided by mixer_api.h).
* all: Update copyright header.Avuton Olrich2009-03-131-6/+7
| | | | | | | | This updates the copyright header to all be the same, which is pretty much an update of where to mail request for a copy of the GPL and the years of the MPD project. This also puts all committers under 'The Music Player Project' umbrella. These entries should go individually in the AUTHORS file, for consistancy.
* alsa: use snd_pcm_sframes_t instead of intMax Kellermann2009-03-101-2/+1
| | | | | snd_pcm_writei() returns the type snd_pcm_sframes_t, not int. Use the correct variable type.
* alsa: don't close PCM handle in alsa_recover()Max Kellermann2009-03-101-13/+3
| | | | | | If the PCM handle gets disconnected, don't close and clear it in alsa_recover(). The MPD core will call alsa_close() anyway. This way, we can always assume that alsa_data.pcm is always valid.
* alsa: determine buffer_time if not already knownMax Kellermann2009-03-081-0/+5
| | | | | | This patch fixes a theoretical (but practically impossible) flaw: the variable "buffer_time" may be uninitialized when it is used. Initialize the variable with snd_pcm_hw_params_get_buffer_time().
* alsa: better period_time default value for high sample ratesMax Kellermann2009-03-081-3/+8
| | | | | | | | | | | | | | | | | | The default values for buffer_time and period_time were both capped by the hardware limits on practically all chips. The result was a period_time which was half as big as the buffer_time. On some chips, this led to lots of underruns when using a high sample rate (192 kHz), because MPD had very little time to send new samples to ALSA. A period time which is one fourth of the buffer time turned out to be much better. If no period_time is configured, see how much buffer_time the hardware accepts, and try to configure one fourth of it as period_time, instead of hard-coding the default period_time value. This is yet another attempt to provide a solution which is valid for all sound chips. Using the SND_PCM_NONBLOCK flag also seemed to solve the underruns, but put a lot more CPU load to MPD.
* alsa: log period and buffer sizeMax Kellermann2009-03-031-0/+3
| | | | | | Log the real period and buffer size. This might be useful when debugging xruns. Note that the same information is available in /proc/asound/card*/pcm*p/sub*/hw_params
* alsa: fall back to 32 bit samples if 16 is not supportedMax Kellermann2009-03-031-1/+2
| | | | | | There are a few high-end devices (e.g. ICE1724) which cannot even play 16 bit audio. Try the 32 bit fallback, which we already implemented for 24 bit.
* alsa: fall back to 32 bit samples if 24 is not supportedMax Kellermann2009-03-021-0/+8
| | | | | | Some sound chips/drivers (e.g. Intel HDA) don't support 24 bit samples, they want to get 32 bit instead. Now that MPD's PCM library supports 32 bit, add a 32 bit fallback when 24 bit is not supported.
* output: removed duplicate debug messages from pluginsMax Kellermann2009-03-011-4/+0
| | | | | The MPD core logs the audio format of all audio outputs. Remove the duplicate message from the plugins.
* output_plugin: report errors with GErrorMax Kellermann2009-02-261-20/+35
| | | | | | | Use GLib's GError library for reporting output device failures. Note that some init() methods don't clean up properly after a failure, but that's ok for now, because the MPD core will abort anyway.
* alsa: fall back to 16 bit audioMax Kellermann2009-02-251-3/+8
| | | | When the sample format is unknown, fall back to 16 bit samples.
* alsa: moved code from alsa_open() to alsa_setup()Max Kellermann2009-02-251-32/+49
| | | | | | Simplify error handling a bit by moving some code into a separate function. This eliminates a good bunch of gotos, but that's not finished yet.
* output_plugin: don't pass audio_output object to method init()Max Kellermann2009-02-251-2/+1
| | | | | | audio_output_get_name() has been removed, which was the only function left in output_api.h. The output plugin doesn't need the audio_output object at all, remove the parameter from the init() method.
* output: pass the music chunk pointer as void*, not char*Max Kellermann2009-02-231-1/+1
| | | | | | The meaning of the chunk depends on the audio format; don't suggest a specific format by declaring the pointer as "char*", pass "void*" instead.
* output_api: play() returns a lengthMax Kellermann2009-02-231-20/+11
| | | | | | | | The old API required an output plugin to not return until all data passed to the play() method is consumed. Some output plugins have to loop to fulfill that requirement, and may block during that. Simplify these, by letting them consume only part of the buffer: make play() return the length of the consumed data.
* output_plugin: replaced method "control()" with "mixer()"Max Kellermann2009-02-161-8/+9
| | | | | The output plugin shouldn't know any specifics of the mixer API. Make it return the mixer object, and let the caller deal with it.
* use g_free() instead of free()Max Kellermann2009-01-251-1/+1
| | | | | | On some platforms, g_free() must be used for memory allocated by GLib. This patch intends to correct a lot of occurrences, but is probably not complete.
* mixer: removed mixer_configure(), configure mixer in mixer_new()Max Kellermann2009-01-251-7/+1
| | | | | | | Allocate the mixer object when it is configured. Merged mixer_configure() into mixer_new(). mixer_new() was quite useless anyway.
* mixer: return a mixer struct pointerMax Kellermann2009-01-251-7/+7
| | | | Don't use statically allocated mixer objects.
* conf: allow param==NULLMax Kellermann2009-01-251-5/+2
| | | | | | | | Return the default value in the conf_get_block_*() functions when param==NULL was passed. This simplifies a lot of code, because all initialization can be done in one code path, regardless whether configuration is present.
* conf: const pointers in block get functionsMax Kellermann2009-01-251-2/+2
| | | | | All config_get_block_*() functions should accept constant config_param pointers.
* alsa: added commentsMax Kellermann2009-01-251-3/+21
| | | | Document alsa_data members.
* alsa: frame_size is size_t, not intMax Kellermann2009-01-251-1/+1
| | | | frame_size is a memory size and should be a size_t, not a signed integer.
* alsa: no CamelCaseMax Kellermann2009-01-251-93/+103
| | | | Renamed types, functions, variables.
* alsa: fix option parsing and restore default period_timeDan McGee2009-01-251-3/+6
| | | | | | | | | | | | | | | | | | | Two bugs here led to a large number of interrupts being generated on the sound card when ALSA output is being used. Because we specify no default period_time, the sound card gives us 3000 interrupts/sec rather than a more sane 20 or 30. This completes the revert of dd7711 already started by 4ca24f. The larger bug was in the change to config_get_block_unsigned() and using 0 as the default value for both 'buffer_time' and 'period_time'. This means any pre-setting of these options in newAlsaData() gets wiped out. Add a new default for period_time, and ensure default values for buffer_time and period_time are used if none are provided by the user. Signed-off-by: Dan McGee <dan@archlinux.org> [mk: set defaults in newAlsaData() to fix auto-configuration; renamed "_MS" back to "_US" because ALSA expects microseconds, not milliseconds] Signed-off-by: Max Kellermann <max@duempel.org>
* conf: added config_get_block_unsigned()Max Kellermann2009-01-181-6/+2
| | | | Eliminate some more getBlockParam() invocations.
* conf: added config_get_block_string()Max Kellermann2009-01-181-2/+1
| | | | This replaces lots of getBlockParam() invocations.
* conf: replaced getBoolBlockParam() with config_get_block_bool()Max Kellermann2009-01-171-6/+5
| | | | No "force" parameter, pass a default value instead.
* conf: no CamelCase, part IMax Kellermann2009-01-171-5/+6
| | | | Renamed functions, types, variables.
* Introducing mixer apiViliam Mateicka2009-01-101-7/+8
| | | | | This patch tryes to introduce pluggable mixer (struct mixer_plugin) along with some basic infrastructure (mixer_* functions). Instance of mixer (struct mixer) is used in alsa and oss output plugin
* pcm_utils: moved conversion code to pcm_convert.cMax Kellermann2009-01-071-1/+1
| | | | | All what's left in pcm_utils.h is the pcm_range() utility function, which is only used internally by pcm_volume and pcm_mix.
* renaming mixer.h to mixer_api.hViliam Mateicka2009-01-041-1/+1
|
* alsa: use GLib instead of utils.hMax Kellermann2009-01-021-3/+2
|
* output plugins: don't include gcc.hMax Kellermann2009-01-011-2/+2
| | | | Use GLib's G_GNUC_UNUSED instead of gcc.h's mpd_unused.
* Moving mixers to audio outputsViliam Mateicka2008-12-311-1/+21
|
* alsa: use GLib loggingMax Kellermann2008-12-291-29/+30
|
* alsa: reverted the default buffer_time to 500 msMax Kellermann2008-12-011-1/+5
| | | | | | | Commit dd7711d8 removed MPD's default ALSA buffer_time. The result was a buffer size which was way too small for playing streams on some sound hardware, and caused skips and distorted sound. Revert the default to 500 ms.
* alsa: initialize "device" with NULLMax Kellermann2008-11-031-2/+1
| | | | | When using autodetection, AlsaData.device wasn't properly initialized with NULL. This broke autodetection randomly.
* alsa, jack: no const pointers for allocated stringsMax Kellermann2008-11-011-17/+25
| | | | | Make the pointers "device" and "name" non-const, so we don't need the xfree() hack. The default value is expressed as NULL.
* output: close device on play errorMax Kellermann2008-10-291-1/+0
| | | | | When an output plugin fails to play a chunk, close it. This replaces various manual close() calls in nearly all plugins.
* output: use bool for return values and flagsMax Kellermann2008-10-291-9/+10
| | | | | Don't return 0/-1 on success/error, but true/false. Instead of int, use bool for storing flags.