| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I don't believe "interface" is a good name for something like
"connection by a client to MPD", let's call it "client". This is the
first patch in the series which changes the name, beginning with the
file name.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
linux/list.h is a nice doubly linked list library - it is lightweight
and powerful at the same time. It will be useful later, when we begin
to allocate client structures dynamically. Import it, and strip out
all the stuff which we are not going to use.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* mk/strset:
use strset.h instead of tagTracker.h
strset: fix duplicate values
added string set library
Conflicts:
src/dbUtils.c
src/tagTracker.c
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous patch enabled these warnings. In Eric's branch, they
were worked around with a generic deconst_ptr() function. There are
several places where we can add "const" to pointers, and in others,
libraries want non-const strings. In the latter, convert string
literals to "static char[]" variables - this takes the same space, and
seems safer than deconsting a string literal.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
print_playlist_result() had an assert(0) at the end, in case there was
an invalid result value. With NDEBUG, this resulted in a function not
returning a value - add a dummy "return -1" at the end to keep gcc
quiet.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
String literals (including those defined in CPP macros) can be
concatenated at compile time. This saves some CPU cycles in
vsnprintf() at run time.
|
| | | |
| | | |
| | | |
| | | | |
No protocol code in the audio output library.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The "volume" library shouldn't talk to the client. Move error
handling to command.c.
|
| | | |
| | | |
| | | |
| | | | |
Move another ocurrence of error handling over to command.c.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This patch continues the work of the previous patch: don't pass a file
descriptor at all to traverseAllIn(). Since this fd was only used to
report "directory not found" errors, we can easily move that check to
the caller. This is a great relief, since it removes the dependency
on a client connection from a lot of enumeration functions.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Database traversal should be generic, and not bound to a client
connection. This is the first step: no file descriptor for the
callback functions forEachSong() and forEachDir(). If a callback
needs the file descriptor, it has to be passed in the void*data
pointer somehow; some callbacks might need a new struct for passing
more than one parameter. This might look a bit cumbersome right now,
but our goal is to have a clean API.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Continuing the effort of removing protocol specific calls from the
core libraries: let the command.c code call commandError() based on
PlaylistInfo's return value.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Return an "enum playlist_result" value instead of calling
commandError() in storedPlaylist.c.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The playlist library shouldn't talk to the client if possible.
Introduce the "enum playlist_result" type which the caller
(i.e. command.c) may use to generate an error message.
|
| | | |
| | | |
| | | |
| | | | |
Make them both return void.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Client's input values should be validated by the command
implementation, and the core libraries shouldn't talk to the client
directly if possible. Thus, setPlaylistRepeatStatus() and
setPlaylistRandomStatus() don't get the file descriptor, and cannot
fail (return void).
|
| | | |
| | | |
| | | |
| | | |
| | | | |
When an error occurs after the file has been opened, the function will
never close the FILE object.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The "fspath" argument of writeStoredPlaylistToPath() must never be
NULL. There should be an assertion on that, instead of a run-time
check.
[ew: fspath => utf8path]
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The function valid_playlist_name() checks the name, but it insists on
reporting an eventual error to the client. The new function
is_valid_playlist_name() is more generic: it just returns a boolean,
and does not care what the caller will use it for. The old function
valid_playlist_name() will be removed later.
|
| | | |
| | | |
| | | |
| | | | |
The usual bunch of const pointer conversions.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Instead of letting ALSA block for us (and potentially allowing
something stupid on certain hardware or drivers), we do the
sleeping ourselves. We calculate the sleep to be a fraction of
period_time to avoid oversleeping (and thus audible skipping).
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
* mk/strset:
use strset.h instead of tagTracker.h
strset: fix duplicate values
added string set library
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
With a large music database, the linear string collection in
tagTracker.c becomes very slow. We implemented that in a
quick'n'dirty fashion when we removed tree.c, and now we rewrite it
using the fast hashed string set.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Due to a minor typo, the string set had duplicate values, because
strset_add() didn't check the base slot properly.
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"struct strset" is a hashed string set: you can add strings to this
library, and it stores them as a set of unique strings. You can get
the size of the set, and you can enumerate through all values.
This will be used to replace the linear tagTracker library.
|
|/ /
| |
| |
| |
| | |
The writer can be far ahead of the reader during HTTP stalls; so
stop spamming the logs with this message.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The way we used non-blocking mode was HORRIBLE.
It was non-blocking to ALSA, but we end up blocking in a busy
loop that does absolutely NOTHING but retry. We don't check
for playback cancellation (like we do in decoders) or anything.
This is seriously broken and I can imagine it affects people on
fast CPUs more because we do asynchronous output buffering and
our ALSA device will always have data ready.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Print out {buffer,period}_{size,time}. Not sure if this
is going to help. I've been searching everywhere looking
for a possible clue as to what's causing the high CPU
usage problems...
Also, add device information to some messages I missed earlier.
|
| | |
|
| |
| |
| |
| |
| | |
Lets not use deprecated functions. It's apparently
possible to not care about the sw_params stuff at all!
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is safer than the patch in
http://www.musicpd.org/mantis/view.php?id=1542
with multiple audio outputs enabled.
Sadly, I only noticed that patch/problem when I googled for
"snd_config_update_free_global"
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
We never use it for anything anyways as we release the device
entirely on pause.
|
| |
| |
| |
| | |
This saves me precious terminal space
|
| | |
|
| |
| |
| |
| | |
That's the name of this project.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
* ew/alsa:
alsa: optimistically try resuming from suspend
alsa: extra debugging outputs to fix suspend/hibernate
alsa: cleanup debug assignment of the "cmd" variable
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Apparently snd_pcm_hw_params_can_resume() can return false even
though my hardware does in fact support resuming. So stop
carrying that value in the canResume flag and just try to resume
when we're in the suspended state; falling back to
snd_pcm_prepare only if resuming fails. libao does something
similar on resume, too.
While we're at it, use the E() macro which will enable us to
have better error reporting.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Hibernating my laptop while MPD is playing results in ugliness
about "alsa device foo was suspend" constantly printed to the
logs.
|
| | |
| | |
| | |
| | |
| | | |
Given the length of the ALSA command names, I only want
to see them once per-section of code, if at all...
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When random is enabled and a user explicitly specifies
a certain song on the playlist should be played; we need
to re-randomize the internal ordering.
To reproduce this, assuming a four song playlist:
play <song_a>
next => <song_b>
next => <song_c>
next => <song_d>
play <song_a>
next => <song_b>
next => <song_c>
next => <song_d>
...
That is, the "next" command restarts song_{b,c,d} the second
time "play" starts playing song_a.
Thus, the second time "play" is called, the ordering of
song_{b,c,d} needs to be reshuffled.
Reported-by: Qball
|
| |
| |
| |
| |
| |
| | |
Gah, it seems like doing sizeof here either way is error
prone. Too easy to leave out a '*' character we can
forget.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
volatile provides absolutely no guarantee thread-safety in SMP
environments. volatile was designed to access memory locations
in peripheral hardware directly; not for SMP. If volatile is
needed to work properly on SMP, then it is only hiding subtle
bugs.
volatile only prevents the /compiler/ from making optimizations
when accessing variables. CPUs do their own optimizations at
runtime so it cannot guarantee registers of CPUs are flushed
to memory cache-coherent access on different CPUs.
Furthermore, the thread-communication via condition variables
between threads sharing audio formats already results in memory
barriers.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The tag pool is a shared global resource that is infrequently
modified. However, it can occasionally be modified by several
threads, especially by the metadata_pipe for streaming metadata
(both reading/writing).
The bulk tag_item pool is NOT locked as currently only the
update thread uses it.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Trying to read or remember
"tag->numOfItems * sizeof(*tag->items)"
requires too much thinking and mental effort on my part.
Also, favor "sizeof(struct mpd_tag)" over "sizeof(*tag->items)"
because the former is easier to read and follow, even though
the latter is easier to modify if the items member changes
to a different type.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* mk/tag: (22 commits)
tag: fix segfault on update
utf8.h: Fix build (broken os_compat.h #include)
tag: optimize tag_dup(), copy item references
tag: fix the shout and oggflac plugins
const pointers
tag: static directory name
tag: try not to reallocate tag.items in every add() call
song: don't export newNullSong()
tag: try not to duplicate the input string
tag: pass length to fix_utf8()
added "length" parameter to validUtf8String()
assert value!=NULL in fix_utf8()
tag: converted macro fixUtf8() to an inline function
tag: added a pool for tag items
tag: converted tag_item.value to a char array
removed tree.c
tag: converted MpdTag.items to a pointer list
tag: moved code to tag_id3.c
wavpack: tag_new() cannot fail
tag: converted tag_add_item() to an inline function
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
clearMpdTag could be called on a tag that was still in a
tag_begin_add transaction before tag_end_add is called. This
was causing free() to attempt to operate on bulk.items; which is
un-free()-able. Now instead we unmark the bulk.busy to avoid
committing the tags to the heap only to be immediately freed.
Additionally, we need to remember to call tag_end_add() when
a song is updated before we NULL song->tag to avoid tripping
an assertion the next time tag_begin_add() is called.
|
| | |
| | |
| | |
| | | |
This is not a system header
|