oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity
3,410 Commits 1 Branch 144 Tags 56 MiB
90b34f8e6f
Commit Graph

2882 Commits

Author SHA1 Message Date
Antoine Beaupré
b7fe09fa52 shout: enlarge buffer size to 32 kB 
I was having problems with shoutcast stream outputs before applying
the attached patch, which enlarges the shoutcast output
buffer. Ideally, this should be configurable, but this resolves the
issue for my needs.
 2009-01-14 23:28:26 +01:00
Max Kellermann
283c2621f3 oggvorbis: use g_ascii_strncasecmp() instead of strncasecmp() 
Don't depend on the daemon's locale settings.  Comment names are
ASCII.
 2009-01-14 23:23:05 +01:00
Max Kellermann
f353bf77ba oggvorbis: moved tag look into vorbis_parse_comment() 
vorbis_parse_comment() should be a function which converts one comment
to a tag item.  It should do everything required to do the conversion,
including looping over all possible tag types.
 2009-01-14 23:21:45 +01:00
Max Kellermann
69b033757f oggvorbis: moved code to vorbis_copy_comment() 2009-01-14 23:15:14 +01:00
Max Kellermann
25cf333355 oggvorbis: use vorbis_comment_value() in vorbis_parse_comment() 
Eliminate some duplicate code.
 2009-01-14 23:09:36 +01:00
Max Kellermann
5a26c949bb oggvorbis: always allocate a tag object 
Always allocate a new tag object before parsing the vorbis comments;
free it when it turns out to be empty.  This simplifies the code a
bit.
 2009-01-14 23:09:31 +01:00
Max Kellermann
b5cadc9c04 oggvorbis: no CamelCase 
Renamed functions and variables.
 2009-01-14 23:09:02 +01:00
Max Kellermann
b8e06d414a oggvorbis: use bool 
Make ogg_parseCommentAddToTag() return bool instead of unsigned int.
 2009-01-14 22:51:11 +01:00
Daniele Sluijters
ca42f01427 tag_id3: added support for the "album artist" tag 
Read the id3 tags "TPE2" and "TSO2" into the "album artist" tag.
 2009-01-14 22:38:55 +01:00
Jérôme Quelin
ae5517b0b3 allow ~/.mpd/mpd.conf as alternate config file 
mpd uses some additional files to work, such as pid_file, state_file,
db_file, etc. when running mpd as non-root user, it is often that those
files end in ~/.mpd

in that case, we end up with 2 entries in a user's home, .mpdconf and
.mpd - which clutters homedirs.

this patch allows ~/.mpd/mpd.conf as an alternative to ~/.mpdconf,
allowing for a cleaner homedir
 2009-01-14 14:31:55 +01:00
Max Kellermann
642b861526 song_save: don't fail on empty tag values 
If a tag value is an empty string, the space after the colon was
removed by g_strchomp().  Fix this by removing the space check and
using g_strchug() on the return value.
 2009-01-14 13:44:14 +01:00
Max Kellermann
3c6a85d8f7 song_save: return value pointer from matchesAnMpdTagItemKey() 
The matchesAnMpdTagItemKey() API becomes more powerful and flexible if
the return value is the value pointer instead of a boolean.  It also
removes (invalid and dangerous) assumptions about the string from its
caller.
 2009-01-14 13:43:57 +01:00
Max Kellermann
7cc9ba45a9 song_save: itemType is "enum tag_type", not "int" 2009-01-14 13:38:47 +01:00
Max Kellermann
2c540ee8a4 playlist: safely search the playlist for deleted song 
When a song file is deleted during database update, all pointers to it
must be removed from the playlist.  The "for" loop in
deleteASongFromPlaylist() did not deal with multiple copies of the
deleted song properly, and left instances of the (to-be-invalidated)
pointer in.  Fix this by reversing the loop.
 2009-01-14 11:42:45 +01:00
Max Kellermann
2af1742fcf tag: added core support for the "album artist" tag 
Added TAG_ITEM_ALBUM_ARTIST.

With this patch, MPD should be able to read the (inofficial)
"ALBUMARTIST" Vorbis comment.  Implementations in other decoder
plugins will follow soon.
 2009-01-13 23:43:20 +01:00
