diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/real.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/real.gif new file mode 100644 index 00000000..d805ae5a Binary files /dev/null and b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/real.gif differ diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/winmed.gif b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/winmed.gif new file mode 100644 index 00000000..e05f490a Binary files /dev/null and b/zefie_wtvp_minisrv/includes/ServiceVault/SharedROMCache/winmed.gif differ diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js index 834d78f2..fd686fa1 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js @@ -45,7 +45,7 @@ Favorite folders
- +
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/asxgen/catchall.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/asxgen/catchall.js index e065c7a2..f7846fcb 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/asxgen/catchall.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/asxgen/catchall.js @@ -22,12 +22,9 @@ if (minisrv_config.config.ServiceVaults) { let subDirPath = ''; const currentDir = path.dirname(__filename); const serviceVaultIdx = currentDir.indexOf('ServiceVault'); -console.log("DEBUG: currentDir =", currentDir, "serviceVaultIdx =", serviceVaultIdx); if (serviceVaultIdx !== -1) { const afterVault = currentDir.substring(serviceVaultIdx + 12); // 12 = length of 'ServiceVault' - console.log("DEBUG: afterVault =", afterVault); const parts = afterVault.split(path.sep).filter(p => p); - console.log("DEBUG: parts =", parts); if (parts.length > 1) { // parts[0] is the service name (e.g., 'wtv-music'), parts[1+] are the subdirs const subdirs = parts.slice(1); @@ -96,12 +93,57 @@ Content-type: text/html`; Windows Media on this Service - - + + + + +
+ + +
+ + + +
+ +
+		 +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ ${(request_headers.query.debugUDP) ? "Use TCP" : "Debug UDP"} +
+
+ + +
+ +
+ +
+
+ +
+ +
+  +
+

-

Windows Media on this Service

`; +

Windows Media on this Service

`; } else { headers = `404 Not Found Content-type: text/html`; @@ -126,7 +168,11 @@ Content-type: text/html`; Content-type: text/html`; } else { const filePath = path.join(directory || '/', filename + path.extname(resolvedPath)); - const mmsURL = `mms://${minisrv_config.config.service_ip}:${minisrv_config.services['mms'].port}${filePath.replace(/\\/g, '/')}`; + let proto = "mmst://"; + if (request_headers.query.debugUDP) { + proto = "mms://" + } + const mmsURL = `${proto}${minisrv_config.config.service_ip}:${minisrv_config.services['mms'].port}${filePath.replace(/\\/g, '/')}`; const title = (request_headers.query['wtv-title']) ? request_headers.query['wtv-title'] : minisrv_config.config.service_name+" media"; headers = `200 OK Content-type: video/x-ms-asf` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/ramgen/catchall.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/ramgen/catchall.js index 5cf16b2f..f8116f37 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/ramgen/catchall.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-music/ramgen/catchall.js @@ -22,12 +22,9 @@ if (minisrv_config.config.ServiceVaults) { let subDirPath = ''; const currentDir = path.dirname(__filename); const serviceVaultIdx = currentDir.indexOf('ServiceVault'); -console.log("DEBUG: currentDir =", currentDir, "serviceVaultIdx =", serviceVaultIdx); if (serviceVaultIdx !== -1) { const afterVault = currentDir.substring(serviceVaultIdx + 12); // 12 = length of 'ServiceVault' - console.log("DEBUG: afterVault =", afterVault); const parts = afterVault.split(path.sep).filter(p => p); - console.log("DEBUG: parts =", parts); if (parts.length > 1) { // parts[0] is the service name (e.g., 'wtv-music'), parts[1+] are the subdirs const subdirs = parts.slice(1); @@ -96,8 +93,34 @@ Content-type: text/html`; RealAudio Files on this Service - - + + + + +
+ + +
+ + + +
+ +
+		 +
+ +
+ +
+
+ +
+
+
+  +
+

diff --git a/zefie_wtvp_minisrv/includes/classes/WTVMMS.js b/zefie_wtvp_minisrv/includes/classes/WTVMMS.js index b4580eaa..1aa6d679 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVMMS.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVMMS.js @@ -1879,7 +1879,7 @@ class WTVMMS { buf.writeUInt32LE(0x00000000, 16); // failedCubs buf.writeUInt32LE(0x00000001, 20); // nDisks buf.writeUInt32LE(0x00000000, 24); // decluster - buf.writeUInt32LE(0x00000000, 28); // cubddDatagramSize + buf.writeUInt32LE((session.isCubddTransport) ? session.asfPacketSize + 8 : 0x00000000, 28); // cubddDatagramSize return buf; } diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json index f33603b2..92d06cf2 100644 --- a/zefie_wtvp_minisrv/includes/config.json +++ b/zefie_wtvp_minisrv/includes/config.json @@ -121,7 +121,7 @@ "image/tiff", "image/webp" ], - "max_height": 0, + "max_height": 2048, "max_width": 640, "max_file_size": 524288, "jpeg_interval": 5, // lower quality by this amount to try to lower filesize