- 28 Apr, 2009 2 commits
-
-
Max Kellermann authored
strcasecmp() is locale dependent, making it a bad choice for internal string comparisons.
-
Daniel Kahn Gillmor authored
This allows you to select controls with duplicate names.
-
- 25 Apr, 2009 1 commit
-
-
Max Kellermann authored
Using two different kinds of locks may result in a race condition with a deadlock. The libpulse callbacks need no locks at all, because the mainloop object can be assumed to be already locked.
-
- 21 Apr, 2009 1 commit
-
-
Max Kellermann authored
snd_config_update_free_global() frees cached ALSA configuration. This keeps valgrind a little bit more quiet. This patch moves the call from the open() method into the finish() method, which seems more natural: it allows the use of the config cache, and improves the cleanup phase.
-
- 27 Mar, 2009 6 commits
-
-
Max Kellermann authored
Added an assertion in mixer_set_volume(). Removed the range checks from the ALSA and OSS plugins.
-
Max Kellermann authored
There are numerous race conditions between the libpulse thread (pulse_mixer.c callbacks) and the rest of MPD. Protect the volatile attributes of the pulse_mixer struct with a mutex to fix that.
-
Max Kellermann authored
Eliminate one indent level. Also remove several debug useless debug messages.
-
Max Kellermann authored
Those parameters are used after all.
-
Max Kellermann authored
Don't mess with pulse_mixer.volume for setting the volume. This variable should only be used to transfer the current volume from sink_input_vol() to pulse_mixer_get_volume().
-
Max Kellermann authored
The pa_context_get_sink_input_info() function is asynchronous, and after it returns, libpulse does not guarantee that the operation has completed yet; in fact, it is not likely. Explicitly wait for the operation to complete. The code for the new pulse_wait_for_operation() function was inspired by mplayer and xine code.
-
- 26 Mar, 2009 21 commits
-
-
Max Kellermann authored
Use the same code style as the rest of MPD.
-
Max Kellermann authored
Don't initialize attributes which are only used in an open mixer. As long as nobody accesses them, their values are uninitialized and undefined.
-
Max Kellermann authored
The pm->volume attribute was allocated in pulse_mixer_init(), but is never freed. This leaks memory. Instead of adding the g_free() call to pulse_mixer_finish(), let's just make "volume" a static attribute of the pulse_mixer struct. That is easier to deal with.
-
Max Kellermann authored
When the MPD core knows that the pulse mixer is open, pm->mainloop and pm->context must be non-NULL.
-
Max Kellermann authored
The attributes "online" and "index" were not properly reinitialized after a close/open cycle.
-
Max Kellermann authored
Nobody needs to modify these strings. We can make them const, and convert config_dup_block_string() to config_get_block_string(). This also fixes memory leaks in the pulse mixer.
-
Max Kellermann authored
The conf.h functions deal well with config_param==NULL and will return the specified default value then.
-
Max Kellermann authored
When the mixer initialization fails, we have to free the libpulse objects we have already created, to prevent resource leaks.
-
Max Kellermann authored
It's illegal to return from pulse_mixer_setup() without unlocking the main loop. In the error handling, that unlock() call was missing.
-
Max Kellermann authored
Prepare for adding proper error handling.
-
Max Kellermann authored
"volume_set" is an attribute which becomes undefined when the mixer is closed. That means, it must be initialized each time the mixer is opened.
-
Max Kellermann authored
The MPD core guarantees that methods are always invoked in a consistent state. This means we can remove lots of checks from the volume methods.
-
Max Kellermann authored
Instead of replacing NULL with the default device in the open() method, pass the default device to config_get_block_string().
-
Max Kellermann authored
Use config_get_block_string() instead of config_dup_block_string().
-
Max Kellermann authored
Detect misconfiguration during MPD startup.
-
Max Kellermann authored
The MPD core guarantees that methods are always invoked in a consistent state. This means we can remove lots of checks from the volume methods.
-
Max Kellermann authored
strncasecmp() is locale dependent, but we only need ASCII here.
-
Max Kellermann authored
Instead of replacing NULL with the default path in the open() method, pass the default path to config_get_block_string().
-
Max Kellermann authored
Use config_get_block_string() instead of config_dup_block_string().
-
Max Kellermann authored
When getting or setting the volume fails, the MPD core close the mixer. Moved the duplicated code from the mixer plugins.
-
Max Kellermann authored
Remember if a mixer object is open or closed. Don't call open() again if it is already open. This guarantees that the mixer plugin is always called in a consistent state, and we will be able to remove lots of checks from the implementations. To support mixers which are automatically opened even if the audio output is still closed (to set the volume before playback starts), this patch also adds the "global" flag to the mixer_plugin struct. Both ALSA and OSS set this flag, while PULSE does not.
-
- 17 Mar, 2009 2 commits
-
-
David Guibert authored
The mixer state is defined as offline only if the associated stream is removed. Signed-off-by:
David Guibert <david.guibert@gmail.com>
-
David Guibert authored
when the mixer is closed, - the mainloop is stopped. - the context is disconnected. - then the mainloop is freed. Signed-off-by:
David Guibert <david.guibert@gmail.com>
-
- 13 Mar, 2009 1 commit
-
-
Avuton Olrich authored
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.
-
- 07 Mar, 2009 5 commits
-
-
David Guibert authored
This patch follows the commit 21bb10f4. >From Max Kellermann: > I removed the daemonization changes in main.c. Please explain why you > changed that. If you need it for some reason, make that a separate > patch with a good description of your rationale. > That's the biggest flaw of your code: it opens the mixer device in the > init() method, while the open() method is empty. When the pulse > daemon is not available (either during MPD startup or when it dies > while MPD runs), the plugin will not even attempt to reconnect to > pulse. Please move the code to the open() method, to make that work. I changed the daemonize call as the fork losts the connection to the pulse server. According to your remark, the init() method should be moved to the open() ones. With the modification, mpd is able to reconnect the pulse mixer after restarting the pulseaudio daemon. Signed-off-by:
David Guibert <david.guibert@gmail.com> Signed-off-by:
Max Kellermann <max@duempel.org>
-
Max Kellermann authored
-
Max Kellermann authored
Shorten some log messages, let GLib add the "pulse_mixer" prefix.
-
Max Kellermann authored
Don't include output_api.h - this is not an output plugin. Added missing explicit conf.h and string.h includes.
-
David Guibert authored
This patch introduces the mixer for the pulse output. Technically speaking, the pulse index is needed to get or set the volume. You must define callback fonctions to get this index since the pulse output in mpd is done using the simpe api. The pulse simple api does not provide the index of the newly defined output. So callback fonctions are associated to the pulse context. The list of all the sink input is then retreived. Then we select the name of the mpd pulse output and control its volume by its associated index number. Signed-off-by:
Patrice Linel <patnathanael@gmail.com> Signed-off-by:
David Guibert <david.guibert@gmail.com> [mk: fixed whitespace errors and broke long lines; removed daemonization changes from main.c]
-
- 16 Feb, 2009 1 commit
-
-
Max Kellermann authored
The method control() is too complicated, and overengineered. Replace it with two trivial functions: get_volume() and set_volume().
-