Merge pull request ralph-irving#194: differentiate flush from quit.

Thanks philippe44.
Increase squeezelite revision to 1460.

(cherry picked from commit c18ab87)

output.c

@@ -436,7 +436,7 @@ void output_close_common(void) {
 }
 
 void output_flush(void) {
-	LOG_SQ_INFO("flush output buffer");
+	LOG_SQ_INFO("flush output buffer (full)");
 	buf_flush(outputbuf);
 	LOCK;
 	output.fade = FADE_INACTIVE;
@@ -451,3 +451,15 @@ void output_flush(void) {
 	output.frames_played = 0;
 	UNLOCK;
 }
+
+bool output_flush_streaming(void) {
+	LOG_SQ_INFO("flush output buffer (streaming)");
+	LOCK;
+	bool flushed = output.track_start != NULL;
+	if (output.track_start) {
+		outputbuf->writep = output.track_start;
+		output.track_start = NULL;
+	}
+	UNLOCK;
+	return flushed;
+}

slimproto.c

@@ -291,15 +291,17 @@ static void process_strm(u8_t *pkt, int len) {
 		sendSTAT("STMf", 0);
 		buf_flush(streambuf);
 		break;
-	case 'f':
-		decode_flush();
-		output_flush();
-		status.frames_played = 0;
-		if (stream_disconnect()) {
-			sendSTAT("STMf", 0);
+	case 'f': 
+		{
+			decode_flush();
+			// we can have fully finished the current streaming, that's still a flush
+			bool flushed = output_flush_streaming();
+			if (stream_disconnect() || flushed) {
+				sendSTAT("STMf", 0);
+			}
+			buf_flush(streambuf);
+			break;
 		}
-		buf_flush(streambuf);
-		break;
 	case 'p':
 		{
 			unsigned interval = unpackN(&strm->replay_gain);

squeezelite.h

@@ -26,7 +26,7 @@
 
 #define MAJOR_VERSION "1.9"
 #define MINOR_VERSION "9"
-#define MICRO_VERSION "1457"
+#define MICRO_VERSION "1460"
 
 #if defined(CUSTOM_VERSION)
 #define VERSION "v" MAJOR_VERSION "." MINOR_VERSION "-" MICRO_VERSION STR(CUSTOM_VERSION)
@@ -688,6 +688,7 @@ struct outputstate {
 void output_init_common(log_level level, const char *device, unsigned output_buf_size, unsigned rates[], unsigned idle);
 void output_close_common(void);
 void output_flush(void);
+bool output_flush_streaming(void);
 // _* called with mutex locked
 frames_t _output_frames(frames_t avail);
 void _checkfade(bool);