| 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.4 | #define LIBNJB_VERSION 2.2.5 | |||
| /** 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 85 | skipping to change at line 85 | |||
| #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) */ | #define NJB_DEVICE_CREATIVEZEN 0x0d /**< Creative Zen (Micro variant) */ | |||
| #define NJB_DEVICE_DELLDJ3 0x0e /**< Third Generation Dell DJ */ | ||||
| /** @} */ | /** @} */ | |||
| /** | /** | |||
| * @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 154 | skipping to change at line 155 | |||
| #define NJB_UC_UTF8 1 /**< libnjb to use Unicode UTF-8 */ | #define NJB_UC_UTF8 1 /**< libnjb to use Unicode UTF-8 */ | |||
| /** @} */ | /** @} */ | |||
| /** | /** | |||
| * @defgroup turboflags Turbo flags | * @defgroup turboflags Turbo flags | |||
| * @see NJB_Set_Turbo_Mode() | * @see NJB_Set_Turbo_Mode() | |||
| * @{ | * @{ | |||
| */ | */ | |||
| #define NJB_TURBO_OFF 0 /**< turbo mode is off for series 3 devices */ | #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 */ | #define NJB_TURBO_ON 1 /**< turbo mode is on for series 3 devices */ | |||
| /** @} */ | ||||
| /** The fixed length of the owner string */ | /** The fixed length of the owner string */ | |||
| #define OWNER_STRING_LENGTH 128 | #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 | |||
| * @{ | * @{ | |||
| */ | */ | |||
| End of changes. 3 change blocks. | ||||
| 1 lines changed or deleted | 3 lines changed or added | |||