+
+
@@ -163,7 +165,7 @@
- {{ filter.key }}
+ {{ filter.key }}
Type: {{ filter.value.type }}
@@ -231,27 +233,83 @@
-
+
Playback
*ngFor="let filter of parsedConfig.filters | keyvalue">Playback
-
+
+
+ CamillaDSP Connection
+
+
+
+
+
+
+
+ Advanced CamillaDSP Config
+
-
+ CamillaDSP Control
-- Connection Status: {{ connectionStatus }} -
- +
+ WebSocket Connection
+
+ + Connection Status: {{ connectionStatus }} +
+ + +
+ Default Config
+
+ Current Default Config
+ {{ currentCamillaConfigFile || 'No default config selected' }}
+
+
+
+ Available Config Files
+
+
+ {{ config }}
+
+
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+ Refresh Config List
+
+
+
+ Set Default Config
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/camilla-dsp/camilla-dsp.component.ts b/src/app/components/camilla-dsp/camilla-dsp.component.ts
index 1ddccb4..e2311c5 100644
--- a/src/app/components/camilla-dsp/camilla-dsp.component.ts
+++ b/src/app/components/camilla-dsp/camilla-dsp.component.ts
@@ -1,6 +1,7 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Subscription } from 'rxjs';
import { CamillaDspConfig, MixerSource, SignalLevels } from 'src/app/model/camilla-dsp.model';
+import { BeatnikHardwareService } from 'src/app/services/beatnik-hardware.service';
import { CamillaDspService, ConnectionStatus } from 'src/app/services/camilla-dsp.service';
@Component({
@@ -21,12 +22,23 @@ export class CamillaDspComponent implements OnInit, OnDestroy {
levels: SignalLevels | null = null;
currentVolume: number = 0;
+ availableCamillaConfigs: string[] = [];
+ selectedCamillaConfig: string | null = null;
+ currentCamillaConfigFile: string | null = null;
+ isLoadingCamillaConfigs = false;
+ isSavingCamillaConfig = false;
+ camillaConfigMessage = '';
+ camillaConfigError = '';
private levelSubscription: Subscription | undefined;
- constructor(private camillaService: CamillaDspService) { }
+ constructor(
+ private camillaService: CamillaDspService,
+ private beatnikHardwareService: BeatnikHardwareService
+ ) { }
async ngOnInit() {
+ this.loadCamillaConfigState();
this.connect();
// Subscribe to connection status changes
this.subscriptions.add(
@@ -77,6 +89,99 @@ export class CamillaDspComponent implements OnInit, OnDestroy {
// }, 800);
}
+ private getHardwareHost(): string | null {
+ if (!this.url) {
+ return null;
+ }
+
+ try {
+ return new URL(this.url).hostname;
+ } catch (error) {
+ console.error('Failed to parse CamillaDSP URL for hardware API access:', error);
+ return null;
+ }
+ }
+
+ loadCamillaConfigState() {
+ const host = this.getHardwareHost();
+ if (!host) {
+ this.camillaConfigError = 'Unable to determine device host for CamillaDSP config API.';
+ return;
+ }
+
+ this.isLoadingCamillaConfigs = true;
+ this.camillaConfigError = '';
+ this.camillaConfigMessage = '';
+
+ this.subscriptions.add(
+ this.beatnikHardwareService.getCamillaConfigs(host).subscribe({
+ next: (response) => {
+ this.availableCamillaConfigs = response.configs ?? [];
+ this.syncSelectedCamillaConfig();
+ this.isLoadingCamillaConfigs = false;
+ },
+ error: (error) => {
+ console.error('Failed to load available CamillaDSP configs:', error);
+ this.camillaConfigError = 'Failed to load available CamillaDSP configs.';
+ this.isLoadingCamillaConfigs = false;
+ }
+ })
+ );
+
+ this.subscriptions.add(
+ this.beatnikHardwareService.getDefaultCamillaConfig(host).subscribe({
+ next: (response) => {
+ this.currentCamillaConfigFile = response.fileName;
+ this.syncSelectedCamillaConfig();
+ },
+ error: (error) => {
+ console.error('Failed to load default CamillaDSP config:', error);
+ this.camillaConfigError = 'Failed to load current default CamillaDSP config.';
+ }
+ })
+ );
+ }
+
+ private syncSelectedCamillaConfig() {
+ if (this.currentCamillaConfigFile && this.availableCamillaConfigs.includes(this.currentCamillaConfigFile)) {
+ this.selectedCamillaConfig = this.currentCamillaConfigFile;
+ return;
+ }
+
+ if (!this.selectedCamillaConfig && this.availableCamillaConfigs.length > 0) {
+ this.selectedCamillaConfig = this.availableCamillaConfigs[0];
+ }
+ }
+
+ saveDefaultCamillaConfig() {
+ const host = this.getHardwareHost();
+
+ if (!host || !this.selectedCamillaConfig) {
+ this.camillaConfigError = 'Please choose a CamillaDSP config before saving.';
+ return;
+ }
+
+ this.isSavingCamillaConfig = true;
+ this.camillaConfigError = '';
+ this.camillaConfigMessage = '';
+
+ this.subscriptions.add(
+ this.beatnikHardwareService.setDefaultCamillaConfig(this.selectedCamillaConfig, host).subscribe({
+ next: (response) => {
+ this.currentCamillaConfigFile = response.fileName;
+ this.selectedCamillaConfig = response.fileName;
+ this.camillaConfigMessage = `Default config set to ${response.fileName}.`;
+ this.isSavingCamillaConfig = false;
+ },
+ error: (error) => {
+ console.error('Failed to update default CamillaDSP config:', error);
+ this.camillaConfigError = error?.error?.error ?? 'Failed to update default CamillaDSP config.';
+ this.isSavingCamillaConfig = false;
+ }
+ })
+ );
+ }
+
connect() {
@@ -169,4 +274,6 @@ export class CamillaDspComponent implements OnInit, OnDestroy {
console.log('CamillaDspComponent: Leaving page, cleaning up resources if needed');
this.ngOnDestroy();
}
+
+
}
diff --git a/src/app/components/choose-speakers/choose-speakers.component.html b/src/app/components/choose-speakers/choose-speakers.component.html
index 8c522fb..1515bc3 100644
--- a/src/app/components/choose-speakers/choose-speakers.component.html
+++ b/src/app/components/choose-speakers/choose-speakers.component.html
@@ -22,6 +22,7 @@
Manage the default config file used on this device. Only use this if you know what you are doing.
+Loading CamillaDSP configs...
+{{ camillaConfigError }}
+{{ camillaConfigMessage }}
+{{ speaker.manufacturer }} {{ speaker.model }}
Snap Client Information
-Id: {{client.id}}
-{{client.lastSeen.sec * 1000 | date: 'long'}}
--
Host
-Name: {{client.host.name}}
-OS: {{client.host.os}}
-Architecture: {{client.host.arch}}
-IP Address: {{cleanIpAddress(client.host.ip)}}
-MAC Address: {{client.host.mac}}
--
Configuration
-Name: {{ client.config.name}}
-Client ID: {{ client.id }}
-Volume: {{ client.config.volume.percent || 'N/A' }}%
-Muted: {{ client.config.volume.muted}}
-Latency: {{ client.config.latency }} ms
-Connected: {{ client.connected }}
-Last Seen: {{ client.lastSeen.sec * 1000 | date : 'long' }}
- -{{ client.id }}
-Raw json
-{{ client| json }}
- Snap Client Information
+Id: {{client.id}}
+{{client.lastSeen.sec * 1000 | date: 'long'}}
++
Host
+Name: {{client.host.name}}
+OS: {{client.host.os}}
+Architecture: {{client.host.arch}}
+IP Address: {{cleanIpAddress(client.host.ip)}}
+MAC Address: {{client.host.mac}}
++
Configuration
+Name: {{ client.config.name}}
+Client ID: {{ client.id }}
+Volume: {{ client.config.volume.percent || 'N/A' }}%
+Muted: {{ client.config.volume.muted}}
+Latency: {{ client.config.latency }} ms
+Connected: {{ client.connected }}
+Last Seen: {{ client.lastSeen.sec * 1000 | date : 'long' }}
+ +{{ client.id }}
+Raw json
+{{ client| json }}
+ -
Config Status
-Name: {{ hardwareStatus.currentConfig.name}}
-Id: {{ hardwareStatus.currentConfig.id}}
-isMatched: {{ hardwareStatus.isMatch}}
-No current configuration available.
-
-
- Refresh Snapcast Server Status
-
-
-
- Disable Snapcast Server
-
-
-
- Enable Snapcast Server
-
-
-
-
- Settings
- -
-
- Snapcast Server Status
-{{ snapcastServerStatus.message}}
-{{ snapcastServerStatus | json }}
- Soundcard Information
+- +
Snapcast Server Status
+Status: Active
+"Active" Means this device is currently configured to be your Beatnik / snapcast server.
+Status: Inactive
+"Inactive" Means this device is configured to be a Beatnik / snapcast client. Clients will automatically try to connect to the server in your local Network.
+{{ snapcastServerStatus.message}}
+ +{{stream.id}}
-{{ stream.properties.metadata.title }}
-{{ stream.properties.metadata.artist }}
- -{{ group.name || group.id }}
-Clients: {{ group.clients.length }}
-
+
Clients: {{ group.clients.length }}
+
-
-
+
+
+
-{{ device.name }}
{{ service.hostname }}
{{ service.name }}
{{ service.type }}
{{ service.ipv4Addresses[0] }}:{{ service.port }}
-Beatnik Device - MAC: {{ service.txtRecord['mac'] }}
-Beatnik Pi: {{ service.txtRecord['model'] }}
-Beatnik Version: {{ service.txtRecord['version'] }}
-RAM: {{ service.txtRecord['ram'] }}
-Beatnik Pi: {{ service.txtRecord['model'] }}
+Beatnik Version: {{ service.txtRecord['version'] }}
+RAM: {{ service.txtRecord['ram'] }}
+{{ service.hostname }}
No services found.
+Note: ZeroConf Scan does not work in Web Browser. iOS and Android only.
+