| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| |
|
|
|
|
| |
Don't initialize attributes which are only used in an open mixer. As
long as nobody accesses them, their values are uninitialized and
undefined.
|
| |
|
|
|
|
|
| |
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.
|
| |
|
|
|
| |
When the MPD core knows that the pulse mixer is open, pm->mainloop and
pm->context must be non-NULL.
|
| |
|
|
|
| |
The attributes "online" and "index" were not properly reinitialized
after a close/open cycle.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
| |
The conf.h functions deal well with config_param==NULL and will return
the specified default value then.
|
| |
|
|
|
| |
When the mixer initialization fails, we have to free the libpulse
objects we have already created, to prevent resource leaks.
|
| |
|
|
|
| |
It's illegal to return from pulse_mixer_setup() without unlocking the
main loop. In the error handling, that unlock() call was missing.
|
| |
|
|
| |
Prepare for adding proper error handling.
|
| |
|
|
|
|
| |
"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.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
| |
Instead of replacing NULL with the default device in the open()
method, pass the default device to config_get_block_string().
|
| |
|
|
| |
Use config_get_block_string() instead of config_dup_block_string().
|
| |
|
|
| |
Detect misconfiguration during MPD startup.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
| |
strncasecmp() is locale dependent, but we only need ASCII here.
|
| |
|
|
|
| |
Instead of replacing NULL with the default path in the open() method,
pass the default path to config_get_block_string().
|
| |
|
|
| |
Use config_get_block_string() instead of config_dup_block_string().
|
| |
|
|
|
|
| |
If a (global) mixer has been closed due to failure, don't reopen it
with every volume get/set. Leave it closed until it is explicitly
opened.
|
| |
|
|
|
| |
When getting or setting the volume fails, the MPD core close the
mixer. Moved the duplicated code from the mixer plugins.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
As a side effect, the previous patch added the mixer==NULL checks. It
is now illegal to call mixer functions with a NULL argument. Convert
the runtime checks to assertions.
|
| |
|
|
|
|
| |
The mixer core library is now responsible for creating and managing
the mixer object. This removes duplicated code from the output
plugins.
|
| |
|
|
|
|
|
| |
When the decoder initialization has not been completed yet, all calls
to dc_seek() will fail, because dc.seekable is not initialized yet.
Wait for the decoder to complete its initialization, i.e. until it has
called decoder_initialized().
|
| |
|
|
|
|
|
|
|
|
|
| |
Don't start playback as soon as the "current" song is being loaded
from the state file. That is unclean, and leads to an obscure bug: in
repeat mode, when the song is started (which is yet the last song in
the list), the playlist code marked the very first song in the
playlist as "next" song, because the end of the playlist was wrapped.
It's easier to set up the playback after all songs have been loaded,
and after the random/repeat mode has been set.
|
| |
|
|
|
|
| |
Use audio_output_client_notify instead of g_usleep(1ms) in
audio_output_all_wait() to synchronize with the output_thread. Signal
the audio_output_client_notify object in ao_play().
|
| |
|
|
|
|
| |
Synchronization with the output thread will be implemented in
output_all.c, not in player_thread.c. Currently, that's just a simple
g_usleep(1ms).
|
| |
|
|
|
|
| |
There was a deadlock between the output thread and the player thread:
when the output thread failed (and closed itself) while the player
thread worked with the audio_output object, MPD could crash.
|
| | |
|
| |
|
|
|
| |
To prevent a race condition, close the output thread before assigning
the new audio format.
|
| |
|
|
|
|
|
| |
The config_audio_format used to contain the configured audio format,
which is copied to out_audio_format. Let's convert the former to a
boolean, which indicates whether out_audio_format was already set.
This simplifies some code and saves a few bytes.
|
| | |
|
| |
|
|
|
| |
If a music_chunk does not contain any PCM data, then the "times" and
"bit_rate" attributes are undefined.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
On 2009/03/17 Max Kellermann<max@duempel.org> wrote:
> There doesn't seem to be an "official" standard. I'd say: search for
> TITLE[1] first (the most explicit form), then TITLE1, and finally fall
> back to TITLE. This makes sure MPD supports every possible standard,
> without breaking.
I've also added some additional checks to make sure entry is long
enough.
|
| |
|
|
|
|
| |
The mixer state is defined as offline only if the associated stream is removed.
Signed-off-by: David Guibert <david.guibert@gmail.com>
|
| |
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
| |
Check if encoder_plugin!=NULL, not encoder_plugin_get (which is a
function).
|
| |
|
|
| |
It's called "vorbis", not "ogg".
|
| |
|
|
|
|
|
|
| |
The cue sheet embedded in a flac file doen't contain any information
about track titles and similar. There are three possibilities: Use an
external cue sheet that includes these information, use a tag CUESHEET
with a cue sheet including these information or use tags. I think the
latter is the best option and is already used by other projects.
|
| |
|
|
|
| |
g_strerror() is more portable, and guarantees that the returned string
is UTF-8 encoded.
|
| | |
|
| |
|
|
|
| |
When printing the error message, MPD dereferences the NULL pointer to
print an error message if no audio_output section is present.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
[mk: don't run pkg-config when shout is disabled]
|
| | |
|
| | |
|
| | |
|
| | |
|
