libnjb.h   libnjb.h 
skipping to change at line 17 skipping to change at line 17
* *
* <code> * <code>
* #include <libnjb.h> * #include <libnjb.h>
* </code> * </code>
*/ */
#ifndef __LIBNJB__H #ifndef __LIBNJB__H
#define __LIBNJB__H #define __LIBNJB__H
/** The version of this installation of libnjb */ /** The version of this installation of libnjb */
#define LIBNJB_VERSION 2.2.3 #define LIBNJB_VERSION 2.2.4
/** A legacy definition - nowadays we always compile for libusb */ /** A legacy definition - nowadays we always compile for libusb */
#define LIBNJB_COMPILED_FOR_LIBUSB 1 #define LIBNJB_COMPILED_FOR_LIBUSB 1
/* This handles MSVC pecularities */ /* This handles MSVC pecularities */
#ifdef _MSC_VER #ifdef _MSC_VER
#include <windows.h> #include <windows.h>
#define __WIN32__ #define __WIN32__
#define snprintf _snprintf #define snprintf _snprintf
#define ssize_t SSIZE_T #define ssize_t SSIZE_T
#endif #endif
skipping to change at line 84 skipping to change at line 84
#define NJB_DEVICE_NJBZEN 0x03 /**< Nomad Jukebox Zen (with FireWire) */ #define NJB_DEVICE_NJBZEN 0x03 /**< Nomad Jukebox Zen (with FireWire) */
#define NJB_DEVICE_NJBZEN2 0x04 /**< Nomad Jukebox Zen USB 2.0 */ #define NJB_DEVICE_NJBZEN2 0x04 /**< Nomad Jukebox Zen USB 2.0 */
#define NJB_DEVICE_NJBZENNX 0x05 /**< Nomad Jukebox Zen NX */ #define NJB_DEVICE_NJBZENNX 0x05 /**< Nomad Jukebox Zen NX */
#define NJB_DEVICE_NJBZENXTRA 0x06 /**< Nomad Jukebox Zen Xtra */ #define NJB_DEVICE_NJBZENXTRA 0x06 /**< Nomad Jukebox Zen Xtra */
#define NJB_DEVICE_DELLDJ 0x07 /**< Dell Digital DJ "Dell DJ" */ #define NJB_DEVICE_DELLDJ 0x07 /**< Dell Digital DJ "Dell DJ" */
#define NJB_DEVICE_NJBZENTOUCH 0x08 /**< Nomad Jukebox Zen Touch */ #define NJB_DEVICE_NJBZENTOUCH 0x08 /**< Nomad Jukebox Zen Touch */
#define NJB_DEVICE_NJBZENMICRO 0x09 /**< Nomad Jukebox Zen Micro */ #define NJB_DEVICE_NJBZENMICRO 0x09 /**< Nomad Jukebox Zen Micro */
#define NJB_DEVICE_DELLDJ2 0x0a /**< Second Generation Dell DJ */ #define NJB_DEVICE_DELLDJ2 0x0a /**< Second Generation Dell DJ */
#define NJB_DEVICE_POCKETDJ 0x0b /**< Dell Pocket DJ */ #define NJB_DEVICE_POCKETDJ 0x0b /**< Dell Pocket DJ */
#define NJB_DEVICE_ZENSLEEK 0x0c /**< Zen Sleek */ #define NJB_DEVICE_ZENSLEEK 0x0c /**< Zen Sleek */
#define NJB_DEVICE_CREATIVEZEN 0x0d /**< Creative Zen (Micro variant) */
/** @} */ /** @} */
/** /**
* @defgroup frametypes Frame types for different song ID frames * @defgroup frametypes Frame types for different song ID frames
* @{ * @{
*/ */
#define NJB_TYPE_STRING 0x00 /**< A string type song ID fram e */ #define NJB_TYPE_STRING 0x00 /**< A string type song ID fram e */
#define NJB_TYPE_UINT16 0x02 /**< An unsigned 16 bit integer type song ID frame */ #define NJB_TYPE_UINT16 0x02 /**< An unsigned 16 bit integer type song ID frame */
#define NJB_TYPE_UINT32 0x03 /**< An unsigned 32 bit integer type song ID frame */ #define NJB_TYPE_UINT32 0x03 /**< An unsigned 32 bit integer type song ID frame */
/** @} */ /** @} */
skipping to change at line 146 skipping to change at line 147
/** /**
* @defgroup unicodeflags Unicode flags * @defgroup unicodeflags Unicode flags
* @see NJB_Set_Unicode() * @see NJB_Set_Unicode()
* @{ * @{
*/ */
#define NJB_UC_8859 0 /**< libnjb to use ISO 8859-1 / codepage 1252 */ #define NJB_UC_8859 0 /**< libnjb to use ISO 8859-1 / codepage 1252 */
#define NJB_UC_UTF8 1 /**< libnjb to use Unicode UTF-8 */ #define NJB_UC_UTF8 1 /**< libnjb to use Unicode UTF-8 */
/** @} */ /** @} */
#define OWNER_STRING_LENGTH 128 /**< The fixed length of the owner strin /**
g */ * @defgroup turboflags Turbo flags
* @see NJB_Set_Turbo_Mode()
* @{
*/
#define NJB_TURBO_OFF 0 /**< turbo mode is off for series 3 devices */
#define NJB_TURBO_ON 1 /**< turbo mode is on for series 3 devices */
/** The fixed length of the owner string */
#define OWNER_STRING_LENGTH 128
/** A type defined for owner strings */ /** A type defined for owner strings */
typedef unsigned char owner_string[OWNER_STRING_LENGTH + 1]; typedef unsigned char owner_string[OWNER_STRING_LENGTH + 1];
/** /**
* @defgroup types libnjb global type definitions * @defgroup types libnjb global type definitions
* @{ * @{
*/ */
typedef struct njb_struct njb_t; /**< @see njb_struct */ typedef struct njb_struct njb_t; /**< @see njb_struct */
typedef struct njb_songid_frame_struct njb_songid_frame_t; /**< See struct definition */ typedef struct njb_songid_frame_struct njb_songid_frame_t; /**< See struct definition */
typedef struct njb_songid_struct njb_songid_t; /**< See struct definition * / typedef struct njb_songid_struct njb_songid_t; /**< See struct definition * /
skipping to change at line 455 skipping to change at line 465
njb_keyval_t *NJB_Get_Keys(njb_t *njb); njb_keyval_t *NJB_Get_Keys(njb_t *njb);
u_int64_t NJB_Get_NJB1_Libcounter(njb_t *njb); u_int64_t NJB_Get_NJB1_Libcounter(njb_t *njb);
int NJB_Send_Firmware (njb_t *njb, const char *path, NJB_Xfer_Callback *cal lback, void *data); int NJB_Send_Firmware (njb_t *njb, const char *path, NJB_Xfer_Callback *cal lback, void *data);
int NJB_Get_Battery_Level (njb_t *njb); int NJB_Get_Battery_Level (njb_t *njb);
int NJB_Get_Battery_Charging (njb_t *njb); int NJB_Get_Battery_Charging (njb_t *njb);
int NJB_Get_Auxpower (njb_t *njb); int NJB_Get_Auxpower (njb_t *njb);
int NJB_Get_SDMI_ID(njb_t *njb, u_int8_t *sdmiid); int NJB_Get_SDMI_ID(njb_t *njb, u_int8_t *sdmiid);
const char *NJB_Get_Device_Name(njb_t *njb, int type); const char *NJB_Get_Device_Name(njb_t *njb, int type);
int NJB_Get_Firmware_Revision(njb_t *njb, u_int8_t *major, u_int8_t *minor, u_int8_t *release); int NJB_Get_Firmware_Revision(njb_t *njb, u_int8_t *major, u_int8_t *minor, u_int8_t *release);
int NJB_Get_Hardware_Revision(njb_t *njb, u_int8_t *major, u_int8_t *minor, u_int8_t *release); int NJB_Get_Hardware_Revision(njb_t *njb, u_int8_t *major, u_int8_t *minor, u_int8_t *release);
int NJB_Set_Turbo_Mode(njb_t *njb, u_int8_t mode);
/** /**
* @} * @}
* @defgroup tagapi The track and tag (song ID metadata) manipulation API * @defgroup tagapi The track and tag (song ID metadata) manipulation API
* @{ * @{
*/ */
njb_songid_t *NJB_Songid_New(void); njb_songid_t *NJB_Songid_New(void);
void NJB_Songid_Destroy(njb_songid_t *song); void NJB_Songid_Destroy(njb_songid_t *song);
void NJB_Songid_Addframe(njb_songid_t *song, njb_songid_frame_t *frame); void NJB_Songid_Addframe(njb_songid_t *song, njb_songid_frame_t *frame);
void NJB_Songid_Reset_Getframe(njb_songid_t *song); void NJB_Songid_Reset_Getframe(njb_songid_t *song);
njb_songid_frame_t *NJB_Songid_Getframe(njb_songid_t *song); njb_songid_frame_t *NJB_Songid_Getframe(njb_songid_t *song);
skipping to change at line 530 skipping to change at line 541
void NJB_Playlist_Track_Destroy(njb_playlist_track_t *track); void NJB_Playlist_Track_Destroy(njb_playlist_track_t *track);
/** /**
* @} * @}
* @defgroup datatagapi The datafile tag (metadata) retrieveal API * @defgroup datatagapi The datafile tag (metadata) retrieveal API
* @{ * @{
*/ */
void NJB_Reset_Get_Datafile_Tag (njb_t *njb); void NJB_Reset_Get_Datafile_Tag (njb_t *njb);
njb_datafile_t *NJB_Get_Datafile_Tag (njb_t *njb); njb_datafile_t *NJB_Get_Datafile_Tag (njb_t *njb);
void NJB_Datafile_Destroy(njb_datafile_t *df); void NJB_Datafile_Destroy(njb_datafile_t *df);
#define NJB_Get_File NJB_Get_Track #define NJB_Get_File NJB_Get_Track
#define NJB_Get_File_fd NJB_Get_Track_fd
int NJB_Send_File (njb_t *njb, const char *path, const char *name, const ch ar *folder, int NJB_Send_File (njb_t *njb, const char *path, const char *name, const ch ar *folder,
NJB_Xfer_Callback *callback, void *data, u_int32_t *fileid); NJB_Xfer_Callback *callback, void *data, u_int32_t *fileid);
int NJB_Delete_Datafile (njb_t *njb, u_int32_t fileid); int NJB_Delete_Datafile (njb_t *njb, u_int32_t fileid);
int NJB_Create_Folder (njb_t *njb, const char *name, u_int32_t *folderid); int NJB_Create_Folder (njb_t *njb, const char *name, u_int32_t *folderid);
/** /**
* @} * @}
* @defgroup eaxapi The EAX (and volume) manipulation API * @defgroup eaxapi The EAX (and volume) manipulation API
* @{ * @{
*/ */
void NJB_Reset_Get_EAX_Type (njb_t *njb); void NJB_Reset_Get_EAX_Type (njb_t *njb);
 End of changes. 5 change blocks. 
3 lines changed or deleted 14 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/