1.5.1

philippe44 · Dec 22, 2023 · d6d4c44 · d6d4c44
1 parent cc4983d
commit d6d4c44
Show file tree

Hide file tree

Showing 41 changed files with 49 additions and 19 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 Note: beware of crypto version (see shairtunes)
 
+1.5.1
+ - 'q' and 'f' have been inverted forever in slimproto
+ - make 'f' work as expected: only flush streaming part of a track
+
 1.5.0
  - use fixed libcodecs and libraop for alac
  - add '-c' to set codec on command line

diff --git a/application/libmdns b/application/libmdns
diff --git a/application/libraop b/application/libraop
diff --git a/application/squeeze2raop.vcxproj.user b/application/squeeze2raop.vcxproj.user
@@ -8,7 +8,7 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>-d all=info  -x office.xml</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-d all=info  -x office.xml -s 192.168.2.10</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
diff --git a/application/squeeze2raop/inc/squeezedefs.h b/application/squeeze2raop/inc/squeezedefs.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#define VERSION "v1.5.0"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v1.5.1"" ("__DATE__" @ "__TIME__")"
 
 #define STR_LEN 256
 

diff --git a/application/squeeze2raop/squeeze2raop.c b/application/squeeze2raop/squeeze2raop.c
@@ -378,9 +378,12 @@ bool sq_callback(void *caller, sq_action_t action, ...)
 				pthread_mutex_unlock(&glMainMutex);
 			}
 			break;
-		case SQ_SETSERVER:
-			strcpy(device->sq_config.dynamic.server, inet_ntoa(*va_arg(args, struct in_addr*)));
+		case SQ_SETSERVER: {
+            struct in_addr server;
+            server.s_addr = va_arg(args, uint32_t);
+            strcpy(device->sq_config.dynamic.server, inet_ntoa(server));
 			break;
+        }
 		default:
 			break;
 	}
