dbf6d24765
2) - cdio_get_cdtext no longer takes track as an argument - cdtext_get, cdtext_get_const, cdtext_set require track argument 3) Language, Genre, Genre Code and Encoding Fields are now properly parsed and stored in the cdtext object 4) Added public function cdio_get_cdtext_raw to extract the binary CD-Text 5) Added CDTEXTFILE keyword logic in cue sheet parser. Parses binary/raw CD-Text files 6) Added cdtext_genre2str to convert genre code 7) altered the example programs, test drivers, cdda-player and cd-info to work with these changes 8) Added test case 9) A few smaller changes A disc either holds CD-Text for all the tracks or does not hold any. Therefore a CD-Text object for the whole disc seems more natural to me. It also enables us to store global fields, like genre, encoding, language. Patch was tested on GNU/Linux 32 bit running Gentoo.
80 lines
2.8 KiB
C
80 lines
2.8 KiB
C
/*
|
|
Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/*!
|
|
Header for image drivers. In contrast to image_common.h which contains
|
|
routines, this header like most C headers does not depend on anything
|
|
defined before it is included.
|
|
*/
|
|
|
|
#ifndef __CDIO_IMAGE_H__
|
|
#define __CDIO_IMAGE_H__
|
|
|
|
#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__)
|
|
# include "config.h"
|
|
# define __CDIO_CONFIG_H__ 1
|
|
#endif
|
|
|
|
#include <cdio/types.h>
|
|
#include <cdio/cdtext.h>
|
|
#include "cdio_private.h"
|
|
#include <cdio/sector.h>
|
|
|
|
/*!
|
|
The universal format for information about a track for CD image readers
|
|
It may be that some fields can be derived from other fields.
|
|
Over time this structure may get cleaned up. Possibly this can be
|
|
expanded/reused for real CD formats.
|
|
*/
|
|
|
|
typedef struct {
|
|
track_t track_num; /**< Probably is index+1 */
|
|
msf_t start_msf;
|
|
lba_t start_lba;
|
|
int start_index;
|
|
lba_t pregap; /**< pre-gap */
|
|
lba_t silence; /**< pre-gap with zero audio data */
|
|
int sec_count; /**< Number of sectors in this track. Does not
|
|
include pregap */
|
|
int num_indices;
|
|
flag_t flags; /**< "[NO] COPY", "4CH", "[NO] PREMPAHSIS" */
|
|
char *isrc; /**< IRSC Code (5.22.4) exactly 12 bytes */
|
|
char *filename;
|
|
CdioDataSource_t *data_source;
|
|
off_t offset; /**< byte offset into data_start of track
|
|
beginning. In cdrdao for example, one
|
|
filename may cover many tracks and
|
|
each track would then have a different
|
|
offset.
|
|
*/
|
|
track_format_t track_format;
|
|
bool track_green;
|
|
|
|
trackmode_t mode;
|
|
uint16_t datasize; /**< How much is in the portion we return
|
|
back? */
|
|
uint16_t datastart; /**< Offset from begining of frame
|
|
that data starts */
|
|
uint16_t endsize; /**< How much stuff at the end to skip over.
|
|
This stuff may have error correction
|
|
(EDC, or ECC).*/
|
|
uint16_t blocksize; /**< total block size = start + size + end */
|
|
} track_info_t;
|
|
|
|
|
|
#endif /* __CDIO_IMAGE_H__ */
|