Max Kellermann
1452717459 song_save: check for colon and space when loading a tag 
matchesAnMpdTagItemKey() broke when two tag items had the same prefix,
because it did not check if the tag name ended after the prefix.  Add
a check for the colon and the space after the tag name.
 2009-01-13 23:43:16 +01:00
Joe Milbourn
45598d50e3 input_curl: honour http_proxy_* config directives 
If http_proxy_{host, port, user, password} are provided in mpd.conf
they are not passed on to libcurl. As a result mpd cannot stream from
behind an http proxy.

The attached patch `http_proxy.patch` makes the relevant calls to
curl_easy_setopt(...) for all proxy configuration parameters, but is
only tested for host and port.
 2009-01-13 22:57:05 +01:00
Max Kellermann
18cb34700e daemon: don't check the setsid() return value 
There is only one valid error condition for setsid(): when the current
process is already the process group leader.  This is non-critical.
 2009-01-13 21:45:44 +01:00
Max Kellermann
2532129755 daemon: don't fork twice to daemonize 
To detach from the parent process, fork once and make the old process
exit.  No need to do that twice.
 2009-01-13 21:44:42 +01:00
Max Kellermann
d8fc8ca7ba playlist: implement Fisher-Yates shuffle properly 
MPD's shuffling algorithm was not implemented well: it considers songs
which were already swapped, making it somewhat non-random.

Fix the Fisher-Yates shuffle algorithm by passing the proper bounds to
the PRNG.
 2009-01-13 21:25:19 +01:00
Max Kellermann
e7c7e652a3 input_curl: use select() to eliminate busy loop during connect 
When decoder_run_song() (decoder_thread.c) waits for the input stream
to become ready, it did that in a busy loop.  Add a select() call to
input_curl_buffer() during connect/handshake (i.e. before the first
chunk of body data was received), to let the CPU relax.
 2009-01-13 19:30:34 +01:00
Max Kellermann
d82061b7ff decoder_api: don't ignore DECODE_COMMAND_STOP 
When the decoder thread is waiting for free chunks in the music pipe,
don't ignore the STOP command.  Just return dc.command without further
checks.
 2009-01-13 18:15:25 +01:00
Max Kellermann
9069a244a4 configure.ac: added the --enable-sqlite option 
MPD will (optionall) use sqlite databases in the future.  Add a
configure option to enable that.  There is no code yet to really use
sqlite, so the practical use of this patch is limited.
 2009-01-12 09:56:14 +01:00
Max Kellermann
52cf7953ff Makefile.am: moved C/CPP/LDFLAGS up 2009-01-11 17:41:54 +01:00
Viliam Mateicka
d357f58542 removing mixer_reconfigure memmory leak, fixing configure of alsa and oss mixer (passing parameters) 2009-01-11 17:13:01 +01:00
Max Kellermann
983822ea52 command: restore the "playlistinfo -1" behavior 
If a range is "-1", display the whole list.  This behavior is
undocumented, but some clients rely on it.
 2009-01-11 17:11:11 +01:00
Max Kellermann
63d9827c34 main: remove "save_state" timer event on exit 2009-01-10 18:55:43 +01:00
Max Kellermann
0366adddbd client: remove "expire" event on exit 2009-01-10 18:55:39 +01:00
Max Kellermann
e3c6ad515d event_pipe: remove the GLib source from the main context 
Free memory before exiting.
 2009-01-10 18:55:36 +01:00
Max Kellermann
ca5432a79b listen: remove the socket source from the main context 
Free memory before exiting.
 2009-01-10 18:55:33 +01:00
Max Kellermann
d60cf67d19 listen: added struct listen_socket 
Make the listen socket an object, allowing us to add more fields
later.  Convert listenSockets into a simple linked list.
 2009-01-10 18:55:29 +01:00
Max Kellermann
a673d6be98 main: deinitialize main_notify on exit 2009-01-10 18:55:28 +01:00
Viliam Mateicka
11c29cccb3 Introducing mixer api 
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
 2009-01-10 17:55:38 +01:00
Max Kellermann
8ebe7bfb25 playlist: pass unsigned integers to playlistInfo() 
A song index cannot be negative.  Also require the second parameter to
be valid.
 2009-01-10 17:39:49 +01:00