@@ -1079,6 +1082,7 @@ static void *ActiveRemoteThread(void *args) {
 		LOG_INFO("[%p]: remote command %s", Device, command);
 
 		if (!strcasecmp(command, "pause")) sq_notify(Device->SqueezeHandle, SQ_PAUSE);
+		if (!strcasecmp(command, "discrete-pause")) sq_notify(Device->SqueezeHandle, SQ_PAUSE);
 		if (!strcasecmp(command, "play")) sq_notify(Device->SqueezeHandle, SQ_PLAY);
 		if (!strcasecmp(command, "playpause")) sq_notify(Device->SqueezeHandle, SQ_PLAY_PAUSE);
 		if (!strcasecmp(command, "stop")) sq_notify(Device->SqueezeHandle, SQ_STOP);

diff --git a/application/squeezelite/output.c b/application/squeezelite/output.c
@@ -328,7 +328,7 @@ void output_close_common(struct thread_ctx_s *ctx) {
 
 /*---------------------------------------------------------------------------*/
 void output_flush(struct thread_ctx_s *ctx) {
-	LOG_DEBUG("[%p]: flush output buffer", ctx);
+	LOG_INFO("[%p]: flush output buffer (full)", ctx);
 	buf_flush(ctx->outputbuf);
 	LOCK;
 	ctx->output.fade = FADE_INACTIVE;
@@ -341,8 +341,22 @@ void output_flush(struct thread_ctx_s *ctx) {
 	}
 	ctx->output.frames_played = ctx->output.frames_played_dmp = 0;
 	ctx->output.track_start_time = -1;
+	ctx->output.track_start = NULL;
 	UNLOCK;
 }
 
+/*---------------------------------------------------------------------------*/
+bool output_flush_streaming(struct thread_ctx_s* ctx) {
+	LOG_INFO("[%p]: flush output buffer (streaming)", ctx);
+	LOCK;
+	bool flushed = ctx->output.track_start != NULL;
+	if (ctx->output.track_start) {
+		ctx->outputbuf->writep = ctx->output.track_start;
+		ctx->output.track_start = NULL;
+	}
+	UNLOCK;
+	return flushed;
+}
+
 
 
diff --git a/application/squeezelite/slimproto.c b/application/squeezelite/slimproto.c
@@ -237,24 +237,27 @@ static void process_strm(u8_t *pkt, int len, struct thread_ctx_s *ctx) {
 	case 't':
 		sendSTAT("STMt", strm->replay_gain, ctx); // STMt replay_gain is no longer used to track latency, but support it
 		break;
-	case 'f':
+	case 'q':
 		decode_flush(ctx);
 		output_flush(ctx);
 		ctx->status.frames_played = 0;
 		stream_disconnect(ctx);
+		// this is noop for LMS up to 8.4 at least
 		sendSTAT("STMf", 0, ctx);
 		buf_flush(ctx->streambuf);
+		if (ctx->last_command != 'q') ctx->callback(ctx->MR, SQ_STOP);        
 		break;
-	case 'q':
-		decode_flush(ctx);
-		output_flush(ctx);
-		ctx->status.frames_played = 0;
-		if (stream_disconnect(ctx)) {
-			sendSTAT("STMf", 0, ctx);
+	case 'f': 
+		{
+			decode_flush(ctx);
+			bool flushed = output_flush_streaming(ctx);
+			if (flushed | stream_disconnect(ctx)) {
+				// this is noop for LMS up to 8.4 at least
+				sendSTAT("STMf", 0, ctx);
+			}
+			buf_flush(ctx->streambuf);
+			break;
 		}
-		buf_flush(ctx->streambuf);
-		if (ctx->last_command != 'q') ctx->callback(ctx->MR, SQ_STOP);
-		break;
 	case 'p':
 		 {
 			unsigned interval = unpackN(&strm->replay_gain);

diff --git a/application/squeezelite/squeezelite.h b/application/squeezelite/squeezelite.h
@@ -439,6 +439,7 @@ struct outputstate {
 void output_init(const char *device, unsigned output_buf_size, unsigned rates[], struct thread_ctx_s *ctx);
 void output_close(struct thread_ctx_s *ctx);
 void output_flush(struct thread_ctx_s *ctx);
+bool output_flush_streaming(struct thread_ctx_s* ctx);
 // _* called with mutex locked
 frames_t _output_frames(frames_t avail, struct thread_ctx_s *ctx);
 void _checkfade(bool, struct thread_ctx_s *ctx);

diff --git a/plugin/Bin/squeeze2raop-freebsd-x86_64 b/plugin/Bin/squeeze2raop-freebsd-x86_64
diff --git a/plugin/Bin/squeeze2raop-freebsd-x86_64-static b/plugin/Bin/squeeze2raop-freebsd-x86_64-static
diff --git a/plugin/Bin/squeeze2raop-linux-aarch64 b/plugin/Bin/squeeze2raop-linux-aarch64
diff --git a/plugin/Bin/squeeze2raop-linux-aarch64-static b/plugin/Bin/squeeze2raop-linux-aarch64-static
diff --git a/plugin/Bin/squeeze2raop-linux-arm b/plugin/Bin/squeeze2raop-linux-arm
diff --git a/plugin/Bin/squeeze2raop-linux-arm-static b/plugin/Bin/squeeze2raop-linux-arm-static
diff --git a/plugin/Bin/squeeze2raop-linux-armv5 b/plugin/Bin/squeeze2raop-linux-armv5
diff --git a/plugin/Bin/squeeze2raop-linux-armv5-static b/plugin/Bin/squeeze2raop-linux-armv5-static
diff --git a/plugin/Bin/squeeze2raop-linux-armv6 b/plugin/Bin/squeeze2raop-linux-armv6
diff --git a/plugin/Bin/squeeze2raop-linux-armv6-static b/plugin/Bin/squeeze2raop-linux-armv6-static
diff --git a/plugin/Bin/squeeze2raop-linux-mips b/plugin/Bin/squeeze2raop-linux-mips
diff --git a/plugin/Bin/squeeze2raop-linux-mips-static b/plugin/Bin/squeeze2raop-linux-mips-static
diff --git a/plugin/Bin/squeeze2raop-linux-powerpc b/plugin/Bin/squeeze2raop-linux-powerpc
diff --git a/plugin/Bin/squeeze2raop-linux-powerpc-static b/plugin/Bin/squeeze2raop-linux-powerpc-static
diff --git a/plugin/Bin/squeeze2raop-linux-sparc64 b/plugin/Bin/squeeze2raop-linux-sparc64
diff --git a/plugin/Bin/squeeze2raop-linux-sparc64-static b/plugin/Bin/squeeze2raop-linux-sparc64-static
diff --git a/plugin/Bin/squeeze2raop-linux-x86 b/plugin/Bin/squeeze2raop-linux-x86
diff --git a/plugin/Bin/squeeze2raop-linux-x86-static b/plugin/Bin/squeeze2raop-linux-x86-static
diff --git a/plugin/Bin/squeeze2raop-linux-x86_64 b/plugin/Bin/squeeze2raop-linux-x86_64
diff --git a/plugin/Bin/squeeze2raop-linux-x86_64-static b/plugin/Bin/squeeze2raop-linux-x86_64-static
diff --git a/plugin/Bin/squeeze2raop-macos b/plugin/Bin/squeeze2raop-macos
diff --git a/plugin/Bin/squeeze2raop-macos-arm64 b/plugin/Bin/squeeze2raop-macos-arm64
diff --git a/plugin/Bin/squeeze2raop-macos-arm64-static b/plugin/Bin/squeeze2raop-macos-arm64-static
diff --git a/plugin/Bin/squeeze2raop-macos-static b/plugin/Bin/squeeze2raop-macos-static
diff --git a/plugin/Bin/squeeze2raop-macos-x86_64 b/plugin/Bin/squeeze2raop-macos-x86_64
diff --git a/plugin/Bin/squeeze2raop-macos-x86_64-static b/plugin/Bin/squeeze2raop-macos-x86_64-static
diff --git a/plugin/Bin/squeeze2raop-solaris-x86_64 b/plugin/Bin/squeeze2raop-solaris-x86_64
diff --git a/plugin/Bin/squeeze2raop-solaris-x86_64-static b/plugin/Bin/squeeze2raop-solaris-x86_64-static
diff --git a/plugin/Bin/squeeze2raop-static.exe b/plugin/Bin/squeeze2raop-static.exe
diff --git a/plugin/Bin/squeeze2raop.exe b/plugin/Bin/squeeze2raop.exe
diff --git a/plugin/CHANGELOG b/plugin/CHANGELOG
@@ -1,5 +1,9 @@
 Note: beware of crypto version (see shairtunes)
 
+1.5.1
+ - 'q' and 'f' have been inverted forever in slimproto
+ - make 'f' work as expected: only flush streaming part of a track
+
 1.5.0
  - use fixed libcodecs and libraop for alac
  - add '-c' to set codec on command line

diff --git a/plugin/install.xml b/plugin/install.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' standalone='yes'?>
 <extensions>
-  <optionsURL>plugins/RaopBridge/settings/basic.html</optionsURL>
   <targetApplication>
     <maxVersion>*</maxVersion>
     <id>SlimServer</id>
     <minVersion>8.0</minVersion>
   </targetApplication>
+  <optionsURL>plugins/RaopBridge/settings/basic.html</optionsURL>
   <creator>Philippe</creator>
-  <version>1.5.0</version>
+  <version>1.5.1</version>
   <name>PLUGIN_RAOPBRIDGE</name>
   <description>PLUGIN_RAOPBRIDGE_DESC</description>
   <email>[email protected]</email>
+1 −1		mdnssd
+1 −1		mdnssvc
+ −		targets/freebsd/x86_64/libmdns.a
+ −		targets/freebsd/x86_64/libmdnssd.a
+ −		targets/freebsd/x86_64/libmdnssvc.a
+ −		targets/linux/aarch64/libmdns.a
+ −		targets/linux/aarch64/libmdnssd.a
+ −		targets/linux/aarch64/libmdnssvc.a
+ −		targets/linux/arm/libmdns.a
+ −		targets/linux/arm/libmdnssd.a
+ −		targets/linux/arm/libmdnssvc.a
+ −		targets/linux/armv5/libmdns.a
+ −		targets/linux/armv5/libmdnssd.a
+ −		targets/linux/armv5/libmdnssvc.a
+ −		targets/linux/armv6/libmdns.a
+ −		targets/linux/armv6/libmdnssd.a
+ −		targets/linux/armv6/libmdnssvc.a
+ −		targets/linux/mips/libmdns.a
+ −		targets/linux/mips/libmdnssd.a
+ −		targets/linux/mips/libmdnssvc.a
+ −		targets/linux/mipsel/libmdns.a
+ −		targets/linux/mipsel/libmdnssd.a
+ −		targets/linux/mipsel/libmdnssvc.a
+ −		targets/linux/powerpc/libmdns.a
+ −		targets/linux/powerpc/libmdnssd.a
+ −		targets/linux/powerpc/libmdnssvc.a
+ −		targets/linux/sparc64/libmdns.a
+ −		targets/linux/sparc64/libmdnssd.a
+ −		targets/linux/sparc64/libmdnssvc.a
+ −		targets/linux/x86/libmdns.a
+ −		targets/linux/x86/libmdnssd.a
+ −		targets/linux/x86/libmdnssvc.a
+ −		targets/linux/x86_64/libmdns.a
+ −		targets/linux/x86_64/libmdnssd.a
+ −		targets/linux/x86_64/libmdnssvc.a
+ −		targets/macos/arm64/libmdns.a
+ −		targets/macos/arm64/libmdnssd.a
+ −		targets/macos/arm64/libmdnssvc.a
+ −		targets/macos/x86_64/libmdns.a
+ −		targets/macos/x86_64/libmdnssd.a
+ −		targets/macos/x86_64/libmdnssvc.a
+ −		targets/solaris/x86_64/libmdns.a
+ −		targets/solaris/x86_64/libmdnssd.a
+ −		targets/solaris/x86_64/libmdnssvc.a
+ −		targets/win32/x86/libmdns-Debug.lib
+ −		targets/win32/x86/libmdns.lib
+ −		targets/win32/x86/libmdnssd-Debug.lib
+ −		targets/win32/x86/libmdnssd-Debug.pdb
+ −		targets/win32/x86/libmdnssd-Release.lib
+ −		targets/win32/x86/libmdnssvc-Debug.lib
+ −		targets/win32/x86/libmdnssvc-Debug.pdb
+ −		targets/win32/x86/libmdnssvc-Release.lib
+ −		targets/win32/x86/libmdnssvc-Release.pdb
+1 −1		.gitignore
+2 −0		CHANGELOG
+ −		bin/cliraop-freebsd-x86_64
+ −		bin/cliraop-linux-aarch64
+ −		bin/cliraop-linux-arm
+ −		bin/cliraop-linux-armv5
+ −		bin/cliraop-linux-armv6
+ −		bin/cliraop-linux-mips
+ −		bin/cliraop-linux-mipsel
+ −		bin/cliraop-linux-powerpc
+ −		bin/cliraop-linux-sparc64
+ −		bin/cliraop-linux-x86
+ −		bin/cliraop-linux-x86_64
+ −		bin/cliraop-macos-arm64
+ −		bin/cliraop-macos-x86_64
+ −		bin/cliraop-solaris-x86_64
+ −		bin/cliraop.exe
+1 −1		libmdns
+1 −0		src/raop_server.h
+28 −31		src/raop_streamer.c
+ −		targets/freebsd/x86_64/libraop.a
+1 −0		targets/include/raop_server.h
+ −		targets/linux/aarch64/libraop.a
+ −		targets/linux/arm/libraop.a
+ −		targets/linux/armv5/libraop.a
+ −		targets/linux/armv6/libraop.a
+ −		targets/linux/mips/libraop.a
+ −		targets/linux/mipsel/libraop.a
+ −		targets/linux/powerpc/libraop.a
+ −		targets/linux/sparc64/libraop.a
+ −		targets/linux/x86/libraop.a
+ −		targets/linux/x86_64/libraop.a
+ −		targets/macos/arm64/libraop.a
+ −		targets/macos/x86_64/libraop.a
+ −		targets/solaris/x86_64/libraop.a
+ −		targets/win32/x86/libraop.lib
+ −		targets/win32/x86/libraop.pdb
+ −		targets/win32/x86/libraop_d.lib
+ −		targets/win32/x86/libraop_d.pdb