itdb.h   itdb.h 
skipping to change at line 122 skipping to change at line 122
* @ITDB_IPOD_GENERATION_NANO_4: Fourth Generation iPod Nano * @ITDB_IPOD_GENERATION_NANO_4: Fourth Generation iPod Nano
* @ITDB_IPOD_GENERATION_NANO_5: Fifth Generation iPod Nano (with camera ) * @ITDB_IPOD_GENERATION_NANO_5: Fifth Generation iPod Nano (with camera )
* @ITDB_IPOD_GENERATION_VIDEO_1: First Generation iPod Video (aka 5g) * @ITDB_IPOD_GENERATION_VIDEO_1: First Generation iPod Video (aka 5g)
* @ITDB_IPOD_GENERATION_VIDEO_2: Second Generation iPod Video (aka 5.5g) * @ITDB_IPOD_GENERATION_VIDEO_2: Second Generation iPod Video (aka 5.5g)
* @ITDB_IPOD_GENERATION_CLASSIC_1: First Generation iPod Classic * @ITDB_IPOD_GENERATION_CLASSIC_1: First Generation iPod Classic
* @ITDB_IPOD_GENERATION_CLASSIC_2: Second Generation iPod Classic * @ITDB_IPOD_GENERATION_CLASSIC_2: Second Generation iPod Classic
* @ITDB_IPOD_GENERATION_CLASSIC_3: Third Generation iPod Classic * @ITDB_IPOD_GENERATION_CLASSIC_3: Third Generation iPod Classic
* @ITDB_IPOD_GENERATION_TOUCH_1: First Generation iPod Touch * @ITDB_IPOD_GENERATION_TOUCH_1: First Generation iPod Touch
* @ITDB_IPOD_GENERATION_TOUCH_2: Second Generation iPod Touch * @ITDB_IPOD_GENERATION_TOUCH_2: Second Generation iPod Touch
* @ITDB_IPOD_GENERATION_TOUCH_3: Third Generation iPod Touch * @ITDB_IPOD_GENERATION_TOUCH_3: Third Generation iPod Touch
* @ITDB_IPOD_GENERATION_TOUCH_4: Fourth Generation iPod Touch
* @ITDB_IPOD_GENERATION_IPHONE_1: First Generation iPhone * @ITDB_IPOD_GENERATION_IPHONE_1: First Generation iPhone
* @ITDB_IPOD_GENERATION_IPHONE_2: Second Generation iPhone (aka iPhone 3G ) * @ITDB_IPOD_GENERATION_IPHONE_2: Second Generation iPhone (aka iPhone 3G )
* @ITDB_IPOD_GENERATION_IPHONE_3: Third Generation iPhone (aka iPhone 3GS ) * @ITDB_IPOD_GENERATION_IPHONE_3: Third Generation iPhone (aka iPhone 3GS )
* @ITDB_IPOD_GENERATION_IPHONE_4: Fourth Generation iPhone * @ITDB_IPOD_GENERATION_IPHONE_4: Fourth Generation iPhone
* *
* iPod generation information * iPod generation information
* *
* See http://support.apple.com/kb/HT1353 and http://en.wikipedia.org/wiki/ IPod * See http://support.apple.com/kb/HT1353 and http://en.wikipedia.org/wiki/ IPod
* for more details. * for more details.
* *
skipping to change at line 165 skipping to change at line 166
ITDB_IPOD_GENERATION_TOUCH_1, ITDB_IPOD_GENERATION_TOUCH_1,
ITDB_IPOD_GENERATION_IPHONE_1, ITDB_IPOD_GENERATION_IPHONE_1,
ITDB_IPOD_GENERATION_SHUFFLE_4, ITDB_IPOD_GENERATION_SHUFFLE_4,
ITDB_IPOD_GENERATION_TOUCH_2, ITDB_IPOD_GENERATION_TOUCH_2,
ITDB_IPOD_GENERATION_IPHONE_2, ITDB_IPOD_GENERATION_IPHONE_2,
ITDB_IPOD_GENERATION_IPHONE_3, ITDB_IPOD_GENERATION_IPHONE_3,
ITDB_IPOD_GENERATION_CLASSIC_3, ITDB_IPOD_GENERATION_CLASSIC_3,
ITDB_IPOD_GENERATION_NANO_5, ITDB_IPOD_GENERATION_NANO_5,
ITDB_IPOD_GENERATION_TOUCH_3, ITDB_IPOD_GENERATION_TOUCH_3,
ITDB_IPOD_GENERATION_IPAD_1, ITDB_IPOD_GENERATION_IPAD_1,
ITDB_IPOD_GENERATION_IPHONE_4 ITDB_IPOD_GENERATION_IPHONE_4,
ITDB_IPOD_GENERATION_TOUCH_4,
ITDB_IPOD_GENERATION_NANO_6
} Itdb_IpodGeneration; } Itdb_IpodGeneration;
/** /**
* Itdb_IpodModel: * Itdb_IpodModel:
* @ITDB_IPOD_MODEL_INVALID: Invalid model * @ITDB_IPOD_MODEL_INVALID: Invalid model
* @ITDB_IPOD_MODEL_UNKNOWN: Unknown model * @ITDB_IPOD_MODEL_UNKNOWN: Unknown model
* @ITDB_IPOD_MODEL_COLOR: Color iPod * @ITDB_IPOD_MODEL_COLOR: Color iPod
* @ITDB_IPOD_MODEL_COLOR_U2: Color iPod (U2) * @ITDB_IPOD_MODEL_COLOR_U2: Color iPod (U2)
* @ITDB_IPOD_MODEL_REGULAR: Regular iPod * @ITDB_IPOD_MODEL_REGULAR: Regular iPod
* @ITDB_IPOD_MODEL_REGULAR_U2: Regular iPod (U2) * @ITDB_IPOD_MODEL_REGULAR_U2: Regular iPod (U2)
skipping to change at line 1224 skipping to change at line 1227
* that typo and avoid breaking the API (even if I doubt there are users * that typo and avoid breaking the API (even if I doubt there are users
* of this) * of this)
*/ */
#define ITDB_PSO_BIRATE ITDB_PSO_BITRATE #define ITDB_PSO_BIRATE ITDB_PSO_BITRATE
/** /**
* Itdb_Mediatype: * Itdb_Mediatype:
* @ITDB_MEDIATYPE_AUDIO: Audio files * @ITDB_MEDIATYPE_AUDIO: Audio files
* @ITDB_MEDIATYPE_MOVIE: Movies * @ITDB_MEDIATYPE_MOVIE: Movies
* @ITDB_MEDIATYPE_PODCAST: Podcasts * @ITDB_MEDIATYPE_PODCAST: Podcasts
* @ITDB_MEDIATYPE_VIDEO_PODCAST: Video Podcasts
* @ITDB_MEDIATYPE_AUDIOBOOK: Audio books * @ITDB_MEDIATYPE_AUDIOBOOK: Audio books
* @ITDB_MEDIATYPE_MUSICVIDEO: Music videos * @ITDB_MEDIATYPE_MUSICVIDEO: Music videos
* @ITDB_MEDIATYPE_TVSHOW: TV Shows * @ITDB_MEDIATYPE_TVSHOW: TV Shows
* @ITDB_MEDIATYPE_MUSIC_TVSHOW: TV Shows (also show in Music)
* @ITDB_MEDIATYPE_RINGTONE: Ringtone * @ITDB_MEDIATYPE_RINGTONE: Ringtone
* @ITDB_MEDIATYPE_RENTAL: Rental * @ITDB_MEDIATYPE_RENTAL: Rental
* @ITDB_MEDIATYPE_ITUNES_EXTRA: ? * @ITDB_MEDIATYPE_ITUNES_EXTRA: ?
* @ITDB_MEDIATYPE_MEMO: Memo * @ITDB_MEDIATYPE_MEMO: Memo
* @ITDB_MEDIATYPE_ITUNES_U: iTunes U * @ITDB_MEDIATYPE_ITUNES_U: iTunes U
* *
* Mediatype definitions * Mediatype definitions
* *
* The mediatype is used to determine what menu a track appears under. For * The mediatype is used to determine what menu a track appears under. For
* example, setting the mediatype to #ITDB_MEDIATYPE_PODCAST makes the trac k * example, setting the mediatype to #ITDB_MEDIATYPE_PODCAST makes the trac k
* appear on the Podcast menu. * appear on the Podcast menu. Media type is a bitfield, so it can be a
* binary combination of these constants, make sure to use binary operators
* when you want to operate on media types (eg use a binary AND in
* preference over a straight == when you want to test if a track has a
* given media type).
* *
* Since: 0.5.0 * Since: 0.5.0
*/ */
typedef enum typedef enum
{ {
ITDB_MEDIATYPE_AUDIO = 0x000001, ITDB_MEDIATYPE_AUDIO = (1 << 0),
ITDB_MEDIATYPE_MOVIE = 0x000002, ITDB_MEDIATYPE_MOVIE = (1 << 1),
ITDB_MEDIATYPE_PODCAST = 0x000004, ITDB_MEDIATYPE_PODCAST = (1 << 2),
ITDB_MEDIATYPE_AUDIOBOOK = 0x000008, ITDB_MEDIATYPE_AUDIOBOOK = (1 << 3),
ITDB_MEDIATYPE_MUSICVIDEO = 0x000020, ITDB_MEDIATYPE_MUSICVIDEO = (1 << 5),
ITDB_MEDIATYPE_TVSHOW = 0x000040, ITDB_MEDIATYPE_TVSHOW = (1 << 6),
ITDB_MEDIATYPE_RINGTONE = 0x004000, ITDB_MEDIATYPE_RINGTONE = (1 << 14),
ITDB_MEDIATYPE_RENTAL = 0x008000, ITDB_MEDIATYPE_RENTAL = (1 << 15),
ITDB_MEDIATYPE_ITUNES_EXTRA = 0x010000, ITDB_MEDIATYPE_ITUNES_EXTRA = (1 << 16),
ITDB_MEDIATYPE_MEMO = 0x100000, ITDB_MEDIATYPE_MEMO = (1 << 20),
ITDB_MEDIATYPE_ITUNES_U = 0x200000, ITDB_MEDIATYPE_ITUNES_U = (1 << 21),
ITDB_MEDIATYPE_EPUB_BOOK = 0x400000 ITDB_MEDIATYPE_EPUB_BOOK = (1 << 22)
} Itdb_Mediatype; } Itdb_Mediatype;
/* Known compound media types which have been observed in iPod databases.
* This list is in no way exhaustive, and these constants are only helpers,
* there's nothing wrong with not using them.
*/
#define ITDB_MEDIATYPE_VIDEO_PODCAST (ITDB_MEDIATYPE_MOVIE | ITDB_MEDIATYPE
_PODCAST)
#define ITDB_MEDIATYPE_MUSIC_TVSHOW (ITDB_MEDIATYPE_MUSICVIDEO | ITDB_MEDIA
TYPE_TVSHOW)
typedef struct _Itdb_Track_Private Itdb_Track_Private; typedef struct _Itdb_Track_Private Itdb_Track_Private;
/** /**
* Itdb_Track: * Itdb_Track:
* @itdb: A pointer to the #Itdb_iTunesDB (for conven ience) * @itdb: A pointer to the #Itdb_iTunesDB (for conven ience)
* @title: The title of the track in UTF8 * @title: The title of the track in UTF8
* @ipod_path: The file path on the iPod. Directories are * @ipod_path: The file path on the iPod. Directories are
* separated with ":" instead of "/". The pat h is * separated with ":" instead of "/". The pat h is
* relative to the iPod mountpoint. * relative to the iPod mountpoint.
* @album: The album name in UTF8 * @album: The album name in UTF8
* @artist: The artist name in UTF8 * @artist: The artist name in UTF8
skipping to change at line 1741 skipping to change at line 1756
*/ */
typedef enum typedef enum
{ {
ITDB_FILE_ERROR_SEEK, ITDB_FILE_ERROR_SEEK,
ITDB_FILE_ERROR_CORRUPT, ITDB_FILE_ERROR_CORRUPT,
ITDB_FILE_ERROR_NOTFOUND, ITDB_FILE_ERROR_NOTFOUND,
ITDB_FILE_ERROR_RENAME, ITDB_FILE_ERROR_RENAME,
ITDB_FILE_ERROR_ITDB_CORRUPT ITDB_FILE_ERROR_ITDB_CORRUPT
} ItdbFileError; } ItdbFileError;
typedef enum
{
ITDB_ERROR_SEEK,
ITDB_ERROR_CORRUPT,
ITDB_ERROR_NOTFOUND,
ITDB_ERROR_RENAME,
ITDB_ERROR_ITDB_CORRUPT,
ITDB_ERROR_SQLITE
} ItdbError;
/* Error domain */ /* Error domain */
#define ITDB_FILE_ERROR itdb_file_error_quark () #define ITDB_ERROR itdb_file_error_quark ()
#define ITDB_FILE_ERROR ITDB_ERROR
GQuark itdb_file_error_quark (void); GQuark itdb_file_error_quark (void);
/* ------------------------------------------------------------ *\ /* ------------------------------------------------------------ *\
* *
* Public functions * Public functions
* *
\* ------------------------------------------------------------ */ \* ------------------------------------------------------------ */
/* functions for reading/writing database, general itdb functions */ /* functions for reading/writing database, general itdb functions */
Itdb_iTunesDB *itdb_parse (const gchar *mp, GError **error); Itdb_iTunesDB *itdb_parse (const gchar *mp, GError **error);
 End of changes. 9 change blocks. 
15 lines changed or deleted 43 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/