Skip to content

Commit

Permalink
fixed audio device selection
Browse files Browse the repository at this point in the history
  • Loading branch information
DJ2LS committed Jan 5, 2024
1 parent ef8b309 commit 02e88f7
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 39 deletions.
64 changes: 29 additions & 35 deletions gui/src/components/main_startup_check.vue
Original file line number Diff line number Diff line change
Expand Up @@ -217,43 +217,37 @@ function testHamlib() {
</button>
</label>
</div>
<!-- Audio Input Device -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-25">Input device</label>
<select
class="form-select form-select-sm"
id="rx_audio"
aria-label=".form-select-sm"
@change="onChange"
v-model="settings.remote.AUDIO.input_device"
>
<option
v-for="option in audioInputOptions()"
v-bind:value="option.id"
>
{{ option.name }} [{{ option.api }}]
</option>
</select>
</div>
<!-- Audio Input Device -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Audio Input device</label>
<select
class="form-select form-select-sm"
aria-label=".form-select-sm"
@change="onChange"
v-model="settings.remote.AUDIO.input_device"
>
<option v-for="option in audioInputOptions()" v-bind:value="option.id">
{{ option.name }} [{{ option.api }}]
</option>
</select>
</div>

<!-- Audio Output Device -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-25">Output device</label>
<select
class="form-select form-select-sm"
id="tx_audio"
aria-label=".form-select-sm"
@change="setConfig"
v-model="settings.remote.AUDIO.output_device"
>
<option
v-for="option in audioOutputOptions()"
v-bind:value="option.id"
>
{{ option.name }} [{{ option.api }}]
</option>
</select>
</div>
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Audio Output device</label>
<select
class="form-select form-select-sm"
aria-label=".form-select-sm"
@change="onChange"
v-model="settings.remote.AUDIO.output_device"
>
<option v-for="option in audioOutputOptions()" v-bind:value="option.id">
{{ option.name }} [{{ option.api }}]
</option>
</select>
</div>


</div>
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions gui/src/components/settings_modem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ import { audioInputOptions, audioOutputOptions } from "../js/deviceFormHelper";
<label class="input-group-text w-50">Audio Input device</label>
<select
class="form-select form-select-sm"
id="rx_audio"
aria-label=".form-select-sm"
@change="onChange"
v-model="settings.remote.AUDIO.input_device"
Expand All @@ -86,7 +85,6 @@ import { audioInputOptions, audioOutputOptions } from "../js/deviceFormHelper";
<label class="input-group-text w-50">Audio Output device</label>
<select
class="form-select form-select-sm"
id="tx_audio"
aria-label=".form-select-sm"
@change="onChange"
v-model="settings.remote.AUDIO.output_device"
Expand Down
2 changes: 0 additions & 2 deletions modem/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ def config_exists(self):
# Validates config data
def validate(self, data):
for section in data:
print(section)
for setting in data[section]:
if not isinstance(data[section][setting], self.config_types[section][setting]):
message = (f"{section}.{setting} must be {self.config_types[section][setting]}."
Expand Down Expand Up @@ -132,7 +131,6 @@ def handle_setting(self, section, setting, value, is_writing = False):

# Sets and writes config data from a dict containing data settings
def write(self, data):

# Validate config data before writing
self.validate(data)

Expand Down

0 comments on commit 02e88f7

Please sign in to comment.