Max Kellermann
b7c4b78846 playlist: exclude end of range 
In a range "start:end", "end" itself should not be included.  Use the
same semantics as other languages implementing ranges, e.g. Python.
 2009-01-10 17:05:03 +01:00
Thomas Jansen
6f0781f039 command: playlistinfo now uses a range argument rather than just a song id 
Loosely based on a patch provided by lesion in bug #1766. The playlistinfo
command can now retrieve ranges of the playlist. The new argument indicates
which entry is the last one that will be displayed. The number of displayed
entries may be smaller than expected if the end of the playlist is reached.

Previous usage:
playlistinfo [start]

New usage:
playlistinfo [start[:end]]
 2009-01-10 16:50:34 +01:00
Thomas Jansen
8ed3cf3e6b command: add a parser for range arguments 
A range argument looks like start[:end] and is used to specify the entries
of a list that should be returned (rather than the whole list).
 2009-01-10 16:48:12 +01:00
Max Kellermann
5e93d3682f added missing explicit config.h includes 2009-01-08 21:37:02 +01:00
Max Kellermann
1c2f24dfc6 mapper: use directory_is_root() instead of isRootDirectory() 2009-01-08 21:29:30 +01:00
Max Kellermann
f0b865b4ca path: include cleanup 2009-01-08 21:29:29 +01:00
Max Kellermann
c232ea10ed update: removed one more stack buffer 2009-01-08 21:29:21 +01:00
Max Kellermann
5ed5aa99ac path: allocate buffer in fs_charset conversion functions 
Don't use fixed static buffers.  GLib allocates a new string for us
anyway, let's just return this one instead of copying it.
 2009-01-08 21:20:46 +01:00
Max Kellermann
f0980283bc update: include config.h, fix archive code 
The archive code was disabled, because config.h was not included and
thus ENABLE_ARCHIVE was not defined.
 2009-01-08 21:20:41 +01:00
Stepan Pologov
7a9a1e3e31 mapper: re-add character set conversion in map_uri_fs() 2009-01-08 17:29:08 +01:00
Max Kellermann
628866a065 update: save the database even if it is empty 
Save an empty database, even if the music directory is empty.
 2009-01-08 07:36:40 +01:00
Max Kellermann
bb08679a70 pcm_resample: use pcm_buffer (2/2) 
Use the PCM buffer library for the libsamplerate output buffer.
 2009-01-08 00:47:04 +01:00
Max Kellermann
2a83138913 pcm_resample: use pcm_buffer (1/2) 
Return a temporary buffer from pcm_resample_*() and pcm_convert().
 2009-01-08 00:46:38 +01:00
Max Kellermann
aab85577bf pcm_channels: use pcm_buffer 
Replace a "static" buffer with the PCM buffer library.
 2009-01-07 23:56:35 +01:00
Max Kellermann
5fe7e3bc14 pcm_format: use the pcm_buffer library 
Replace a "static" buffer with the PCM buffer library.
 2009-01-07 23:56:34 +01:00
Max Kellermann
954c2b5a25 pcm_buffer: new library for temporary buffers 
This library allocates temporary buffers for storing PCM conversion
results.  It should replace all those "static" buffer variables which
are racy and never freed.
 2009-01-07 23:56:30 +01:00
Max Kellermann
bf058f978a output: join the output thread after sending the KILL command 
Be sure that the output thread has quite before we start destructing
the output object.
 2009-01-07 23:55:13 +01:00
Max Kellermann
405c102c17 output: deinitialize notify object 
Free memory allocated by the notify object (GMutex, GCond) when it's
not used by the output object anymore.
 2009-01-07 23:53:28 +01:00
Max Kellermann
97ae4a499a mapper: don't allocate music_dir twice 2009-01-07 23:53:28 +01:00
Max Kellermann
7f34e9410e pcm: added pcm_convert_deinit(), pcm_resample_deinit() 
Free memory allocated by libsamplerate when the output or the decoder
is closed.
 2009-01-07 22:20:30 +01:00
Max Kellermann
97b844ec72 pcm_volume: changed PCM_VOLUME_1 to 1024 
1024 is 2^10, and allows gcc to use bit shift operations instead of
multiplication / division.
 2009-01-07 21:40:35 +01:00
