libnjb.h   libnjb.h 
skipping to change at line 27 skipping to change at line 27
#define NJB_MAX_DEVICES 0xFF #define NJB_MAX_DEVICES 0xFF
/* Enumerators to identify different jukeboxes */ /* Enumerators to identify different jukeboxes */
#define NJB_DEVICE_NJB1 0x00 #define NJB_DEVICE_NJB1 0x00
#define NJB_DEVICE_NJB2 0x01 #define NJB_DEVICE_NJB2 0x01
#define NJB_DEVICE_NJB3 0x02 #define NJB_DEVICE_NJB3 0x02
#define NJB_DEVICE_NJBZEN 0x03 #define NJB_DEVICE_NJBZEN 0x03
#define NJB_DEVICE_NJBZEN2 0x04 #define NJB_DEVICE_NJBZEN2 0x04
#define NJB_DEVICE_NJBZENNX 0x05 #define NJB_DEVICE_NJBZENNX 0x05
#define NJB_DEVICE_NJBZENXTRA 0x06 #define NJB_DEVICE_NJBZENXTRA 0x06
#define NJB_DEVICE_DELLDJ 0x07
#define NJB_POWER_BATTERY 0x00 #define NJB_POWER_BATTERY 0x00
#define NJB_POWER_AC_CHARGED 0x01 #define NJB_POWER_AC_CHARGED 0x01
#define NJB_POWER_AC_CHARGING 0x03 #define NJB_POWER_AC_CHARGING 0x03
#define ID_DATA_ASCII 0 #define ID_DATA_ASCII 0
#define ID_DATA_BIN 1 #define ID_DATA_BIN 1
#define NJB_CODEC_MP3 "MP3" #define NJB_CODEC_MP3 "MP3"
#define NJB_CODEC_WMA "WMA" #define NJB_CODEC_WMA "WMA"
skipping to change at line 113 skipping to change at line 114
#define NJB_UC_8859 0 #define NJB_UC_8859 0
#define NJB_UC_UTF8 1 #define NJB_UC_UTF8 1
/* NJB structure definitions */ /* NJB structure definitions */
typedef struct { typedef struct {
unsigned char id[16]; /* Move all of this into njb_t eventually */ unsigned char id[16]; /* Move all of this into njb_t eventually */
u_int8_t fwMajor; u_int8_t fwMajor;
u_int8_t fwMinor; u_int8_t fwMinor;
u_int8_t fwRel; u_int8_t fwRel;
u_int8_t hwMajor;
u_int8_t hwMinor;
u_int8_t hwRel;
char productName[33]; char productName[33];
u_int8_t power; u_int8_t power;
} njbid_t; } njbid_t;
typedef struct { typedef struct {
unsigned char id[16]; unsigned char id[16];
u_int64_t count; u_int64_t count;
} njblibctr_t; } njblibctr_t;
#define OWNER_STRING_LENGTH 128 #define OWNER_STRING_LENGTH 128
skipping to change at line 164 skipping to change at line 168
njb_if_t bout; njb_if_t bout;
njb_if_t iin; njb_if_t iin;
njb_if_t iout; njb_if_t iout;
struct usb_device_info info; struct usb_device_info info;
#endif #endif
int device_type; /* what kind of jukebox it is */ int device_type; /* what kind of jukebox it is */
unsigned char id[16]; unsigned char id[16];
char idstring[33]; char idstring[33];
u_int64_t libcount; u_int64_t libcount;
int session_updated; int session_updated;
int extrarun_on_rename; /* Used during renaming of tracks in series
3 protocol */
int get_extended_tag_info; /* Get extended tags */
int reset_get_track_tag; int reset_get_track_tag;
int reset_get_playlist; int reset_get_playlist;
int reset_get_datafile_tag; int reset_get_datafile_tag;
int updated; int updated;
u_int32_t xfersize; u_int32_t xfersize;
char *tmpdir; char *tmpdir;
songid_t *first_songid; /* used on NJB3 family only */ unsigned char *protocol_state; /* dereferenced and maintained indivi
songid_t *next_songid; /* used on NJB3 family only */ dually by protocol implementations */
playlist_t *first_plid; /* used on NJB3 family only */
playlist_t *next_plid; /* used on NJB3 family only */
datafile_t *first_dfid; /* used on NJB3 family only */
datafile_t *next_dfid; /* used on NJB3 family only */
int current_playing_track; /* used on NJB3 family only */
u_int8_t fwMajor; /* should eventually be moved here from njbid_t */ u_int8_t fwMajor; /* should eventually be moved here from njbid_t */
u_int8_t fwMinor; u_int8_t fwMinor;
u_int8_t fwRel; u_int8_t fwRel;
}; };
/* Song/track tag definitions */ /* Song/track tag definitions */
struct songid_frame_t { struct songid_frame_t {
u_int16_t type; u_int16_t type;
u_int16_t labelsz; u_int16_t labelsz;
skipping to change at line 241 skipping to change at line 241
u_int32_t msdw; u_int32_t msdw;
u_int32_t lsdw; u_int32_t lsdw;
datafile_t *nextdf; datafile_t *nextdf;
}; };
/* EAX block definition */ /* EAX block definition */
typedef struct typedef struct
{ {
u_int8_t volume; u_int8_t volume;
u_int8_t volumemin;
u_int8_t volumemax;
int16_t muted; int16_t muted;
int16_t eq_status; int16_t eq_status;
int8_t bass; int8_t bass;
int8_t bassmin; int8_t bassmin;
int8_t bassmax; int8_t bassmax;
int8_t midrange; int8_t midrange;
int8_t midrangemin; int8_t midrangemin;
int8_t midrangemax; int8_t midrangemax;
int8_t treble; int8_t treble;
int8_t treblemin; int8_t treblemin;
skipping to change at line 295 skipping to change at line 297
const char* buf, unsigned len, void *data); const char* buf, unsigned len, void *data);
int NJB_Set_TmpDir (njb_t *njb, const char *dir); int NJB_Set_TmpDir (njb_t *njb, const char *dir);
const char *NJB_Get_TmpDir (njb_t *njb); const char *NJB_Get_TmpDir (njb_t *njb);
int NJB_Discover(njb_t *njbs, int limit, int *n); int NJB_Discover(njb_t *njbs, int limit, int *n);
int NJB_Open(njb_t *njb); int NJB_Open(njb_t *njb);
void NJB_Close(njb_t *njb); void NJB_Close(njb_t *njb);
int NJB_Capture (njb_t *njb); int NJB_Capture (njb_t *njb);
int NJB_Release (njb_t *njb); int NJB_Release (njb_t *njb);
njbid_t *NJB_Ping(njb_t *njb); njbid_t *NJB_Ping(njb_t *njb);
void NJB_Get_Extended_Tags (njb_t *njb, int extended);
void NJB_Reset_Get_Track_Tag (njb_t *njb); void NJB_Reset_Get_Track_Tag (njb_t *njb);
songid_t *NJB_Get_Track_Tag (njb_t *njb); songid_t *NJB_Get_Track_Tag (njb_t *njb);
void NJB_Reset_Get_Playlist (njb_t *njb); void NJB_Reset_Get_Playlist (njb_t *njb);
playlist_t *NJB_Get_Playlist (njb_t *njb); playlist_t *NJB_Get_Playlist (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);
void NJB_Reset_Get_Datafile_Tag (njb_t *njb); void NJB_Reset_Get_Datafile_Tag (njb_t *njb);
datafile_t *NJB_Get_Datafile_Tag (njb_t *njb); datafile_t *NJB_Get_Datafile_Tag (njb_t *njb);
eax_t *NJB_Get_EAX (njb_t *njb); eax_t *NJB_Get_EAX (njb_t *njb);
 End of changes. 6 change blocks. 
7 lines changed or deleted 12 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/