aboutsummaryrefslogtreecommitdiffstats
path: root/src/output (follow)
Commit message (Collapse)AuthorAgeFilesLines
* output_api: play() returns a lengthMax Kellermann2009-02-2310-112/+82
| | | | | | | | 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.
* shout: removed shout_plugin.hMax Kellermann2009-02-222-53/+28
| | | | | There are no plugins left which require shout_plugin.h. Moved the struct declaration to shout_plugin.c.
* shout: removed shout_encoder_pluginsMax Kellermann2009-02-221-11/+0
| | | | This array is empty, and is not used anymore.
* shout: use the new encoder APIMax Kellermann2009-02-224-551/+102
| | | | | Removed shout's encoder plugin API in favor of the new generic encoder plugin API.
* shout: merged open_shout_conn() into my_shout_open_device()Max Kellermann2009-02-221-10/+2
| | | | | The method implementation my_shout_open_device() consists of only one line, the call to open_shout_conn(). Merge both functions into one.
* shout: bool return values instead of intMax Kellermann2009-02-221-27/+28
| | | | Return true/false instead of 0/-1.
* utils: use g_usleep() instead of my_usleep()Max Kellermann2009-02-192-4/+2
| | | | | | | Now that I've found this nice function in the GLib docs, we can finally remove our custom sleep function. Still all those callers of g_usleep() have to be migrated one day to use events, instead of regular polling.
* output_api: don't include config.hMax Kellermann2009-02-161-0/+1
| | | | If an output plugin requires config.h, it should include it directly.
* output_plugin: replaced method "control()" with "mixer()"Max Kellermann2009-02-162-16/+18
| | | | | 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.
* shout_mp3: use audio_format_frame_size()Max Kellermann2009-02-101-2/+1
| | | | | Use audio_format_frame_size() instead of channels*audio_format_sample_size().
* shout: pass void pointer to the encoderMax Kellermann2009-02-103-5/+6
| | | | | | Pass the music chunk as a "const void *" to the encoder, instead of a "const char *". Actually, both encoders currently expect 16 bit samples, passing a 8-bit character is rather pointless.
* shout_ogg: moved PCM conversion to a separate functionMax Kellermann2009-02-101-12/+13
| | | | | | For simplification, moved the PCM conversion code to pcm16_to_ogg_buffer(). Work with a int16_t pointer instead of a char pointer.
* ao: declare AoData.writeSize as size_tMax Kellermann2009-02-101-3/+3
| | | | | writeSize is a memory size and its type should thus be size_t. This allows us to remove two explicit casts.
* osx: removed disabled debug messagesMax Kellermann2009-02-101-43/+2
| | | | Nobody needs these debug messages anymore.
* shout: clear buffer before calling the encoderMax Kellermann2009-02-093-18/+14
| | | | | | | Always assume the buffer is empty before calling the encoder. Always flush the buffer immediately after there has been added something. This reduces the risk of buffer overruns, because there will never be a "rest" in the current buffer.
* shout: don't postpone metadataMax Kellermann2009-02-093-34/+14
| | | | | Don't duplicate the tag received by the send_metadata() method - send it to the shout server directly.
* shout: use libshout's synchronizationMax Kellermann2009-02-092-24/+4
| | | | | Removed the manual timer synchronization from the shout plugin. libshout's shout_sync() function does it for us.
* shout: switch to blocking modeMax Kellermann2009-02-092-77/+7
| | | | | | The non-blocking mode of libshout is sparsely documented, and MPD's implementation had several bugs. Also removed connect throttling code, that is done by the MPD core since 0.14.
* shout: removed shout_data.tag_to_sendMax Kellermann2009-02-092-9/+6
| | | | | When shout_data.tag!=NULL, there is a "tag to send". The tag_to_send flag is redundant.
* shout: removed shout_data.shout_errorMax Kellermann2009-02-092-4/+0
| | | | That variable is set in handle_shout_error(), but is never read.
* shout_mp3: call lame_close() in clear_encoder() methodMax Kellermann2009-02-021-2/+6
| | | | | | | | | | The shout_mp3 encoder had two bugs: when no song was ever played, MPD segfaulted during cleanup. Second bug: memory leak, each time the shout device was opened, lame_init() was called again, and lame_close() is only called once during shutdown. Fix this by shutting down LAME each time the clear_encoder() method is called.
* shout_mp3: free the lame_data struct on exitMax Kellermann2009-02-021-0/+2
| | | | | Make valgrind a little bit happier: free the global lame_data struct in the finish() method.
* output_api: moved the command check out of method pause()Max Kellermann2009-01-301-10/+3
| | | | | | Move the "while" loop which checks for commands to the caller ao_pause(). This simplifies the pause() method, and lets us remove audio_output_is_pending().
* output_api: removed audio_output_closed()Max Kellermann2009-01-301-1/+0
| | | | | The function is only used by the MVP output plugin, and this one call is wrong.
* jack: don't override output_ports in connect()Max Kellermann2009-01-301-10/+22
| | | | | | If no ports are configured, don't overwrite the (NULL) configuration with the port names of the first JACK server. If the server changes after a JACK reconnect, MPD won't attempt to auto-detect again.
* jack: removed sample_rate callbackMax Kellermann2009-01-301-20/+7
| | | | | | | | | | | Currently, the JACK plugin manipulates the audio_format struct which was passed to the open() method. This is very likely to break, because the plugin must not permanently store this pointer. After this patch, MPD ignores sample rate changes. It looks like other software is doing the same, and I guess this is a non-issue. This patch converts the audio_format pointer within jack_data into a static audio_format struct.
* configure.ac: detect jack_set_info_function()Max Kellermann2009-01-301-0/+5
| | | | | jack_set_info_function() is not provided by older libjack versions. Attempt to detect if it is available.
* jack: print info messagesMax Kellermann2009-01-301-0/+7
| | | | | Use jack_set_info_function() to install an info callback. Don't let libjack print them to stderr.
* jack: don't manually close on shutdownMax Kellermann2009-01-291-3/+1
| | | | Return false from mpd_jack_play(), let the MPD core close the device.
* jack: initialize output_ports if not configuredMax Kellermann2009-01-291-0/+3
| | | | Don't leave uninitialized bytes in the jack_data struct.
* jack: close JACK client on stopMax Kellermann2009-01-291-4/+4
| | | | When MPD stops playback, close the JACK client connection.
* jack: removed "bps" attributeMax Kellermann2009-01-291-5/+1
| | | | The "bps" attribute is calculated, but never used.
* jack: make mpd_jack_connect() return boolMax Kellermann2009-01-291-10/+10
| | | | Return true/false instead of 1/-1.
* jack: use loops for allocating/freeing ports/buffersMax Kellermann2009-01-291-36/+32
| | | | | | | Preparation for supporting other channel numbers than stereo: use loops instead of duplicating code for the second channel. Most likely, gcc will unroll these loops, so the binary won't be any different.
* jack: fail if jack_get_ports() returns NULLMax Kellermann2009-01-291-19/+23
| | | | | When jack_get_ports() returns NULL, we cannot have any ports to connect to, and the device cannot play anything.
* jack: use jack_port_name() instead of g_malloc()+sprintf()Max Kellermann2009-01-291-12/+2
| | | | | libjack's jack_port_name() function returns the effective port name, we don't need to do it manually.
* jack: initialize libjack's error function in mpd_jack_init()Max Kellermann2009-01-291-1/+2
| | | | | Do the global libjack initialization in the global plugin initialization function.
* jack: reduced sleep time to 1msMax Kellermann2009-01-291-1/+1
| | | | | | | | | | When waiting for free space in the ring buffer, the JACK plugin sleeped 10ms until there is enough space. This delay was too large for low-latency setups (<10ms), and created a lot of xruns. Work around that by reducing the sleep time to 1ms. A proper solution for this would be to use an event based approach, and we will do it, just not now.
* jack: clear "shutdown" flag on reconnectMax Kellermann2009-01-291-0/+2
| | | | | | | When the connection failed once, you had to restart MPD, because it never cleared the jack_data.shutdown flag. Instead, it refused to play anything "because there is no client thread" (which is wrong at that point).
* jack: allocate ring buffers before connectingMax Kellermann2009-01-291-5/+3
| | | | | If the ring buffers are allocated after jack_activate(), mpd_jack_process() might segfault because it attempts to access them.
* jack: register ports before activating clientsMax Kellermann2009-01-291-5/+5
| | | | Call jack_port_register() before jack_activate().
* use g_free() instead of free()Max Kellermann2009-01-257-12/+11
| | | | | | 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-252-11/+3
| | | | | | | 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-252-15/+17
| | | | Don't use statically allocated mixer objects.
* conf: allow param==NULLMax Kellermann2009-01-253-27/+10
| | | | | | | | 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-2510-12/+12
| | | | | 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>