mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

mp3dec: work around improper usage of private function

Browse Source
This commit is contained in:
Stefan Seyfried
2013-01-13 17:38:26 +01:00
parent dbf7f9719b
commit 51bdbb8c8c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/audiodec/mp3dec.cpp
View File

@@ -71,8 +71,8 @@ void sanalyzer_render_freq(short data[1024]);
finish_file function. */ finish_file function. */
extern "C" extern "C"
{ {
void id3_tag_addref(struct id3_tag *); //void id3_tag_addref(struct id3_tag *);
void id3_tag_delref(struct id3_tag *); void my_id3_tag_delref(struct id3_tag *);
struct filetag { struct filetag {
struct id3_tag *tag; struct id3_tag *tag;
unsigned long location; unsigned long location;
@@ -1349,7 +1349,7 @@ void id3_finish_file(struct id3_file* file)
free(file->path); free(file->path);
if (file->primary) { if (file->primary) {
id3_tag_delref(file->primary); my_id3_tag_delref(file->primary);
id3_tag_delete(file->primary); id3_tag_delete(file->primary);
} }
@@ -1358,7 +1358,7 @@ void id3_finish_file(struct id3_file* file)
tag = file->tags[i].tag; tag = file->tags[i].tag;
if (tag) { if (tag) {
id3_tag_delref(tag); my_id3_tag_delref(tag);
id3_tag_delete(tag); id3_tag_delete(tag);
} }
} }
@@ -1369,3 +1369,10 @@ void id3_finish_file(struct id3_file* file)
free(file); free(file);
} }
/* copy of id3_tag_delref, since a properly built libid3tag does
* not export this (it's not part of the public API... */
void my_id3_tag_delref(struct id3_tag *tag)
{
assert(tag && tag->refcount > 0);
--tag->refcount;
}