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.0 #define LIBNJB_VERSION 2.1.1
/** 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
#include <sys/types.h> #include <sys/types.h>
#ifdef __WIN32__ #ifdef __WIN32__
/* Windows specific code, types that do not exist in Windows /* Windows specific code, types that do not exist in Windows
* sys/types.h * sys/types.h
*/ */
typedef char int8_t; typedef char int8_t;
typedef unsigned char u_int8_t; typedef unsigned char u_int8_t;
typedef short int16_t; typedef __int16 int16_t;
typedef unsigned short u_int16_t; typedef unsigned __int16 u_int16_t;
typedef int int32_t; typedef __int32 int32_t;
typedef unsigned int u_int32_t; typedef unsigned __int32 u_int32_t;
typedef unsigned __int64 u_int64_t; typedef unsigned __int64 u_int64_t;
#endif #endif
#ifdef __sun
/* Solaris specific code, types that do not exist in Solaris'
* sys/types.h
*/
#define u_int8_t uint8_t
#define u_int16_t uint16_t
#define u_int32_t uint32_t
#define u_int64_t uint64_t
#endif
#include <stdio.h> #include <stdio.h>
#include <usb.h> #include <usb.h>
/** The maximum number of devices that can be found by libnjb */ /** The maximum number of devices that can be found by libnjb */
#define NJB_MAX_DEVICES 0xFF #define NJB_MAX_DEVICES 0xFF
/** /**
* @defgroup njbboxes Enumerators to identify different jukeboxes * @defgroup njbboxes Enumerators to identify different jukeboxes
* *
skipping to change at line 67 skipping to change at line 76
#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 */
/** @} */ /** @} */
/** /**
* @defgroup power Power connection and status * @defgroup power Power connection and status
*
* These defines are only applicable to the NJB1 and is found by dereferenc
ing
* <code>u_int8_t power = njb->njbid->power</code> The series 3 devices
* should rely on the <code>NJB_Get_Battery_Level()</code> function instead
* of these defines.
*
* @{ * @{
*/ */
#define NJB_POWER_BATTERY 0x00 /**< If the device is running on batte ry (NJB1 only) */ #define NJB_POWER_BATTERY 0x00 /**< If the device is running on batte ry */
#define NJB_POWER_AC_CHARGED 0x01 /**< If the device is running on DC #define NJB_POWER_AC_CHARGED 0x01 /**< If the device is running on DC
and the battery is fully charged * / and the battery is fully charged * /
#define NJB_POWER_AC_CHARGING 0x03 /**< If the device is running on DC #define NJB_POWER_AC_CHARGING 0x03 /**< If the device is running on DC
and the battery is being charged * / and the battery is being charged * /
/** @} */ /** @} */
/** /**
* @defgroup frametypes Frame types for different song ID frames * @defgroup frametypes Frame types for different song ID frames
* @{ * @{
*/ */
skipping to change at line 454 skipping to change at line 469
int NJB_Release (njb_t *njb); int NJB_Release (njb_t *njb);
void NJB_Ping(njb_t *njb); void NJB_Ping(njb_t *njb);
int NJB_Get_Disk_Usage (njb_t *njb, u_int64_t *btotal, u_int64_t *bfree); int NJB_Get_Disk_Usage (njb_t *njb, u_int64_t *btotal, u_int64_t *bfree);
char *NJB_Get_Owner_String (njb_t *njb); char *NJB_Get_Owner_String (njb_t *njb);
int NJB_Set_Owner_String (njb_t *njb, const char *name); int NJB_Set_Owner_String (njb_t *njb, const char *name);
int NJB_Get_Bitmap_Dimensions(njb_t *njb, int *x, int *y, int *bytes); int NJB_Get_Bitmap_Dimensions(njb_t *njb, int *x, int *y, int *bytes);
int NJB_Set_Bitmap(njb_t *njb, const unsigned char *bitmap); int NJB_Set_Bitmap(njb_t *njb, const unsigned char *bitmap);
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);
/** /**
* @} * @}
* @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);
 End of changes. 6 change blocks. 
6 lines changed or deleted 23 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/