aboutsummaryrefslogtreecommitdiffstats
path: root/src/tag.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* song_save: don't call tag_free(NULL)Max Kellermann2009-04-281-0/+2
| | | | | | When a song was in the database twice (which shouldn't happen), and the first song had no tag items, MPD calledd tag_free(NULL). Add a check to that source location, and an assertion to tag_free().
* tag: use g_ascii_strcasecmp() instead of strcasecmp()Max Kellermann2009-04-281-2/+2
| | | | | strcasecmp() is locale dependent, making it a bad choice for internal string comparisons.
* log: removed DEBUG() and FATAL()Max Kellermann2009-03-151-3/+2
| | | | Use GLib the logging functions g_debug(), g_error() instead.
* all: Update copyright header.Avuton Olrich2009-03-131-6/+7
| | | | | | | | 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.
* tag: convert ignore_tag_items to a bool arrayMax Kellermann2009-03-011-5/+5
|
* tag: no CamelCaseMax Kellermann2009-03-011-8/+8
| | | | Renamed functions and variables.
* tag: moved APE code to tag_ape.cMax Kellermann2009-02-281-120/+0
|
* tag: don't accept invalid UTF-8 sequencesMax Kellermann2009-02-271-5/+27
| | | | Overwrite invalid UTF-8 sequences with question marks.
* tag: make tag.num_items unsignedMax Kellermann2009-02-271-13/+4
| | | | | | There's no point in declaring num_items as a uint8_t, it doesn't save any space, due to padding. This allows us to lift the articial "255 items" limitation.
* tag: no CamelCaseMax Kellermann2009-02-271-37/+38
| | | | Renamed numOfItems to num_items.
* tag: make tag_equal() return boolMax Kellermann2009-02-271-12/+12
|
* tag: fixed typo in MUSICBRAINZ_TRACKID tag nameMax Kellermann2009-02-171-1/+1
|
* tag: remove unused variable paramLaszlo Ashin2009-01-251-3/+2
| | | | This variable doesn't have a role since 80799fa8.
* use g_free() instead of free()Max Kellermann2009-01-251-8/+6
| | | | | | On some platforms, g_free() must be used for memory allocated by GLib. This patch intends to correct a lot of occurrences, but is probably not complete.
* conf: const pointers in block get functionsMax Kellermann2009-01-251-1/+1
| | | | | All config_get_block_*() functions should accept constant config_param pointers.
* use config_get_string() instead of config_get_param()Max Kellermann2009-01-251-5/+5
| | | | | config_get_string() is easier to use than config_get_param() because it unpacks the config_param struct.
* tag: added support for MusicBrainz tagsMax Kellermann2009-01-241-1/+7
| | | | | | | | | Added all important id tags from the MusicBrainz wiki: http://musicbrainz.org/doc/MusicBrainzTag This should automatically enable its suport in the vorbis and flac decoder plugins.
* 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.