diff options
author | Alexander Levin <al.le@rockbox.org> | 2011-12-22 18:56:11 +0000 |
---|---|---|
committer | Alexander Levin <al.le@rockbox.org> | 2011-12-22 18:56:11 +0000 |
commit | 7f7a2d3b13f96637549998cfaa36148c62f4b8cc (patch) | |
tree | 0d4df8fbf35d22c0b5d1da85f32242cdb19f910e | |
parent | 63c4ef9f57fa6947f9244e087180d9d5781c1032 (diff) | |
download | rockbox-7f7a2d3b13f96637549998cfaa36148c62f4b8cc.tar.gz rockbox-7f7a2d3b13f96637549998cfaa36148c62f4b8cc.zip |
Rename 'mp3entry.embed_cuesheet' to 'mp3entry.embedded_cuesheet' and pull out a field (FS#12473)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31406 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/cuesheet.c | 8 | ||||
-rw-r--r-- | apps/metadata.c | 4 | ||||
-rw-r--r-- | apps/metadata.h | 3 | ||||
-rw-r--r-- | apps/metadata/id3tags.c | 8 | ||||
-rw-r--r-- | apps/metadata/vorbis.c | 8 |
5 files changed, 16 insertions, 15 deletions
diff --git a/apps/cuesheet.c b/apps/cuesheet.c index 2c2567b391..354f976997 100644 --- a/apps/cuesheet.c +++ b/apps/cuesheet.c | |||
@@ -49,11 +49,11 @@ bool look_for_cuesheet_file(struct mp3entry *track_id3, struct cuesheet_file *cu | |||
49 | char cuepath[MAX_PATH]; | 49 | char cuepath[MAX_PATH]; |
50 | char *dot, *slash; | 50 | char *dot, *slash; |
51 | 51 | ||
52 | if (track_id3->embed_cuesheet.present) | 52 | if (track_id3->has_embedded_cuesheet) |
53 | { | 53 | { |
54 | cue_file->pos = track_id3->embed_cuesheet.pos; | 54 | cue_file->pos = track_id3->embedded_cuesheet.pos; |
55 | cue_file->size = track_id3->embed_cuesheet.size; | 55 | cue_file->size = track_id3->embedded_cuesheet.size; |
56 | cue_file->encoding = track_id3->embed_cuesheet.encoding; | 56 | cue_file->encoding = track_id3->embedded_cuesheet.encoding; |
57 | strlcpy(cue_file->path, track_id3->path, MAX_PATH); | 57 | strlcpy(cue_file->path, track_id3->path, MAX_PATH); |
58 | return true; | 58 | return true; |
59 | } | 59 | } |
diff --git a/apps/metadata.c b/apps/metadata.c index 898436781b..2a93c1880c 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -439,8 +439,8 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname) | |||
439 | id3->codectype = probe_file_format(trackname); | 439 | id3->codectype = probe_file_format(trackname); |
440 | 440 | ||
441 | /* default values for embedded cuesheets */ | 441 | /* default values for embedded cuesheets */ |
442 | id3->embed_cuesheet.present = false; | 442 | id3->has_embedded_cuesheet = false; |
443 | id3->embed_cuesheet.pos = 0; | 443 | id3->embedded_cuesheet.pos = 0; |
444 | 444 | ||
445 | entry = &audio_formats[id3->codectype]; | 445 | entry = &audio_formats[id3->codectype]; |
446 | 446 | ||
diff --git a/apps/metadata.h b/apps/metadata.h index 707e5c2c37..2e16f4d47e 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -322,7 +322,8 @@ struct mp3entry { | |||
322 | #endif | 322 | #endif |
323 | 323 | ||
324 | /* Cuesheet support */ | 324 | /* Cuesheet support */ |
325 | struct embedded_cuesheet embed_cuesheet; | 325 | bool has_embedded_cuesheet; |
326 | struct embedded_cuesheet embedded_cuesheet; | ||
326 | struct cuesheet *cuesheet; | 327 | struct cuesheet *cuesheet; |
327 | 328 | ||
328 | /* Musicbrainz Track ID */ | 329 | /* Musicbrainz Track ID */ |
diff --git a/apps/metadata/id3tags.c b/apps/metadata/id3tags.c index 85025c61b1..2dd1c662ed 100644 --- a/apps/metadata/id3tags.c +++ b/apps/metadata/id3tags.c | |||
@@ -1029,12 +1029,12 @@ void setid3v2title(int fd, struct mp3entry *entry) | |||
1029 | break; | 1029 | break; |
1030 | } | 1030 | } |
1031 | if (char_enc > 0) { | 1031 | if (char_enc > 0) { |
1032 | entry->embed_cuesheet.present = true; | 1032 | entry->has_embedded_cuesheet = true; |
1033 | entry->embed_cuesheet.pos = lseek(fd, 0, SEEK_CUR) | 1033 | entry->embedded_cuesheet.pos = lseek(fd, 0, SEEK_CUR) |
1034 | - framelen + cuesheet_offset; | 1034 | - framelen + cuesheet_offset; |
1035 | entry->embed_cuesheet.size = totframelen | 1035 | entry->embedded_cuesheet.size = totframelen |
1036 | - cuesheet_offset; | 1036 | - cuesheet_offset; |
1037 | entry->embed_cuesheet.encoding = char_enc; | 1037 | entry->embedded_cuesheet.encoding = char_enc; |
1038 | } | 1038 | } |
1039 | break; | 1039 | break; |
1040 | } | 1040 | } |
diff --git a/apps/metadata/vorbis.c b/apps/metadata/vorbis.c index 29848daa19..58bd781873 100644 --- a/apps/metadata/vorbis.c +++ b/apps/metadata/vorbis.c | |||
@@ -353,10 +353,10 @@ long read_vorbis_tags(int fd, struct mp3entry *id3, | |||
353 | /* Is it an embedded cuesheet? */ | 353 | /* Is it an embedded cuesheet? */ |
354 | if (!strcasecmp(name, "CUESHEET")) | 354 | if (!strcasecmp(name, "CUESHEET")) |
355 | { | 355 | { |
356 | id3->embed_cuesheet.present = true; | 356 | id3->has_embedded_cuesheet = true; |
357 | id3->embed_cuesheet.pos = lseek(file.fd, 0, SEEK_CUR) - read_len; | 357 | id3->embedded_cuesheet.pos = lseek(file.fd, 0, SEEK_CUR) - read_len; |
358 | id3->embed_cuesheet.size = len; | 358 | id3->embedded_cuesheet.size = len; |
359 | id3->embed_cuesheet.encoding = CHAR_ENC_UTF_8; | 359 | id3->embedded_cuesheet.encoding = CHAR_ENC_UTF_8; |
360 | } | 360 | } |
361 | else | 361 | else |
362 | { | 362 | { |