aboutsummaryrefslogtreecommitdiffstats
path: root/src/tag.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* conf: no CamelCase, part IMax Kellermann2009-01-171-2/+2
| | | | Renamed functions, types, variables.
* tag: added tag_get_value()Max Kellermann2009-01-151-3/+9
|
* tag: added core support for the "album artist" tagMax Kellermann2009-01-131-0/+1
| | | | | | | | 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.
* tag: allocate space for null terminator in clear_non_printable()Max Kellermann2009-01-041-3/+1
| | | | Use g_strndup() instead of g_memdup().
* path, tag: don't allocate GError for charset conversionMax Kellermann2009-01-041-5/+2
| | | | | Pass NULL instead of &error to g_convert(). We're not interested in the error object.
* tag: added function tag_merge()Max Kellermann2009-01-031-0/+46
| | | | tag_merges() merges the data from two tag objects into one.
* tag: revert g_strescape() patchMax Kellermann2009-01-031-7/+56
| | | | | | Don't use g_strescape(), because it escapes all non-ASCII characters. Add a new function which clears all non-printable characters, not just "newline".
* tag: use g_strescape() to eliminate evil charactersMax Kellermann2009-01-031-18/+22
| | | | | This always allocates strings on the heap, but we can delete the stripReturnChar() function now.
* tag & tag_pool: migrate from pthread to glib threadsThomas Jansen2008-12-281-8/+8
|
* tag: added function tag_has_type()Max Kellermann2008-11-031-0/+12
| | | | | tag_has_type() checks whether the tag contains one or more items with the specified type.
* tag: use GLib instead of utils.hMax Kellermann2008-11-011-8/+10
| | | | Don't use the deprecated functions from utils.h.
* utils: use GUINT32_FROM_LE() instead of readLEuint32()Max Kellermann2008-11-011-8/+8
| | | | Eliminate code already provided by GLib.
* tag: don't return const string from fix_utf8()Max Kellermann2008-11-011-13/+13
| | | | | Return NULL instead of the input value if there is nothing to fix. This way, the caller doesn't have to use the xfree() hack.
* removed UTF-8 library, use GLib insteadMax Kellermann2008-10-311-4/+12
| | | | Removed duplicated code.
* don't include os_compat.hMax Kellermann2008-10-081-0/+2
| | | | | When there are standardized headers, use these instead of the bloated os_compat.h.
* tag: merge clearMpdTag into tag_freeEric Wong2008-10-061-12/+2
| | | | | avoid some redundant clearing logic as well, since the tag is getting freed.
* Switch to C99 types (retaining compat with old compilers)Eric Wong2008-09-291-1/+1
| | | | | | | | | | | | | | | Seeing the "mpd_" prefix _everywhere_ is mind-numbing as the mind needs to retrain itself to skip over the first 4 tokens of a type to get to its meaning. So avoid having extra characters on my terminal to make it easier to follow code at 2:30 am in the morning. Please report any new issues you may come across on Free toolchains. I realize how difficult it can be to build/maintain cross-compiling toolchains and I have no intention of forcing people to upgrade their toolchains to build mpd. Tested with gcc 2.95.4 and and gcc 4.3.1 on x86-32.
* use strset.h instead of tagTracker.hMax Kellermann2008-09-081-1/+0
| | | | | | | 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.
* tag: oops, of course items is now ** and not *Eric Wong2008-09-071-2/+2
| | | | | | Gah, it seems like doing sizeof here either way is error prone. Too easy to leave out a '*' character we can forget.
* tag: lock all accesses to tag_poolEric Wong2008-09-071-6/+10
| | | | | | | | | | 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.
* tag: introduce handy items_size() functionEric Wong2008-09-071-11/+12
| | | | | | | | | | | 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.
* tag: moved code to tag_print.cMax Kellermann2008-09-071-25/+2
| | | | | Move everything which dumps a tag to a file descriptor to tag_print.c. This relaxes dependencies and splits the code into smaller parts.
* tag: fix segfault on updateEric Wong2008-09-061-14/+21
| | | | | | | | | | | | 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.
* tag: optimize tag_dup(), copy item referencesMax Kellermann2008-08-291-1/+3
| | | | | Don't call tag_pool_get_item() for duplicating tags, just increase the item's reference counter instead.
* const pointersMax Kellermann2008-08-291-4/+4
| | | | Yet another patch which converts pointer arguments to "const".
* tag: try not to reallocate tag.items in every add() callMax Kellermann2008-08-291-2/+60
| | | | | | | | | | | | | | | | If many tag_items are added at once while the tag cache is being loaded, manage these items in a static fixed list, instead of reallocating the list with every newly created item. This reduces heap fragmentation. Massif results again: mk before: total 12,837,632; useful 10,626,383; extra 2,211,249 mk now: total 12,736,720; useful 10,626,383; extra 2,110,337 The "useful" value is the same since this patch only changes the way we allocate the same amount of memory, but heap fragmentation was reduced by 5%.
* tag: try not to duplicate the input stringMax Kellermann2008-08-291-13/+18
| | | | | | Try to detect if the string needs Latin1-UTF8 conversion, or whitespace cleanup. If not, we don't need to allocate temporary memory, leading to decreased heap fragmentation.
* tag: pass length to fix_utf8()Max Kellermann2008-08-291-3/+4
| | | | Same as the previous patch, prepare the function fix_utf8() this time.
* added "length" parameter to validUtf8String()Max Kellermann2008-08-291-1/+1
| | | | | | | At several places, we create temporary copies of non-null-terminated strings, just to use them in functions like validUtf8String(). We can save this temporary allocation and avoid heap fragmentation if we add a length parameter instead of expecting a null-terminated string.
* assert value!=NULL in fix_utf8()Max Kellermann2008-08-291-1/+3
| | | | | We must never pass value==NULL to fix_utf(). Replace the run-time check with an assertion.
* tag: converted macro fixUtf8() to an inline functionMax Kellermann2008-08-291-9/+11
| | | | | | | Since the inline function cannot modify its caller's variables (which is a good thing for code readability), the new string pointer is the return value. The resulting binary should be the same as with the macro.
* tag: added a pool for tag itemsMax Kellermann2008-08-291-5/+4
| | | | | | | | | | | | | | | | | | | The new source tag_pool.c manages a pool of reference counted tag_item objects. This is used to merge tag items of the same type and value, saving lots of memory. Formerly, only the value itself was pooled, wasting memory for all the pointers and tag_item structs. The following results were measured with massif. Started MPD on amd64, typed "mpc", no song being played. My music database contains 35k tagged songs. The results are what massif reports as "peak". 0.13.2: total 14,131,392; useful 11,408,972; extra 2,722,420 eric: total 18,370,696; useful 15,648,182; extra 2,722,514 mk f34f694: total 15,833,952; useful 13,111,470; extra 2,722,482 mk now: total 12,837,632; useful 10,626,383; extra 2,211,249 This patch set saves 20% memory, and does a good job in reducing heap fragmentation.
* tag: converted tag_item.value to a char arrayMax Kellermann2008-08-291-4/+3
| | | | | | | The value is stored in the same memory allocation as the tag_item struct; this saves memory because we do not store the value pointer anymore. Also remove the getTagItemString()/removeTagItemString() dummies.
* tag: converted MpdTag.items to a pointer listMax Kellermann2008-08-291-10/+13
| | | | | | This prepares the following patches, which aim to reduce MPD's memory usage: we plan to share tag_item instances, instead of just their values.
* tag: moved code to tag_id3.cMax Kellermann2008-08-291-340/+0
| | | | | The ID3 code uses only the public tag API, but is otherwise unrelated. Move it to a separate source file.
* tag: renamed functions, no CamelCaseMax Kellermann2008-08-291-24/+24
|
* tag: renamed MpdTag and MpdTagItem to struct tag, struct mpd_tag_itemMax Kellermann2008-08-291-22/+23
| | | | | Getting rid of CamelCase; not having typedefs also allows us to forward-declare the structures.
* const pointersMax Kellermann2008-08-281-2/+2
| | | | The usual bunch of pointer arguments which should be const.
* unsigned integers and size_tMax Kellermann2008-08-281-4/+3
| | | | | Use "unsigned int" whenever negative values are not meaningful. Use size_t whenever we are going to describe buffer sizes.
* converted MpdTagItem.type to an enumMax Kellermann2008-08-261-3/+5
| | | | | Don't use CPP macros when you can use C enum... this also allows better type checking.
* clean up CPP includesMax Kellermann2008-04-121-4/+0
| | | | | | | | | Try to only include headers which are really needed. We should particularly check all "headers including other headers". The long-term goal is to have a manageable, small API for plugins (decoders, output) without so many mpd internals cluttering the namespace. git-svn-id: https://svn.musicpd.org/mpd/trunk@7319 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* yet more unsigned integersMax Kellermann2008-04-121-2/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@7287 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* whitespace cleanupMax Kellermann2008-04-121-67/+67
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@7286 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* use size_tMax Kellermann2008-03-261-4/+4
| | | | | | | | When dealing with in-memory lengths, the standard type "size_t" should be used. Missing one can be quite dangerous, because an attacker could provoke an integer under-/overflow, which may provide an attack vector. git-svn-id: https://svn.musicpd.org/mpd/trunk@7205 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* eliminated duplicate initializationMax Kellermann2008-03-261-5/+5
| | | | | | | Local variables which are never read before the first assignment don't need initialization. Saves a few bytes of text. Also don't reset variables which are never read until function return. git-svn-id: https://svn.musicpd.org/mpd/trunk@7199 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* fix -Wconst warningsMax Kellermann2008-02-051-3/+4
| | | | | | [ew: cleaned up the dirty union hack a bit] Signed-off-by: Eric Wong <normalperson@yhbt.net> git-svn-id: https://svn.musicpd.org/mpd/trunk@7180 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* fixed -Wshadow warningsMax Kellermann2008-01-261-14/+14
| | | | | Signed-off-by: Eric Wong <normalperson@yhbt.net> git-svn-id: https://svn.musicpd.org/mpd/trunk@7143 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Cleanup #includes of standard system headers and put them in one placeEric Wong2008-01-031-7/+1
| | | | | | | | | | | | | This will make refactoring features easier, especially now that pthreads support and larger refactorings are on the horizon. Hopefully, this will make porting to other platforms (even non-UNIX-like ones for masochists) easier, too. os_compat.h will house all the #includes for system headers considered to be the "core" of MPD. Headers for optional features will be left to individual source files. git-svn-id: https://svn.musicpd.org/mpd/trunk@7130 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Merge branches/ew r7104Eric Wong2007-12-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread-safety work in preparation for rewrite to use pthreads Expect no regressions against trunk (r7078), possibly minor performance improvements in update (due to fewer heap allocations), but increased stack usage. Applied the following patches: * maxpath_str for reentrancy (temporary fix, reverted) * path: start working on thread-safe variants of these methods * Re-entrancy work on path/character-set conversions * directory.c: exploreDirectory() use reentrant functions here * directory/update: more use of reentrant functions + cleanups * string_toupper: a strdup-less version of strDupToUpper * get_song_url: a static-variable-free version of getSongUrl() * Use reentrant/thread-safe get_song_url everywhere * replace rmp2amp with the reentrant version, rmp2amp_r * Get rid of the non-reentrant/non-thread-safe rpp2app, too. * buffer2array: assert strdup() returns a usable value in unit tests * replace utf8ToFsCharset and fsCharsetToUtf8 with thread-safe variants * fix storing playlists w/o absolute paths * parent_path(), a reentrant version of parentPath() * parentPath => parent_path for reentrancy and thread-safety * allow "make test" to automatically run embedded unit tests * remove convStrDup() and maxpath_str() * use MPD_PATH_MAX everywhere instead of MAXPATHLEN * path: get rid of appendSlash, pfx_path and just use pfx_dir * get_song_url: fix the ability to play songs in the top-level music_directory git-svn-id: https://svn.musicpd.org/mpd/trunk@7106 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* When parsing id3_frames take in account that there are different framesQball Cow2007-11-211-40/+137
| | | | | | | and with different field types. This fixes comments for id3v1 and id3v2 git-svn-id: https://svn.musicpd.org/mpd/trunk@7040 09075e82-0dd4-0310-85a5-a0d7c8717e4f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 20:00:53 +0000