Max Kellermann
04a2138b33 pcm: pass void pointers to PCM functions 
In generic PCM functions allowing all sample formats, pass a void
pointer instead of a char pointer.
 2009-01-07 19:00:02 +01:00
Max Kellermann
bb01016400 Makefile.am: added mixer_api.h to mpd_headers 2009-01-07 18:55:26 +01:00
Max Kellermann
b40428b3fd pcm_utils: moved conversion code to pcm_convert.c 
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.
 2009-01-07 18:53:36 +01:00
Max Kellermann
8b19c74e8e pcm_format: pass struct pcm_dither_24 to pcm_convert_to_16() 
The function does not need the full pcm_convert_state struct.
 2009-01-07 18:19:22 +01:00
Max Kellermann
df30a29391 pcm_utils: moved code to pcm_format.c 
Moved all code which converts the sample format to a separate library.
 2009-01-07 18:19:09 +01:00
Max Kellermann
6768581c41 pcm_volume: rename pcm_dither() to pcm_volume_dither() 2009-01-07 18:08:26 +01:00
Max Kellermann
b7b5e3f9c3 pcm_prng: renamed prng() to pcm_prng() 2009-01-07 18:07:19 +01:00
Max Kellermann
3fd1fa31ca pcm_utils: moved code to pcm_mix.c 
Moved the software mixing code (used by crossfading) to a separate
library.
 2009-01-07 18:06:22 +01:00
Max Kellermann
9d0579996c pcm_utils: moved code to pcm_volume.c 
Moved the software volume code to a separate library.
 2009-01-07 18:05:38 +01:00
Max Kellermann
e8c323ed7e pcm_utils: export pcm_range() 
We are going to split the pcm_utils.c library, and pcm_range() will be
useful for several sub libraries.
 2009-01-07 18:03:53 +01:00
Max Kellermann
9cb76856c0 removed dlist.h 
Get rid of the non-portable Linux list library, part III (final).
 2009-01-07 16:31:47 +01:00
Max Kellermann
a4a8ac0cc3 curl: use GQueue instead of dlist.h for buffer list 
Get rid of the non-portable Linux list library, part II.
 2009-01-07 16:30:43 +01:00
Max Kellermann
fa503e31e7 client: use GList instead of dlist.h 
Get rid of the non-portable Linux list library, part I.
 2009-01-07 16:30:40 +01:00
Max Kellermann
91dfeff4b9 input_curl: disable "seekable" when icy-metadata is enabled 
Fix a typo in the icy-metadata patch.
 2009-01-07 10:31:30 +01:00
Max Kellermann
493f661fa4 locate: fix strcmp() return value check 
Yesterday's patch set changed tagItemFoundAndMatches() and moved the
strcmp() return value into a bool, but forgot to add the ==0 check.
 2009-01-05 12:50:04 +01:00
Max Kellermann
d9c2960a55 fix G_BYTE_ORDER check 
"#ifdef G_BYTE_ORDER == G_BIG_ENDIAN" cannot work, of course.
 2009-01-05 12:40:57 +01:00
Max Kellermann
0fb21e67ef configure.ac: use AC_CHECK_HEADERS to check for locale.h 
AC_CHECK_HEADERS defines HAVE_LOCALE_H, so we don't have to manually
define HAVE_LOCALE.
 2009-01-05 09:31:09 +01:00
Max Kellermann
ac0fe98ffb use GLib byte order macros 2009-01-05 08:17:22 +01:00
Max Kellermann
3516d8fc1d tag: allocate space for null terminator in clear_non_printable() 
Use g_strndup() instead of g_memdup().
 2009-01-04 21:24:22 +01:00
Max Kellermann
200ef56d4d database: use stdbool 
Make db_load(), db_save() and db_check() return bool instead of int.
 2009-01-04 21:18:40 +01:00
Max Kellermann
82166b715c database: db_init() initializes library, does not update 
For updating the database, directory_update_init() should be called
explicitly.
 2009-01-04 21:18:16 +01:00
