Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 04:27:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge in progress

Browse Source
This commit is contained in:
philippe44
2020-01-11 13:56:58 -08:00
parent 886676df88
commit e82d56fbfa
42 changed files with 2138 additions and 1951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/squeezelite/embedded.h
View File

@@ -8,6 +8,7 @@
- pthread_create_name
- stack size
- s16_t, s32_t, s64_t and u64_t
- PLAYER_ID
can overload (use #define)
- exit
- gettime_ms
@@ -25,6 +26,7 @@
#define OUTPUT_THREAD_STACK_SIZE 6 * 1024
#define IR_THREAD_STACK_SIZE 6 * 1024
#define PLAYER_ID 100
#define BASE_CAP "Model=squeezeesp32,AccuratePlayPoints=1,HasDigitalOut=1,HasPolarityInversion=1,Firmware=" VERSION
#define EXT_BSS __attribute__((section(".ext_ram.bss")))
@@ -42,13 +44,15 @@ uint32_t _gettime_ms_(void);
int pthread_create_name(pthread_t *thread, _CONST pthread_attr_t *attr,
void *(*start_routine)( void * ), void *arg, char *name);
// must provide of #define as empty macros
void embedded_init(void);
void register_external(void);
void deregister_external(void);
void decode_resume(int external);
void vfd_data(u8_t *data, int len);
// optional, please chain
bool (*slimp_handler)(u8_t *data, int len);
void (*server_notify)(in_addr_t ip, u16_t hport, u16_t cport);
#endif // EMBEDDED_H

10
components/squeezelite/slimproto.c
View File

@@ -45,7 +45,7 @@ static sockfd sock = -1;
static in_addr_t slimproto_ip = 0;
static u16_t slimproto_hport = 9000;
static u16_t slimproto_cport = 9090;
static u8_t player_id = 100; // squeezeesp32
static u8_t player_id = PLAYER_ID;
extern struct buffer *streambuf;
extern struct buffer *outputbuf;
@@ -450,11 +450,6 @@ static void process_dsco(u8_t *pkt, int len) {
player_id = 12;
}
static void process_vfdc(u8_t *pkt, int len) {
LOG_DEBUG("VFDC %u", len);
vfd_data( pkt, len - 4);
}
static void process_setd(u8_t *pkt, int len) {
struct setd_packet *setd = (struct setd_packet *)pkt;
@@ -531,7 +526,6 @@ static struct handler handlers[] = {
{ "setd", process_setd },
{ "serv", process_serv },
{ "dsco", process_dsco },
{ "vfdc", process_vfdc },
{ "", NULL },
};
@@ -542,7 +536,7 @@ static void process(u8_t *pack, int len) {
if (h->handler) {
LOG_DEBUG("%s", h->opcode);
h->handler(pack, len);
} else {
} else if (!slimp_handler || !(*slimp_handler)(pack, len)) {
pack[4] = '\0';
LOG_WARN("unhandled %s", (char *)pack);
}