Skip to content

Commit

Permalink
Merge pull request #194: differentiate flush from quit.
Browse files Browse the repository at this point in the history
Fix VisualC 2008 build issues.
Increase squeezelite revision to 1461.
  • Loading branch information
ralph-irving committed Dec 31, 2023
1 parent a2de263 commit 18f4ae9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions output.c
Original file line number Diff line number Diff line change
Expand Up @@ -453,13 +453,14 @@ void output_flush(void) {
}

bool output_flush_streaming(void) {
bool flushed;
LOG_INFO("flush output buffer (streaming)");
LOCK;
bool flushed = output.track_start != NULL;
flushed = output.track_start != NULL;
if (output.track_start) {
outputbuf->writep = output.track_start;
output.track_start = NULL;
}
UNLOCK;
return flushed;
}
}
3 changes: 2 additions & 1 deletion slimproto.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ void sendIR(u32_t code, u32_t ts) {
#endif

static void process_strm(u8_t *pkt, int len) {
bool flushed;
struct strm_packet *strm = (struct strm_packet *)pkt;

LOG_DEBUG("strm command %c", strm->command);
Expand All @@ -295,7 +296,7 @@ static void process_strm(u8_t *pkt, int len) {
{
decode_flush();
// we can have fully finished the current streaming, that's still a flush
bool flushed = output_flush_streaming();
flushed = output_flush_streaming();
if (stream_disconnect() || flushed) {
sendSTAT("STMf", 0);
}
Expand Down
2 changes: 1 addition & 1 deletion squeezelite.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#define MAJOR_VERSION "1.9"
#define MINOR_VERSION "9"
#define MICRO_VERSION "1460"
#define MICRO_VERSION "1461"

#if defined(CUSTOM_VERSION)
#define VERSION "v" MAJOR_VERSION "." MINOR_VERSION "-" MICRO_VERSION STR(CUSTOM_VERSION)
Expand Down

0 comments on commit 18f4ae9

Please sign in to comment.