Max Kellermann
6acba73509 stats: added stats_update() 2009-01-04 20:57:06 +01:00
Max Kellermann
5c477f6067 removed the "condition" library 
It's unused.
 2009-01-04 20:42:53 +01:00
Max Kellermann
60f809b331 update: use notify.h instead of condition.h 
The notify library is easier to use, and has no disadvantages.
 2009-01-04 20:42:43 +01:00
Max Kellermann
21173ea4a9 event_pipe: removed the unused function event_pipe_wait() 2009-01-04 20:32:45 +01:00
Max Kellermann
e4a53df7db don't exit after --create-db 
Start the daemon after --create-db.  This makes --create-db a flag
which discards the old database and starts with a fresh one.
 2009-01-04 20:31:23 +01:00
Max Kellermann
6fb8c54939 update: refresh stats when database update is finished 2009-01-04 20:30:27 +01:00
Max Kellermann
a9bd64b1dd update: splitted reap_update_task() 
Handle the DELETE and UPDATE events in separate callbacks:
song_delete_event() safely deletes a song, and update_finished_event()
is called when database update is complete.
 2009-01-04 20:30:23 +01:00
Max Kellermann
5e6ac50583 initialize GError pointers 
GLib mandates that you initialize all GError objects with NULL prior
to passing it.
 2009-01-04 19:51:54 +01:00
Max Kellermann
530f0b71de path, tag: don't allocate GError for charset conversion 
Pass NULL instead of &error to g_convert().  We're not interested in
the error object.
 2009-01-04 19:50:22 +01:00
Max Kellermann
da69382273 path: removed pfx_dir() 
Use GLib's g_build_filename() instead of pfx_dir().
 2009-01-04 19:37:19 +01:00
Viliam Mateicka
1a04e57168 renaming mixer.h to mixer_api.h 2009-01-04 19:15:18 +01:00
Max Kellermann
fed719197c song: allocate the result of song_get_url() 2009-01-04 19:09:34 +01:00
Max Kellermann
ea8ae68e6f directory: added directory_is_root() 
directory_is_root() is cheaper than
isRootDirectory(directory_get_path()).
 2009-01-04 19:08:52 +01:00
Max Kellermann
923d2c966f mapper: allocate the result of map_fs_to_utf8() 2009-01-04 18:59:47 +01:00
Max Kellermann
8c5470a3db playlist: log errors during loadPlaylist() 
Don't call command_error() if loading a song from the playlist fails.
This may result in assertion failures, since command_error() may be
called more than once.
 2009-01-04 18:59:32 +01:00
Max Kellermann
49ac6fa996 playlist: use GLib logging 2009-01-04 18:17:37 +01:00
Max Kellermann
45597cc571 ls: renamed functions, no CamelCase 2009-01-04 17:46:42 +01:00
Max Kellermann
6a008b52d1 update: removed struct delete_data 
The struct delete_data has only one member left and can be eliminated.
 2009-01-04 17:28:34 +01:00
Max Kellermann
ff72fff68d ls: removed hasMusicSuffix() and get_archive_by_suffix() 
Determine the suffix manually, and use decoder_plugin_from_suffix()
and archive_plugin_from_suffix() instead.

This way, song_file_update_inarchive() can be optimized: it does not
have to translate its path.
 2009-01-04 17:26:22 +01:00
Max Kellermann
d6b229e35c update: moved code to update_regular_file() 2009-01-04 17:26:18 +01:00
Max Kellermann
8a562c9c71 song: removed duplicate '\n' check 
Newline characters are already checked in skip_path() (update.c).
 2009-01-04 17:26:15 +01:00
Max Kellermann
77d3643036 ls: include cleanup 
Don't include headers which are not used.  Fix some includes in
decoder_thread.c.
 2009-01-04 17:26:12 +01:00
Max Kellermann
599d5820bc update: moved code to directory_exists(), fix typo 
Reverse the condition: delete directories which don't exist anymore.
This typo caused a slowdown during partial database update.
 2009-01-04 17:26:07 +01:00
Max Kellermann
17d8bdb427 playlist: use uri_has_scheme() instead of isRemoteUrl() 
For internal checks (i.e. not in command.c), we need to check whether
an URI is in the databse, in the local file system or a remote URI
with a scheme.
 2009-01-04 16:23:33 +01:00