Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-02 14:17:07 +01:00
Code Issues Releases Wiki Activity

Fix for bug 2072

Browse Source 
id3_length_t is defined as "unsigned long" in id3tag.h, but is undefined
when building without libid3tag.
This commit is contained in:
Steve Daulton
2019-03-10 17:35:52 +00:00
parent e832b6895e
commit 8012f6b2dd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/export/ExportMP3.cpp
View File

@@ -1619,7 +1619,7 @@ private:
int FindValue(CHOICES *choices, int cnt, int needle, int def); int FindValue(CHOICES *choices, int cnt, int needle, int def);
wxString FindName(CHOICES *choices, int cnt, int needle); wxString FindName(CHOICES *choices, int cnt, int needle);
int AskResample(int bitrate, int rate, int lowrate, int highrate); int AskResample(int bitrate, int rate, int lowrate, int highrate);
id3_length_t AddTags(AudacityProject *project, ArrayOf<char> &buffer, bool *endOfFile, const Tags *tags); unsigned long AddTags(AudacityProject *project, ArrayOf<char> &buffer, bool *endOfFile, const Tags *tags);
#ifdef USE_LIBID3TAG #ifdef USE_LIBID3TAG
void AddFrame(struct id3_tag *tp, const wxString & n, const wxString & v, const char *name); void AddFrame(struct id3_tag *tp, const wxString & n, const wxString & v, const char *name);
#endif #endif
@@ -1801,7 +1801,7 @@ ProgressResult ExportMP3::Export(AudacityProject *project,
ArrayOf<char> id3buffer; ArrayOf<char> id3buffer;
bool endOfFile; bool endOfFile;
id3_length_t id3len = AddTags(project, id3buffer, &endOfFile, metadata); unsigned long id3len = AddTags(project, id3buffer, &endOfFile, metadata);
if (id3len && !endOfFile) { if (id3len && !endOfFile) {
if (id3len > outFile.Write(id3buffer.get(), id3len)) { if (id3len > outFile.Write(id3buffer.get(), id3len)) {
// TODO: more precise message // TODO: more precise message
@@ -2051,7 +2051,7 @@ using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
#endif #endif
// returns buffer len; caller frees // returns buffer len; caller frees
id3_length_t ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf<char> &buffer, bool *endOfFile, const Tags *tags) unsigned long ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf<char> &buffer, bool *endOfFile, const Tags *tags)
{ {
#ifdef USE_LIBID3TAG #ifdef USE_LIBID3TAG
id3_tag_holder tp { id3_tag_new() }; id3_tag_holder tp { id3_tag_new() };
@@ -2100,7 +2100,7 @@ id3_length_t ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf<char
*endOfFile = false; *endOfFile = false;
id3_length_t len; unsigned long len;
len = id3_tag_render(tp.get(), 0); len = id3_tag_render(tp.get(), 0);
buffer.reinit(len); buffer.reinit(len);